lkml.org 
[lkml]   [2015]   [Sep]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 05/39] Port xconfig to Qt5 - Use QList
    Date
    From: Boris Barbulovski <bbarbulovski@gmail.com>

    Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com>
    Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>
    ---
    scripts/kconfig/qconf.h | 4 ++--
    scripts/kconfig/qconf.cc | 14 +++++++-------
    2 files changed, 9 insertions(+), 9 deletions(-)

    diff --git a/scripts/kconfig/qconf.h b/scripts/kconfig/qconf.h
    index 4d5218d..0d364c7 100644
    --- a/scripts/kconfig/qconf.h
    +++ b/scripts/kconfig/qconf.h
    @@ -16,8 +16,8 @@ class ConfigMainWindow;
    class ConfigSettings : public QSettings {
    public:
    ConfigSettings();
    - Q3ValueList<int> readSizes(const QString& key, bool *ok);
    - bool writeSizes(const QString& key, const Q3ValueList<int>& value);
    + QList<int> readSizes(const QString& key, bool *ok);
    + bool writeSizes(const QString& key, const QList<int>& value);
    };

    enum colIdx {
    diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc
    index 9f1a9cf..bd62f60 100644
    --- a/scripts/kconfig/qconf.cc
    +++ b/scripts/kconfig/qconf.cc
    @@ -7,7 +7,7 @@

    #include <QMainWindow>
    #include <q3vbox.h>
    -#include <q3valuelist.h>
    +#include <QList>
    #include <q3textbrowser.h>
    #include <QAction>
    #include <q3header.h>
    @@ -64,9 +64,9 @@ ConfigSettings::ConfigSettings()
    /**
    * Reads a list of integer values from the application settings.
    */
    -Q3ValueList<int> ConfigSettings::readSizes(const QString& key, bool *ok)
    +QList<int> ConfigSettings::readSizes(const QString& key, bool *ok)
    {
    - Q3ValueList<int> result;
    + QList<int> result;
    QStringList entryList = readListEntry(key, ok);
    QStringList::Iterator it;

    @@ -79,10 +79,10 @@ Q3ValueList<int> ConfigSettings::readSizes(const QString& key, bool *ok)
    /**
    * Writes a list of integer values to the application settings.
    */
    -bool ConfigSettings::writeSizes(const QString& key, const Q3ValueList<int>& value)
    +bool ConfigSettings::writeSizes(const QString& key, const QList<int>& value)
    {
    QStringList stringList;
    - Q3ValueList<int>::ConstIterator it;
    + QList<int>::ConstIterator it;

    for (it = value.begin(); it != value.end(); ++it)
    stringList.push_back(QString::number(*it));
    @@ -1214,7 +1214,7 @@ ConfigSearchWindow::ConfigSearchWindow(ConfigMainWindow* parent, const char *nam
    y = configSettings->readNumEntry("/window y", 0, &ok);
    if (ok)
    move(x, y);
    - Q3ValueList<int> sizes = configSettings->readSizes("/split", &ok);
    + QList<int> sizes = configSettings->readSizes("/split", &ok);
    if (ok)
    split->setSizes(sizes);
    configSettings->endGroup();
    @@ -1446,7 +1446,7 @@ ConfigMainWindow::ConfigMainWindow(void)
    showSplitView();

    // UI setup done, restore splitter positions
    - Q3ValueList<int> sizes = configSettings->readSizes("/split1", &ok);
    + QList<int> sizes = configSettings->readSizes("/split1", &ok);
    if (ok)
    split1->setSizes(sizes);

    --
    2.1.4


    \
     
     \ /
      Last update: 2015-09-22 21:21    [W:4.227 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site