[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: branches/work/kde4/kdebase/kcontrol
From: Laurent Montel <montel () kde ! org>
Date: 2005-07-19 15:02:55
Message-ID: 1121785375.488245.20700.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 436350 by mlaurent:
Fix versioning of QDataStream
M +1 -1 ebrowsing/plugins/ikws/ikwsopts_ui.ui
M +3 -3 ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp
M +1 -1 ebrowsing/plugins/ikws/searchproviderdlg.cpp
M +4 -0 kded/kcmkded.cpp
M +5 -3 kfontinst/kcmfontinst/SettingsDialog.cpp
M +2 -0 kio/kcookiesmanagement.cpp
M +3 -0 konsole/schemaeditor.cpp
M +2 -0 krdb/krdb.cpp
M +10 -0 smartcard/smartcard.cpp
--- branches/work/kde4/kdebase/kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui \
#436349:436350 @@ -156,7 +156,7 @@
<cstring>spacer1</cstring>
</property>
<property name="orientation">
- <enum>Vertical</enum>
+ <enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>Expanding</enum>
--- branches/work/kde4/kdebase/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp \
#436349:436350 @@ -170,7 +170,7 @@
PIDDBG << "Generating substitution map:\n";
// Generate substitution map from user query:
- for (unsigned int i=0; i<=l.count(); i++)
+ for (int i=0; i<=l.count(); i++)
{
int j = 0;
int pos = 0;
@@ -263,7 +263,7 @@
// TODO: strip whitespaces around commas
QStringList rl = QStringList::split(",", rlstring);
- unsigned int i = 0;
+ int i = 0;
while ((i<rl.count()) && !found)
{
@@ -359,7 +359,7 @@
PDVAR (" newurl", newurl);
// Generate list of unmatched strings:
QString v = "";
- for (unsigned int i=0; i<ql.count(); i++) {
+ for (int i=0; i<ql.count(); i++) {
v += " " + ql[i];
}
v = v.simplifyWhiteSpace();
--- branches/work/kde4/kdebase/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp \
#436349:436350 @@ -19,7 +19,7 @@
#include <qlabel.h>
#include <qlayout.h>
#include <qpushbutton.h>
-#include <qwhatsthis.h>
+#include <q3whatsthis.h>
#include <kapplication.h>
#include <klocale.h>
--- branches/work/kde4/kdebase/kcontrol/kded/kcmkded.cpp #436349:436350
@@ -314,6 +314,8 @@
QByteArray data, replyData;
DCOPCString replyType;
QDataStream arg( &data, QIODevice::WriteOnly );
+
+ arg.setVersion(QDataStream::Qt_3_1);
arg << service;
if (kapp->dcopClient()->call( "kded", "kded", "loadModule(QCString)", data, \
replyType, replyData ) ) { QDataStream reply(replyData);
@@ -341,6 +343,8 @@
QByteArray data;
QDataStream arg( &data, QIODevice::WriteOnly );
+ arg.setVersion(QDataStream::Qt_3_1);
+
arg << service;
if (kapp->dcopClient()->send( "kded", "kded", "unloadModule(QCString)", data ) ) {
slotServiceRunningToggled();
--- branches/work/kde4/kdebase/kcontrol/kfontinst/kcmfontinst/SettingsDialog.cpp \
#436349:436350 @@ -32,7 +32,7 @@
#include <qlayout.h>
#include <qcheckbox.h>
#include <q3vbox.h>
-#include <q3whatsthis.h>
+
#include <klocale.h>
#include <kconfig.h>
#include <kmessagebox.h>
@@ -49,13 +49,13 @@
Q3VBox *page = makeVBoxMainWidget();
itsDoX=new QCheckBox(i18n("Configure fonts for legacy X applications"), page);
- Q3WhatsThis::add(itsDoX, i18n("<p>Modern applications use a system called \
\"FontConfig\" to obtain the list of fonts. " + itsDoX->setWhatsThis( \
i18n("<p>Modern applications use a system called \"FontConfig\" to obtain the list of \
fonts. "
"Older applications, such as OpenOffice 1.x, GIMP \
1.x, etc. use the previous \"core X fonts\" mechanism for "
"this.</p><p>Selecting this option will inform the \
installer to create the necessary files so that these "
"older applications can use the fonts you \
install.</p><p>Please note, however, that this will slow down " "the installation \
process.<p>")); itsDoGs=new QCheckBox(i18n("Configure fonts for Ghostscript"), \
page);
- Q3WhatsThis::add(itsDoGs, i18n("<p>When printing, most applications create what \
is know as PostScript. This is then sent to a special " + itsDoGs->setWhatsThis( \
i18n("<p>When printing, most applications create what is know as PostScript. This is \
then sent to a special "
"application, named Ghostscript, which can \
interpret the PostScript and send the appropriate instructions "
"to your printer. If your application does not \
embed whatever fonts it uses into the PostScript, then "
"Ghostscript needs to be informed as to which \
fonts you have installed, and where they are located.</p>" @@ -88,6 +88,8 @@
QByteArray packedArgs;
QDataStream stream(&packedArgs, QIODevice::WriteOnly);
+ stream.setVersion(QDataStream::Qt_3_1);
+
stream << KFI::SPECIAL_RECONFIG;
KIO::NetAccess::synchronousRun(KIO::special(KFI_KIO_FONTS_PROTOCOL ":/", \
packedArgs), this);
--- branches/work/kde4/kdebase/kcontrol/kio/kcookiesmanagement.cpp #436349:436350
@@ -168,6 +168,8 @@
QByteArray reply;
Q3CString replyType;
QDataStream callStream(&call, QIODevice::WriteOnly);
+
+ callStream.setVersion(QDataStream::Qt_3_1);
callStream << *dIt;
if( !DCOPRef("kded", "kcookiejar").send("deleteCookiesFromDomain", (*dIt)) )
--- branches/work/kde4/kdebase/kcontrol/konsole/schemaeditor.cpp #436349:436350
@@ -86,6 +86,9 @@
QByteArray data;
QDataStream args(&data, QIODevice::WriteOnly);
+
+
+ args.setVersion(QDataStream::Qt_3_1);
args << 1;
client->send("kdesktop", "KBackgroundIface", "setExport(int)", data);
--- branches/work/kde4/kdebase/kcontrol/krdb/krdb.cpp #436349:436350
@@ -98,6 +98,8 @@
Q3CString value = QFile::encodeName(list.join(":"));
QByteArray params;
QDataStream stream(¶ms, QIODevice::WriteOnly);
+
+ stream.setVersion(QDataStream::Qt_3_1);
stream << name << value;
kapp->dcopClient()->send("klauncher", "klauncher", \
"setLaunchEnv(QCString,QCString)", params); }
--- branches/work/kde4/kdebase/kcontrol/smartcard/smartcard.cpp #436349:436350
@@ -191,6 +191,8 @@
QByteArray data, retval;
QCString rettype;
QDataStream arg(&data, IO_WriteOnly);
+
+ arg.setVersion(QDataStream::Qt_3_1);
QCString modName = "kardsvc";
arg << modName;
@@ -235,6 +237,8 @@
QByteArray dataATR;
QDataStream argATR(&dataATR,IO_WriteOnly);
+
+ argATR.setVersion(QDataStream::Qt_3_1);
argATR << *_slot;
kapp->dcopClient()->call("kded", "kardsvc", "getCardATR(QString)",
@@ -303,6 +307,8 @@
QByteArray data, retval;
QCString rettype;
QDataStream arg(&data, IO_WriteOnly);
+
+ arg.setVersion(QDataStream::Qt_3_1);
QCString modName = "kardsvc";
arg << modName;
@@ -337,6 +343,8 @@
QByteArray data, retval;
QCString rettype;
QDataStream arg(&data, IO_WriteOnly);
+
+ arg.setVersion(QDataStream::Qt_3_1);
QCString modName = "kardsvc";
arg << modName;
@@ -400,6 +408,8 @@
QByteArray data, retval;
QCString rettype;
QDataStream arg(&data, IO_WriteOnly);
+
+ arg.setVersion(QDataStream::Qt_3_1);
QCString modName = "kardsvc";
arg << modName;
kapp->dcopClient()->call("kded", "kded", "loadModule(QCString)",
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic