[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdesupport/kdewin-installer/gui
From:       Ralf Habacker <Ralf.Habacker () freenet ! de>
Date:       2010-02-19 11:26:23
Message-ID: 1266578783.624432.13370.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1092665 by habacker:

refactored code use type ReleaseType


 M  +3 -3      enduserpackageselectorpage.cpp  
 M  +4 -4      packageselectorpage.cpp  
 M  +1 -1      releaseselectionpage.cpp  
 M  +6 -6      usercompilermodepage.cpp  


--- trunk/kdesupport/kdewin-installer/gui/enduserpackageselectorpage.cpp \
#1092664:1092665 @@ -117,14 +117,14 @@
         Q_FOREACH(Package \
*availablePackage,categoryCache.packages(categoryName,*engine->packageResources()))  \
{  QString name = availablePackage->name();
-            if ( ( categoryName == "mingw"  || s.compilerType() == Settings::MinGW )
+            if ( ( categoryName == "mingw"  || s.compilerType() == MinGW )
                     && ( name.endsWith ( QLatin1String( "-msvc" ) ) || name.endsWith \
( QLatin1String( "-vc90" ) )   || name.endsWith ( QLatin1String( "-mingw4" ) ) ) )
                 continue;
-            else if ( ( categoryName == "msvc"  || s.compilerType() == \
Settings::MSVC ) +            else if ( ( categoryName == "msvc"  || s.compilerType() \
                == MSVC )
                       && ( name.endsWith ( QLatin1String ( "-mingw" ) ) || \
name.endsWith( QLatin1String( "-mingw4" ) ) ) )  continue;
-            else if ( ( categoryName == "mingw4"  || s.compilerType() == \
Settings::MinGW4 ) +            else if ( ( categoryName == "mingw4"  || \
                s.compilerType() == MinGW4 )
                     && ( name.endsWith ( QLatin1String( "-msvc" ) ) || name.endsWith \
( QLatin1String( "-vc90" ) )   || name.endsWith ( QLatin1String( "-mingw" ) ) ) )
                 continue;
--- trunk/kdesupport/kdewin-installer/gui/packageselectorpage.cpp #1092664:1092665
@@ -196,7 +196,7 @@
     Q_FOREACH (const QString &category,categoryCache.categories())
     {
         const QStringList names = category.split(':');
-        if ( (s.compilerType() == Settings::MinGW ||s.compilerType() == \
Settings::MSVC || Settings::MinGW4) +        if ( (s.compilerType() == MinGW \
                ||s.compilerType() == MSVC || MinGW4)
             && (names[0] == QLatin1String("msvc") || names[0] == \
QLatin1String("mingw") || names[0] == QLatin1String("mingw4")) )  continue;
 
@@ -292,13 +292,13 @@
     Q_FOREACH(Package \
*availablePackage,categoryCache.packages(categoryName,*engine->packageResources()))  \
{  QString name = availablePackage->name();
-        if ( ( categoryName == "mingw"  || s.compilerType() == Settings::MinGW )
+        if ( ( categoryName == "mingw"  || s.compilerType() == MinGW )
                 && ( name.endsWith ( QLatin1String( "-msvc" ) ) || name.endsWith ( \
QLatin1String( "-vc90" ) ) || name.endsWith ( QLatin1String( "-mingw4" ) ) ) )  \
                continue;
-        else if ( ( categoryName == "mingw4"  || s.compilerType() == \
Settings::MinGW4 ) +        else if ( ( categoryName == "mingw4"  || s.compilerType() \
                == MinGW4 )
                 && ( name.endsWith ( QLatin1String( "-mingw" ) ) || name.endsWith ( \
QLatin1String( "-msvc" ) ) || name.endsWith ( QLatin1String( "-vc90" ) ) ) )  \
                continue;
-        else if ( ( categoryName == "msvc"  || s.compilerType() == Settings::MSVC )
+        else if ( ( categoryName == "msvc"  || s.compilerType() == MSVC )
                   && ( name.endsWith ( QLatin1String ( "-mingw" ) ) || name.endsWith \
( QLatin1String ( "-mingw4" ) )) )  continue;
         packageList << availablePackage;
--- trunk/kdesupport/kdewin-installer/gui/releaseselectionpage.cpp #1092664:1092665
@@ -59,7 +59,7 @@
         currentMirror = releases.realBaseURL().toString() + "stable/latest/";
     qDebug() << "current mirror with release" << currentMirror;
     
-    Q_FOREACH(const ReleaseType &m, releases.releases())
+    Q_FOREACH(const MirrorReleaseType &m, releases.releases())
     {
         qDebug() << "adding release" << m.name << "with url" << m.url;
         QListWidgetItem *item = new QListWidgetItem(m.toString());
--- trunk/kdesupport/kdewin-installer/gui/usercompilermodepage.cpp #1092664:1092665
@@ -79,11 +79,11 @@
     s.setPackageManagerMode(ui.installModePackageManager->isChecked());
 
     if (ui.compilerMinGW4->isChecked())
-        s.setCompilerType(Settings::MinGW4);
+        s.setCompilerType(MinGW4);
     if (ui.compilerMSVC->isChecked())
-        s.setCompilerType(Settings::MSVC);
+        s.setCompilerType(MSVC);
     if (isX64Windows() && ui.compilerMSVCX64->isChecked())
-        s.setCompilerType(Settings::MSVC_X64);
+        s.setCompilerType(MSVC_X64);
     return true;
 }
 
@@ -92,9 +92,9 @@
     Settings &s = Settings::instance();
     switch (s.compilerType()) 
     {
-        case Settings::MinGW4: ui.compilerMinGW4->setChecked(true); break;
-        case Settings::MSVC: ui.compilerMSVC->setChecked(true); break;
-        case Settings::MSVC_X64: ui.compilerMSVCX64->setChecked(true); break;
+        case MinGW4: ui.compilerMinGW4->setChecked(true); break;
+        case MSVC: ui.compilerMSVC->setChecked(true); break;
+        case MSVC_X64: ui.compilerMSVCX64->setChecked(true); break;
         default: ui.compilerMSVC->setChecked(true); break;
     }
     bool state = !Database::isAnyPackageInstalled(s.installDir());


[prev in list] [next in list] [prev in thread] [next in thread]