Author: shadzik
Date: Mon Jan 10 13:01:01 2011
New Revision: 12031
Modified:
PLDLiveInstaller/trunk/CMakeLists.txt
PLDLiveInstaller/trunk/PLDLiveInstaller.cpp
Log:
- simplified selSwap and selRoot
- no need to enable exceptions anymore
Modified: PLDLiveInstaller/trunk/CMakeLists.txt
==============================================================================
--- PLDLiveInstaller/trunk/CMakeLists.txt (original)
+++ PLDLiveInstaller/trunk/CMakeLists.txt Mon Jan 10 13:01:01 2011
@@ -6,7 +6,7 @@
find_package(KDE4Workspace REQUIRED)
include (KDE4Defaults)
-set(CMAKE_CXX_FLAGS "-O2 -g -fexceptions")
+#set(CMAKE_CXX_FLAGS "-O2 -g -fexceptions")
include_directories(${QT_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR}
${KDE4_INCLUDES} ${KDE4WORKSPACE_INCLUDE_DIR})
Modified: PLDLiveInstaller/trunk/PLDLiveInstaller.cpp
==============================================================================
--- PLDLiveInstaller/trunk/PLDLiveInstaller.cpp (original)
+++ PLDLiveInstaller/trunk/PLDLiveInstaller.cpp Mon Jan 10 13:01:01 2011
@@ -166,8 +166,7 @@
{
QString sizeText;
qlonglong minSize = 3072;
-
//destPartition=diskListWidget->parthash->value(availablePartitions[pos-1]);
- //qlonglong curSize =
destPartition.as<Solid::StorageVolume>()->size()/1024/1024; //MB
+ destPartition=diskListWidget->parthash->value(availablePartitions[pos-1]);
qlonglong curSize = curSizeArray[pos-1];
QString size = QString::number(curSize);
if(curSize < minSize)
@@ -190,7 +189,6 @@
sizeText = "Size: " + size + "MB<br />";
}
- //selRoot=destPartition.as<Solid::Block>()->device();
selRoot=availablePartitions[pos-1];
partDescr->setText("Partition details:<br />"
@@ -231,7 +229,7 @@
if (pos!=0)
{
destSwap=diskListWidget->parthash->value(availablePartitions[pos-1]);
- selSwap=destSwap.as<Solid::Block>()->device();
+ selSwap=availablePartitions[pos-1];
if(swapPartPos==rootPartPos)
{
samePartTwiceIcon->setVisible(true);
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
