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

List:       kde-commits
Subject:    KDE/kdelibs/kdecore/kconfig_compiler
From:       Laurent Montel <montel () kde ! org>
Date:       2005-09-26 15:23:20
Message-ID: 1127748200.768270.5773.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 464229 by mlaurent:

Byebye Q3ValueList


 M  +17 -17    kconfig_compiler.cpp  


--- trunk/KDE/kdelibs/kdecore/kconfig_compiler/kconfig_compiler.cpp #464228:464229
@@ -70,7 +70,7 @@
     CfgEntry( const QString &group, const QString &type, const QString &key,
               const QString &name, const QString &label,
               const QString &whatsThis, const QString &code,
-              const QString &defaultValue, const Q3ValueList<Choice> &choices,
+              const QString &defaultValue, const QList<Choice> &choices,
               bool hidden )
       : mGroup( group ), mType( type ), mKey( key ), mName( name ),
         mLabel( label ), mWhatsThis( whatsThis ), mCode( code ),
@@ -118,8 +118,8 @@
     void setParamType( const QString &d ) { mParamType = d; }
     QString paramType() const { return mParamType; }
 
-    void setChoices( const Q3ValueList<Choice> &d ) { mChoices = d; }
-    Q3ValueList<Choice> choices() const { return mChoices; }
+    void setChoices( const QList<Choice> &d ) { mChoices = d; }
+    QList<Choice> choices() const { return mChoices; }
 
     void setParamValues( const QStringList &d ) { mParamValues = d; }
     QStringList paramValues() const { return mParamValues; }
@@ -292,7 +292,7 @@
 
 static void preProcessDefault( QString &defaultValue, const QString &name,
                                const QString &type,
-                               const Q3ValueList<CfgEntry::Choice> &choices,
+                               const QList<CfgEntry::Choice> &choices,
                                QString &code )
 {
     if ( type == "String" && !defaultValue.isEmpty() ) {
@@ -328,7 +328,7 @@
 
     } else if ( type == "Enum" ) {
       if ( !globalEnums ) {
-        Q3ValueList<CfgEntry::Choice>::ConstIterator it;
+        QList<CfgEntry::Choice>::ConstIterator it;
         for( it = choices.begin(); it != choices.end(); ++it ) {
           if ( (*it).name == defaultValue ) {
             defaultValue.prepend( enumName(name) + "::");
@@ -368,7 +368,7 @@
   QString param;
   QString paramName;
   QString paramType;
-  Q3ValueList<CfgEntry::Choice> choices;
+  QList<CfgEntry::Choice> choices;
   QStringList paramValues;
   QStringList paramDefaultValues;
   QString minValue;
@@ -788,12 +788,12 @@
   return result;
 }
 
-QString paramString(const QString &group, const Q3ValueList<Param> &parameters)
+QString paramString(const QString &group, const QList<Param> &parameters)
 {
   QString paramString = group;
   QString arguments;
   int i = 1;
-  for (Q3ValueList<Param>::ConstIterator it = parameters.begin();
+  for (QList<Param>::ConstIterator it = parameters.begin();
        it != parameters.end(); ++it)
   {
      if (paramString.contains("$("+(*it).name+")"))
@@ -1040,7 +1040,7 @@
 
   QString cfgFileName;
   bool cfgFileNameArg = false;
-  Q3ValueList<Param> parameters;
+  QList<Param> parameters;
   QStringList includes;
 
   Q3PtrList<CfgEntry> entries;
@@ -1177,10 +1177,10 @@
   // enums
   CfgEntry *e;
   for( e = entries.first(); e; e = entries.next() ) {
-    Q3ValueList<CfgEntry::Choice> choices = e->choices();
+    QList<CfgEntry::Choice> choices = e->choices();
     if ( !choices.isEmpty() ) {
       QStringList values;
-      Q3ValueList<CfgEntry::Choice>::ConstIterator itChoice;
+      QList<CfgEntry::Choice>::ConstIterator itChoice;
       for( itChoice = choices.begin(); itChoice != choices.end(); ++itChoice ) {
         values.append( (*itChoice).name );
       }
@@ -1221,7 +1221,7 @@
     h << "    " << className << "(";
     if (cfgFileNameArg)
        h << " KSharedConfig::Ptr config" << (parameters.isEmpty() ? " = \
                KGlobal::sharedConfig()" : ", ");
-    for (Q3ValueList<Param>::ConstIterator it = parameters.begin();
+    for (QList<Param>::ConstIterator it = parameters.begin();
          it != parameters.end(); ++it)
     {
        if (it != parameters.begin())
@@ -1351,7 +1351,7 @@
   }
 
   // Class Parameters
-  for (Q3ValueList<Param>::ConstIterator it = parameters.begin();
+  for (QList<Param>::ConstIterator it = parameters.begin();
        it != parameters.end(); ++it)
   {
      h << "    " << cppType((*it).type) << " mParam" << (*it).name << ";" << endl;
@@ -1508,7 +1508,7 @@
     cpp << (parameters.isEmpty() ? " " : ", ");
   }
 
-  for (Q3ValueList<Param>::ConstIterator it = parameters.begin();
+  for (QList<Param>::ConstIterator it = parameters.begin();
        it != parameters.end(); ++it)
   {
      if (it != parameters.begin())
@@ -1524,7 +1524,7 @@
   cpp << ")" << endl;
 
   // Store parameters
-  for (Q3ValueList<Param>::ConstIterator it = parameters.begin();
+  for (QList<Param>::ConstIterator it = parameters.begin();
        it != parameters.end(); ++it)
   {
      cpp << "  , mParam" << (*it).name << "(" << (*it).name << ")" << endl;
@@ -1555,8 +1555,8 @@
     if ( e->type() == "Enum" ) {
       cpp << "  QList<KConfigSkeleton::ItemEnum::Choice> values"
           << e->name() << ";" << endl;
-      Q3ValueList<CfgEntry::Choice> choices = e->choices();
-      Q3ValueList<CfgEntry::Choice>::ConstIterator it;
+      QList<CfgEntry::Choice> choices = e->choices();
+      QList<CfgEntry::Choice>::ConstIterator it;
       for( it = choices.begin(); it != choices.end(); ++it ) {
         cpp << "  {" << endl;
         cpp << "    KConfigSkeleton::ItemEnum::Choice choice;" << endl;


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