[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdebase/workspace/kcontrol/kxkb
From: Andy Rysin <arysin () yahoo ! com>
Date: 2006-06-30 23:48:37
Message-ID: 1151711317.147162.17131.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 556633 by rysin:
more port to qt4/kde4
M +2 -2 kcmlayout.h
M +14 -11 kxkbconfig.cpp
M +4 -4 kxkbconfig.h
M +2 -2 layoutmap.h
M +5 -6 pixmap.cpp
M +5 -5 rules.cpp
M +7 -7 x11helper.cpp
M +2 -2 x11helper.h
--- trunk/KDE/kdebase/workspace/kcontrol/kxkb/kcmlayout.h #556632:556633
@@ -4,8 +4,8 @@
#include <kcmodule.h>
-#include <qhash.h>
-#include <qstring.h>
+#include <QHash>
+#include <QString>
#include <qlistview.h>
#include "kxkbconfig.h"
--- trunk/KDE/kdebase/workspace/kcontrol/kxkb/kxkbconfig.cpp #556632:556633
@@ -11,9 +11,9 @@
//
#include <assert.h>
-#include <qregexp.h>
-#include <qstringlist.h>
-#include <qhash.h>
+#include <QRegExp>
+#include <QStringList>
+#include <QHash>
#include <kconfig.h>
#include <kdebug.h>
@@ -65,11 +65,11 @@
QStringList layoutList;
if( config->hasKey("LayoutList") ) {
- layoutList = config->readListEntry("LayoutList");
+ config->readEntry("LayoutList", layoutList);
}
else { // old config
QString mainLayout = config->readEntry("Layout", DEFAULT_LAYOUT_UNIT.toPair());
- layoutList = config->readListEntry("Additional");
+ config->readEntry("Additional", layoutList);
layoutList.prepend(mainLayout);
}
if( layoutList.count() == 0 )
@@ -83,7 +83,8 @@
kDebug() << "Found " << m_layouts.count() << " layouts, default is " << \
getDefaultLayout().toPair() << endl;
- QStringList displayNamesList = config->readListEntry("DisplayNames", ',');
+ QStringList displayNamesList;
+ config->readEntry("DisplayNames", displayNamesList, ',');
for(QStringList::ConstIterator it = displayNamesList.begin(); it != \
displayNamesList.end() ; ++it) { QStringList displayNamePair = (*it).split(':');
if( displayNamePair.count() == 2 ) {
@@ -97,9 +98,10 @@
// m_includes.clear();
if( X11Helper::areSingleGroupsSupported() ) {
if( config->hasKey("IncludeGroups") ) {
- QStringList includeList = config->readListEntry("IncludeGroups", ',');
+ QStringList includeList;
+ config->readEntry("IncludeGroups", includeList, ',');
for(QStringList::ConstIterator it = includeList.begin(); it != includeList.end() \
; ++it) {
- QStringList includePair = QStringList::split(':', *it );
+ QStringList includePair = (*it).split(':');
if( includePair.count() == 2 ) {
LayoutUnit layoutUnit( includePair[0] );
if( m_layouts.contains( layoutUnit ) ) {
@@ -111,7 +113,8 @@
}
else { //old includes format
kDebug() << "Old includes..." << endl;
- QStringList includeList = config->readListEntry("Includes");
+ QStringList includeList;
+ config->readEntry("Includes", includeList);
for(QStringList::ConstIterator it = includeList.begin(); it != includeList.end() \
; ++it) { QString layoutName = LayoutUnit::parseLayout( *it );
LayoutUnit layoutUnit( layoutName, "" );
@@ -312,7 +315,7 @@
static const char* LAYOUT_PATTERN = "[a-zA-Z0-9_/-]*";
QString varLine = layvar.trimmed();
QRegExp rx(LAYOUT_PATTERN);
- int pos = rx.search(varLine, 0);
+ int pos = rx.indexIn(varLine, 0);
int len = rx.matchedLength();
// check for errors
if( pos < 0 || len < 2 )
@@ -331,7 +334,7 @@
static const char* VARIANT_PATTERN = "\\([a-zA-Z0-9_-]*\\)";
QString varLine = layvar.trimmed();
QRegExp rx(VARIANT_PATTERN);
- int pos = rx.search(varLine, 0);
+ int pos = rx.indexIn(varLine, 0);
int len = rx.matchedLength();
// check for errors
if( pos < 2 || len < 2 )
--- trunk/KDE/kdebase/workspace/kcontrol/kxkb/kxkbconfig.h #556632:556633
@@ -12,10 +12,10 @@
#ifndef KXKBCONFIG_H
#define KXKBCONFIG_H
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qqueue.h>
-#include <qmap.h>
+#include <QString>
+#include <QStringList>
+#include <QQueue>
+#include <QMap>
/* Utility classes for per-window/per-application layout implementation
--- trunk/KDE/kdebase/workspace/kcontrol/kxkb/layoutmap.h #556632:556633
@@ -15,8 +15,8 @@
#include <assert.h>
-#include <qqueue.h>
-#include <qmap.h>
+#include <QQueue>
+#include <QMap>
#include <kwinmodule.h>
#include <kdebug.h>
--- trunk/KDE/kdebase/workspace/kcontrol/kxkb/pixmap.cpp #556632:556633
@@ -1,9 +1,8 @@
-#include <qimage.h>
-//#include <qbitmap.h>
-#include <qfont.h>
-#include <qpainter.h>
-#include <qregexp.h>
-#include <qhash.h>
+#include <QImage>
+#include <QFont>
+#include <QPainter>
+#include <QRegExp>
+#include <QHash>
#include <kstandarddirs.h>
#include <klocale.h>
--- trunk/KDE/kdebase/workspace/kcontrol/kxkb/rules.cpp #556632:556633
@@ -1,10 +1,10 @@
#include <qwindowdefs.h>
-#include <qfile.h>
-#include <qtextstream.h>
-#include <qregexp.h>
-#include <qstringlist.h>
-#include <qdir.h>
#include <QX11Info>
+#include <QRegExp>
+#include <QStringList>
+#include <QTextStream>
+#include <QFile>
+#include <QDir>
#include <kstandarddirs.h>
#include <kglobal.h>
--- trunk/KDE/kdebase/workspace/kcontrol/kxkb/x11helper.cpp #556632:556633
@@ -1,11 +1,11 @@
-#include <qdir.h>
-#include <qstring.h>
#include <qwindowdefs.h>
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qhash.h>
-#include <qregexp.h>
-#include <qtextstream.h>
+#include <QDir>
+#include <QString>
+#include <QString>
+#include <QStringList>
+#include <QHash>
+#include <QRegExp>
+#include <QTextStream>
#include <kdebug.h>
--- trunk/KDE/kdebase/workspace/kcontrol/kxkb/x11helper.h #556632:556633
@@ -1,8 +1,8 @@
#ifndef X11HELPER_H_
#define X11HELPER_H_
-#include <qhash.h>
-#include <qstringlist.h>
+#include <QHash>
+#include <QStringList>
#include <kwin.h>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic