From c48e769eb275917717e2b55eb869f7e559293ac8 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:48:31 -0600 Subject: [PATCH] Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- dcoprss/feedbrowser.cpp | 2 +- .../advanced/kcm_sambaconf/hiddenfileview.cpp | 2 +- .../advanced/kcm_sambaconf/kcminterface.ui.h | 2 +- .../advanced/kcm_sambaconf/kcmsambaconf.cpp | 2 +- .../advanced/kcm_sambaconf/sambafile.cpp | 24 +++++----- .../advanced/kcm_sambaconf/sambafile.h | 4 +- filesharing/advanced/kcm_sambaconf/share.ui.h | 2 +- .../advanced/kcm_sambaconf/smbpasswdfile.cpp | 18 +++---- .../advanced/kcm_sambaconf/smbpasswdfile.h | 4 +- filesharing/advanced/nfs/nfsfile.cpp | 6 +-- .../propsdlgplugin/propertiespage.cpp | 10 ++-- .../propsdlgplugin/propsdlgshareplugin.cpp | 6 +-- filesharing/simple/fileshare.cpp | 18 +++---- filesharing/simple/groupconfigdlg.cpp | 12 ++--- filesharing/simple/krichtextlabel.cpp | 4 +- kdict/actions.cpp | 6 +-- kdict/actions.h | 6 +-- kdict/applet/kdictapplet.cpp | 22 ++++----- kdict/applet/kdictapplet.h | 2 +- kdict/options.cpp | 48 +++++++++---------- kdict/options.h | 2 +- kdict/toplevel.cpp | 12 ++--- kdnssd/kdedmodule/dnssdwatcher.cpp | 2 +- kget/droptarget.cpp | 2 +- kget/kfileio.cpp | 8 ++-- kget/kget_plug_in/kget_plug_in.cpp | 4 +- kget/kmainwidget.cpp | 8 ++-- kget/settings.cpp | 2 +- kget/transferlist.cpp | 6 +-- knewsticker/common/configaccess.cpp | 4 +- knewsticker/common/newsengine.cpp | 16 +++---- knewsticker/common/newsengine.h | 8 ++-- knewsticker/common/newsiconmgr.cpp | 4 +- knewsticker/knewsticker.cpp | 2 +- .../kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp | 2 +- knewsticker/newsscroller.cpp | 2 +- kopete/kopete/chatwindow/chatmessagepart.cpp | 12 ++--- kopete/kopete/chatwindow/chatview.cpp | 14 +++--- kopete/kopete/chatwindow/kopetechatwindow.cpp | 24 +++++----- .../kopetechatwindowstylemanager.cpp | 4 +- .../kopete/chatwindow/kopeteemailwindow.cpp | 12 ++--- .../chatwindow/kopeteemoticonaction.cpp | 2 +- .../kopete/chatwindow/krichtexteditpart.cpp | 22 ++++----- .../tests/chatwindowstylerendering_test.cpp | 2 +- .../config/appearance/appearanceconfig.cpp | 12 ++--- .../config/appearance/emoticonseditdialog.cpp | 8 ++-- .../kopete/config/behavior/behaviorconfig.cpp | 4 +- kopete/kopete/contactlist/kopetelviprops.cpp | 4 +- .../contactlist/kopetemetacontactlvi.cpp | 8 ++-- kopete/kopete/kopeteapplication.cpp | 2 +- kopete/kopete/kopeteballoon.cpp | 2 +- kopete/kopete/kopeteiface.cpp | 2 +- kopete/kopete/kopetewindow.cpp | 12 ++--- kopete/kopete/kopetewindow.h | 4 +- kopete/kopete/systemtray.cpp | 4 +- kopete/libkopete/avdevice/videodevicepool.cpp | 4 +- kopete/libkopete/kautoconfig.cpp | 2 +- kopete/libkopete/kautoconfig.h | 2 +- kopete/libkopete/kcautoconfigmodule.h | 4 +- kopete/libkopete/knotification.cpp | 4 +- kopete/libkopete/kopeteaccount.cpp | 4 +- kopete/libkopete/kopeteaccountmanager.cpp | 6 +-- kopete/libkopete/kopeteaway.cpp | 8 ++-- kopete/libkopete/kopeteblacklister.cpp | 4 +- kopete/libkopete/kopetecommandhandler.cpp | 16 +++---- kopete/libkopete/kopetecommandhandler.h | 6 +-- kopete/libkopete/kopetecontact.cpp | 6 +-- .../libkopete/kopeteonlinestatusmanager.cpp | 2 +- kopete/libkopete/kopetepassword.cpp | 4 +- kopete/libkopete/kopetepluginmanager.cpp | 4 +- kopete/libkopete/kopeteprefs.cpp | 16 +++---- kopete/libkopete/private/kopeteemoticons.cpp | 6 +-- .../libkopete/private/kopeteviewmanager.cpp | 2 +- kopete/libkopete/tests/kopeteemoticontest.cpp | 2 +- .../libkopete/ui/kopetefileconfirmdialog.cpp | 10 ++-- .../addbookmarksprefssettings.cpp | 4 +- kopete/plugins/alias/aliaspreferences.cpp | 6 +-- .../plugins/autoreplace/autoreplaceconfig.cpp | 4 +- .../connectionstatusplugin.cpp | 14 +++--- .../connectionstatus/connectionstatusplugin.h | 8 ++-- .../cryptography/cryptographyplugin.cpp | 2 +- kopete/plugins/cryptography/kgpgselkey.cpp | 4 +- kopete/plugins/cryptography/popuppublic.cpp | 10 ++-- kopete/plugins/history/converter.cpp | 24 +++++----- kopete/plugins/latex/latexplugin.cpp | 6 +-- .../motionautoaway/motionawayplugin.cpp | 2 +- .../netmeeting/netmeetinginvitation.cpp | 6 +-- .../plugins/netmeeting/netmeetingplugin.cpp | 2 +- .../netmeeting/netmeetingpreferences.cpp | 4 +- kopete/plugins/smpppdcs/detectornetstat.cpp | 14 +++--- kopete/plugins/smpppdcs/detectornetstat.h | 8 ++-- kopete/plugins/smpppdcs/smpppdsearcher.cpp | 18 +++---- kopete/plugins/smpppdcs/smpppdsearcher.h | 10 ++-- .../plugins/statistics/statisticsdialog.cpp | 8 ++-- .../plugins/texteffect/texteffectconfig.cpp | 4 +- .../plugins/translator/translatorplugin.cpp | 2 +- .../plugins/webpresence/webpresenceplugin.cpp | 4 +- .../webpresence/webpresencepreferences.cpp | 2 +- kopete/protocols/gadu/gaduaccount.cpp | 2 +- kopete/protocols/gadu/gaduregisteraccount.cpp | 2 +- .../ui/gwreceiveinvitationdialog.cpp | 2 +- kopete/protocols/irc/ircaccount.cpp | 2 +- kopete/protocols/irc/ircchannelcontact.cpp | 2 +- kopete/protocols/irc/ircusercontact.cpp | 2 +- kopete/protocols/irc/kcodecaction.cpp | 16 +++---- .../protocols/irc/ui/irceditaccountwidget.cpp | 8 ++-- kopete/protocols/jabber/jabberaccount.cpp | 6 +-- kopete/protocols/jabber/jabberbasecontact.cpp | 2 +- .../jabber/ui/jabbereditaccountwidget.cpp | 12 ++--- .../jabber/ui/jabberregisteraccount.cpp | 2 +- kopete/protocols/msn/msnaccount.cpp | 4 +- kopete/protocols/msn/msnchatsession.cpp | 10 ++-- kopete/protocols/msn/msncontact.cpp | 2 +- kopete/protocols/msn/msnswitchboardsocket.cpp | 6 +-- .../protocols/msn/ui/msneditaccountwidget.cpp | 8 ++-- kopete/protocols/msn/webcam.cpp | 4 +- kopete/protocols/oscar/icq/icqprotocol.cpp | 4 +- .../oscar/icq/ui/icquserinfowidget.cpp | 10 ++-- .../protocols/oscar/oscarversionupdater.cpp | 8 ++-- kopete/protocols/sms/services/gsmlib.h | 2 +- kopete/protocols/sms/services/smsclient.cpp | 14 +++--- kopete/protocols/sms/services/smsclient.h | 6 +-- .../sms/services/smssendprovider.cpp | 14 +++--- .../protocols/sms/services/smssendprovider.h | 6 +-- kopete/protocols/sms/smsaccount.h | 2 +- .../winpopup/libwinpopup/libwinpopup.cpp | 14 +++--- .../winpopup/libwinpopup/libwinpopup.h | 4 +- kopete/protocols/winpopup/wpeditaccount.cpp | 12 ++--- kopete/protocols/winpopup/wpprotocol.cpp | 6 +-- kopete/protocols/winpopup/wpuserinfo.cpp | 10 ++-- kopete/protocols/winpopup/wpuserinfo.h | 2 +- .../protocols/yahoo/libkyahoo/webcamtask.cpp | 4 +- .../yahoo/ui/yahoouserinfodialog.cpp | 6 +-- kopete/protocols/yahoo/yahoowebcam.cpp | 4 +- kpf/src/Applet.cpp | 8 ++-- kpf/src/BandwidthGraph.cpp | 6 +-- kpf/src/DirectoryLister.cpp | 2 +- kpf/src/PropertiesDialogPlugin.cpp | 2 +- kppp/accounting.cpp | 12 ++--- kppp/accounting.h | 4 +- kppp/accounts.cpp | 2 +- kppp/acctselect.cpp | 2 +- kppp/conwindow.cpp | 2 +- kppp/debug.cpp | 2 +- kppp/kpppwidget.cpp | 4 +- kppp/logview/monthly.cpp | 46 +++++++++--------- kppp/main.cpp | 6 +-- kppp/miniterm.cpp | 2 +- kppp/modems.cpp | 2 +- kppp/pppdata.cpp | 4 +- kppp/pppstatdlg.cpp | 10 ++-- kppp/providerdb.cpp | 4 +- kppp/pwentry.cpp | 2 +- kppp/ruleset.cpp | 2 +- krdc/rdp/krdpview.cpp | 12 ++--- krdc/rdp/krdpview.h | 8 ++-- krdc/vnc/kvncview.cpp | 2 +- krfb/kcm_krfb/kcm_krfb.cpp | 2 +- krfb/kinetd/kinetd.cpp | 4 +- krfb/kinetd/kinetd.h | 2 +- krfb/krfb/configuration.cc | 2 +- krfb/krfb/trayicon.cpp | 2 +- ksirc/KSOpenkSirc/serverFileParser.cpp | 2 +- ksirc/KSPrefs/page_general.cpp | 2 +- ksirc/chanparser.cpp | 2 +- ksirc/iocontroller.cpp | 48 +++++++++---------- ksirc/iocontroller.h | 14 +++--- ksirc/ksircprocess.cpp | 10 ++-- ksirc/ksircprocess.h | 4 +- ksirc/kstextview.cpp | 2 +- ksirc/messageReceiver.cpp | 2 +- ksirc/servercontroller.cpp | 2 +- ksirc/servercontroller.h | 6 +-- ksirc/toplevel.cpp | 6 +-- ktalkd/kcmktalkd/soundpage.cpp | 2 +- lanbrowsing/kcmlisa/kcmlisa.cpp | 6 +-- lanbrowsing/kcmlisa/kcmlisa.h | 4 +- lanbrowsing/kio_lan/kio_lan.cpp | 12 ++--- librss/loader.cpp | 14 +++--- librss/loader.h | 6 +-- .../interface_wireless_wirelessextensions.cpp | 2 +- wifi/kcmwifi/kcmwifi.cpp | 22 ++++----- wifi/kcmwifi/wificonfig.cpp | 4 +- wifi/kwifimanager.cpp | 10 ++-- wifi/kwifimanager.h | 4 +- wifi/kwireless/kwireless.cpp | 2 +- wifi/kwireless/kwirelesswidget.cpp | 2 +- wifi/networkscanning.cpp | 8 ++-- 188 files changed, 646 insertions(+), 646 deletions(-) diff --git a/dcoprss/feedbrowser.cpp b/dcoprss/feedbrowser.cpp index d5f1268c..1e853055 100644 --- a/dcoprss/feedbrowser.cpp +++ b/dcoprss/feedbrowser.cpp @@ -131,7 +131,7 @@ void FeedBrowserDlg::itemSelected( TQListViewItem *item ) int main( int argc, char **argv ) { - KGlobal::locale()->setMainCatalogue( "dcoprss" ); + TDEGlobal::locale()->setMainCatalogue( "dcoprss" ); TDEAboutData aboutData( "feedbrowser", I18N_NOOP( "Feed Browser" ), "0.1" ); TDECmdLineArgs::init( argc, argv, &aboutData ); TDEApplication app; diff --git a/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp b/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp index 09252315..2006e1a0 100644 --- a/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp +++ b/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp @@ -68,7 +68,7 @@ HiddenListViewItem::HiddenListViewItem( TQListView *parent, KFileItem *fi, bool setPixmap( COL_NAME, fi->pixmap(KIcon::SizeSmall)); setText( COL_NAME, fi->text() ); - setText( COL_SIZE, KGlobal::locale()->formatNumber( fi->size(), 0)); + setText( COL_SIZE, TDEGlobal::locale()->formatNumber( fi->size(), 0)); setText( COL_DATE, fi->timeString() ); setText( COL_PERM, fi->permissionsString() ); setText( COL_OWNER, fi->user() ); diff --git a/filesharing/advanced/kcm_sambaconf/kcminterface.ui.h b/filesharing/advanced/kcm_sambaconf/kcminterface.ui.h index 55b9df14..b90c47d5 100644 --- a/filesharing/advanced/kcm_sambaconf/kcminterface.ui.h +++ b/filesharing/advanced/kcm_sambaconf/kcminterface.ui.h @@ -59,7 +59,7 @@ void KcmInterface::securityLevelCombo_activated( int i ) void KcmInterface::KURLLabel1_leftClickedURL() { - KProcess* p = new KProcess(); + TDEProcess* p = new TDEProcess(); *p << "konqueror"; *p << "man:smb.conf"; diff --git a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp index fcf691da..42b56fa0 100644 --- a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp +++ b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp @@ -1434,7 +1434,7 @@ extern "C" { KDE_EXPORT KCModule *create_KcmSambaConf(TQWidget *parent, const char *name) { - KGlobal::locale()->insertCatalogue("kfileshare"); + TDEGlobal::locale()->insertCatalogue("kfileshare"); return new KcmSambaConf(parent, name); } } diff --git a/filesharing/advanced/kcm_sambaconf/sambafile.cpp b/filesharing/advanced/kcm_sambaconf/sambafile.cpp index 4703716b..3a865c62 100644 --- a/filesharing/advanced/kcm_sambaconf/sambafile.cpp +++ b/filesharing/advanced/kcm_sambaconf/sambafile.cpp @@ -170,7 +170,7 @@ bool SambaFile::slotApply() KURL url(path); if (KURL(path).isLocalFile()) { - KProcess proc; + TDEProcess proc; kdDebug(5009) << "SambaFile::slotApply: is local file!" << endl; TQString suCommand=TQString("cp %1 %2; rm %3") @@ -179,7 +179,7 @@ bool SambaFile::slotApply() .arg(_tempFile->name()); proc << "tdesu" << "-d" << suCommand; - if (! proc.start(KProcess::Block)) { + if (! proc.start(TDEProcess::Block)) { kdDebug(5009) << "SambaFile::slotApply: saving to " << path << " failed!" << endl; //KMessageBox::sorry(0,i18n("Saving the results to %1 failed.").arg(path)); delete _tempFile; @@ -341,18 +341,18 @@ int SambaFile::getSambaVersion() { if (_sambaVersion > -1) return _sambaVersion; - KProcess testParam; + TDEProcess testParam; testParam << "testparm"; testParam << "-V"; _parmOutput = TQString(""); _sambaVersion = 2; - connect( &testParam, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)), - this, TQT_SLOT(testParmStdOutReceived(KProcess*,char*,int))); + connect( &testParam, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), + this, TQT_SLOT(testParmStdOutReceived(TDEProcess*,char*,int))); - if (testParam.start(KProcess::Block,KProcess::Stdout)) { + if (testParam.start(TDEProcess::Block,TDEProcess::Stdout)) { if (_parmOutput.find("3") > -1) _sambaVersion = 3; } @@ -369,7 +369,7 @@ SambaShare* SambaFile::getTestParmValues(bool reload) return _testParmValues; - KProcess testParam; + TDEProcess testParam; testParam << "testparm"; testParam << "-s"; @@ -380,10 +380,10 @@ SambaShare* SambaFile::getTestParmValues(bool reload) testParam << "/dev/null"; _parmOutput = TQString(""); - connect( &testParam, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)), - this, TQT_SLOT(testParmStdOutReceived(KProcess*,char*,int))); + connect( &testParam, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), + this, TQT_SLOT(testParmStdOutReceived(TDEProcess*,char*,int))); - if (testParam.start(KProcess::Block,KProcess::Stdout)) + if (testParam.start(TDEProcess::Block,TDEProcess::Stdout)) { parseParmStdOutput(); } else @@ -392,7 +392,7 @@ SambaShare* SambaFile::getTestParmValues(bool reload) return _testParmValues; } -void SambaFile::testParmStdOutReceived(KProcess *, char *buffer, int buflen) +void SambaFile::testParmStdOutReceived(TDEProcess *, char *buffer, int buflen) { _parmOutput+=TQString::fromLatin1(buffer,buflen); } @@ -429,7 +429,7 @@ void SambaFile::parseParmStdOutput() } // we are only interested in the global section - if (section != KGlobal::staticQString("global")) + if (section != TDEGlobal::staticQString("global")) continue; // parameter diff --git a/filesharing/advanced/kcm_sambaconf/sambafile.h b/filesharing/advanced/kcm_sambaconf/sambafile.h index 3d4f0a4d..3696b220 100644 --- a/filesharing/advanced/kcm_sambaconf/sambafile.h +++ b/filesharing/advanced/kcm_sambaconf/sambafile.h @@ -30,7 +30,7 @@ class KSimpleConfig; -class KProcess; +class TDEProcess; class KConfig; class KTempFile; @@ -166,7 +166,7 @@ public slots: **/ bool slotApply(); protected slots: - void testParmStdOutReceived(KProcess *proc, char *buffer, int buflen); + void testParmStdOutReceived(TDEProcess *proc, char *buffer, int buflen); void slotJobFinished( KIO::Job *); void slotSaveJobFinished( KIO::Job *); diff --git a/filesharing/advanced/kcm_sambaconf/share.ui.h b/filesharing/advanced/kcm_sambaconf/share.ui.h index edcb2f7c..4e0d73e6 100644 --- a/filesharing/advanced/kcm_sambaconf/share.ui.h +++ b/filesharing/advanced/kcm_sambaconf/share.ui.h @@ -249,7 +249,7 @@ void KcmShareDlg::storeDosAttributesChk_toggled( bool b) void KcmShareDlg::buttonHelp_clicked() { - KProcess* p = new KProcess(); + TDEProcess* p = new TDEProcess(); *p << "konqueror"; *p << "man:smb.conf"; p->start(); diff --git a/filesharing/advanced/kcm_sambaconf/smbpasswdfile.cpp b/filesharing/advanced/kcm_sambaconf/smbpasswdfile.cpp index 8286cdf3..50bf2713 100644 --- a/filesharing/advanced/kcm_sambaconf/smbpasswdfile.cpp +++ b/filesharing/advanced/kcm_sambaconf/smbpasswdfile.cpp @@ -112,15 +112,15 @@ SambaUserList SmbPasswdFile::getSambaUserList() } bool SmbPasswdFile::executeSmbpasswd(const TQStringList & args) { - KProcess p; + TDEProcess p; p << "smbpasswd" << args; - connect( &p, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)), - this, TQT_SLOT(smbpasswdStdOutReceived(KProcess*,char*,int))); + connect( &p, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), + this, TQT_SLOT(smbpasswdStdOutReceived(TDEProcess*,char*,int))); _smbpasswdOutput = ""; - bool result = p.start(KProcess::Block,KProcess::Stdout); + bool result = p.start(TDEProcess::Block,TDEProcess::Stdout); if (result) { @@ -136,17 +136,17 @@ bool SmbPasswdFile::executeSmbpasswd(const TQStringList & args) { **/ bool SmbPasswdFile::addUser(const SambaUser & user,const TQString & password) { - KProcess p; + TDEProcess p; p << "smbpasswd" << "-a" << user.name; p << password; - connect( &p, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)), - this, TQT_SLOT(smbpasswdStdOutReceived(KProcess*,char*,int))); + connect( &p, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), + this, TQT_SLOT(smbpasswdStdOutReceived(TDEProcess*,char*,int))); _smbpasswdOutput = ""; - bool result = p.start(KProcess::Block,KProcess::Stdout); + bool result = p.start(TDEProcess::Block,TDEProcess::Stdout); if (result) { @@ -173,7 +173,7 @@ bool SmbPasswdFile::changePassword(const SambaUser & user, const TQString & newP } -void SmbPasswdFile::smbpasswdStdOutReceived(KProcess *, char *buffer, int buflen) +void SmbPasswdFile::smbpasswdStdOutReceived(TDEProcess *, char *buffer, int buflen) { _smbpasswdOutput+=TQString::fromLatin1(buffer,buflen); } diff --git a/filesharing/advanced/kcm_sambaconf/smbpasswdfile.h b/filesharing/advanced/kcm_sambaconf/smbpasswdfile.h index 14ae0102..df737994 100644 --- a/filesharing/advanced/kcm_sambaconf/smbpasswdfile.h +++ b/filesharing/advanced/kcm_sambaconf/smbpasswdfile.h @@ -38,7 +38,7 @@ #include class SambaFile; -class KProcess; +class TDEProcess; /** * Simple class to store a Samba User @@ -136,7 +136,7 @@ protected: TQString _smbpasswdOutput; protected slots: - void smbpasswdStdOutReceived(KProcess*,char*,int); + void smbpasswdStdOutReceived(TDEProcess*,char*,int); }; #endif diff --git a/filesharing/advanced/nfs/nfsfile.cpp b/filesharing/advanced/nfs/nfsfile.cpp index 9a1c787b..58c62ca8 100644 --- a/filesharing/advanced/nfs/nfsfile.cpp +++ b/filesharing/advanced/nfs/nfsfile.cpp @@ -241,8 +241,8 @@ bool NFSFile::save() KProcIO proc; TQString command = TQString("cp %1 %2") - .arg(KProcess::quote( tempFile.name() )) - .arg(KProcess::quote( _url.path() )); + .arg(TDEProcess::quote( tempFile.name() )) + .arg(TDEProcess::quote( _url.path() )); if (restartNFSServer) command +=";exportfs -ra"; @@ -250,7 +250,7 @@ bool NFSFile::save() if (!TQFileInfo(_url.path()).isWritable() ) proc<<"tdesu" << "-d" << "-c"<saveTo(nfsTempFile.name()); command += TQString("cp %1 %2;exportfs -ra;") - .arg(KProcess::quote( nfsTempFile.name() )) - .arg(KProcess::quote( nfsFileName )); + .arg(TDEProcess::quote( nfsTempFile.name() )) + .arg(TDEProcess::quote( nfsFileName )); } if (sambaNeedsKDEsu) { sambaFile->saveTo(sambaTempFile.name()); command += TQString("cp %1 %2;") - .arg(KProcess::quote( sambaTempFile.name() )) - .arg(KProcess::quote( sambaFileName )); + .arg(TDEProcess::quote( sambaTempFile.name() )) + .arg(TDEProcess::quote( sambaFileName )); } proc<<"tdesu" << "-d" << "-c"<insertCatalogue("kfileshare"); + TDEGlobal::locale()->insertCatalogue("kfileshare"); if (KFileShare::shareMode() == KFileShare::Simple) { kdDebug(5009) << "PropsDlgSharePlugin: Sharing mode is simple. Aborting." << endl; @@ -100,9 +100,9 @@ PropsDlgSharePlugin::PropsDlgSharePlugin( KPropertiesDialog *dlg, void PropsDlgSharePlugin::slotConfigureFileSharing() { - KProcess proc; + TDEProcess proc; proc << KStandardDirs::findExe("tdesu") << locate("exe", "kcmshell") << "fileshare"; - proc.start( KProcess::DontCare ); + proc.start( TDEProcess::DontCare ); } diff --git a/filesharing/simple/fileshare.cpp b/filesharing/simple/fileshare.cpp index 5b796823..15007fdb 100644 --- a/filesharing/simple/fileshare.cpp +++ b/filesharing/simple/fileshare.cpp @@ -63,7 +63,7 @@ K_EXPORT_COMPONENT_FACTORY (kcm_fileshare, ShareFactory("kcmfileshare") ) KFileShareConfig::KFileShareConfig(TQWidget *parent, const char *name, const TQStringList &): KCModule(ShareFactory::instance(), parent, name) { - KGlobal::locale()->insertCatalogue("kfileshare"); + TDEGlobal::locale()->insertCatalogue("kfileshare"); TQBoxLayout* layout = new TQVBoxLayout(this,0, KDialog::spacingHint()); @@ -221,18 +221,18 @@ void KFileShareConfig::load() } bool KFileShareConfig::addGroupAccessesToFile(const TQString & file) { - KProcess chgrp; + TDEProcess chgrp; chgrp << "chgrp" << m_fileShareGroup << file; - KProcess chmod; + TDEProcess chmod; chmod << "chmod" << "g=rw" << file; - if (!chgrp.start(KProcess::Block) && chgrp.normalExit()) { + if (!chgrp.start(TDEProcess::Block) && chgrp.normalExit()) { kdDebug(FILESHARE_DEBUG) << "KFileShareConfig::addGroupAccessesToFile: chgrp failed" << endl; return false; } - if(!chmod.start(KProcess::Block) && chmod.normalExit()) { + if(!chmod.start(TDEProcess::Block) && chmod.normalExit()) { kdDebug(FILESHARE_DEBUG) << "KFileShareConfig::addGroupAccessesToFile: chmod failed" << endl; return false; } @@ -242,18 +242,18 @@ bool KFileShareConfig::addGroupAccessesToFile(const TQString & file) { } bool KFileShareConfig::removeGroupAccessesFromFile(const TQString & file) { - KProcess chgrp; + TDEProcess chgrp; chgrp << "chgrp" << "root" << file; - KProcess chmod; + TDEProcess chmod; chmod << "chmod" << "g=r" << file; - if (!chgrp.start(KProcess::Block) && chgrp.normalExit()) { + if (!chgrp.start(TDEProcess::Block) && chgrp.normalExit()) { kdDebug(FILESHARE_DEBUG) << "KFileShareConfig::removeGroupAccessesFromFile: chgrp failed" << endl; return false; } - if(!chmod.start(KProcess::Block) && chmod.normalExit()) { + if(!chmod.start(TDEProcess::Block) && chmod.normalExit()) { kdDebug(FILESHARE_DEBUG) << "KFileShareConfig::removeGroupAccessesFromFile: chmod failed" << endl; return false; } diff --git a/filesharing/simple/groupconfigdlg.cpp b/filesharing/simple/groupconfigdlg.cpp index a57d0f79..86173f2b 100644 --- a/filesharing/simple/groupconfigdlg.cpp +++ b/filesharing/simple/groupconfigdlg.cpp @@ -222,9 +222,9 @@ void GroupConfigDlg::slotOk() { } bool userMod(const TQString & user, const TQValueList & groups) { - KProcess proc; + TDEProcess proc; proc << "usermod" << "-G" << groupListToString(groups) << user; - return proc.start(KProcess::Block) && proc.normalExit(); + return proc.start(TDEProcess::Block) && proc.normalExit(); } void GroupConfigDlg::slotRemoveUser() { @@ -381,9 +381,9 @@ bool GroupConfigDlg::deleteGroup(const TQString & s) { return false; } - KProcess proc; + TDEProcess proc; proc << "groupdel" << s; - bool result = proc.start(KProcess::Block) && proc.normalExit(); + bool result = proc.start(TDEProcess::Block) && proc.normalExit(); if (!result) { KMessageBox::sorry(this,i18n("Deleting group '%1' failed.").arg(s)); } @@ -402,9 +402,9 @@ bool GroupConfigDlg::createFileShareGroup(const TQString & s) { return false; //debug("CreateFileShareGroup: "+s); - KProcess proc; + TDEProcess proc; proc << "groupadd" << s; - bool result = proc.start(KProcess::Block) && proc.normalExit(); + bool result = proc.start(TDEProcess::Block) && proc.normalExit(); if (!result) { KMessageBox::sorry(this,i18n("Creation of group '%1' failed.").arg(s)); } else { diff --git a/filesharing/simple/krichtextlabel.cpp b/filesharing/simple/krichtextlabel.cpp index 499577b0..0df5a95f 100644 --- a/filesharing/simple/krichtextlabel.cpp +++ b/filesharing/simple/krichtextlabel.cpp @@ -40,14 +40,14 @@ static TQString qrichtextify( const TQString& text ) KRichTextLabel::KRichTextLabel( const TQString &text , TQWidget *parent, const char *name ) : TQLabel ( parent, name ) { - m_defaultWidth = TQMIN(400, KGlobalSettings::desktopGeometry(this).width()*2/5); + m_defaultWidth = TQMIN(400, TDEGlobalSettings::desktopGeometry(this).width()*2/5); setAlignment( TQt::WordBreak ); setText(text); } KRichTextLabel::KRichTextLabel( TQWidget *parent, const char *name ) : TQLabel ( parent, name ) { - m_defaultWidth = TQMIN(400, KGlobalSettings::desktopGeometry(this).width()*2/5); + m_defaultWidth = TQMIN(400, TDEGlobalSettings::desktopGeometry(this).width()*2/5); setAlignment( TQt::WordBreak ); } diff --git a/kdict/actions.cpp b/kdict/actions.cpp index 1c9c757c..5acf3c3c 100644 --- a/kdict/actions.cpp +++ b/kdict/actions.cpp @@ -26,7 +26,7 @@ DictComboAction::DictComboAction( const TQString &text, TQObject *parent, const char *name, bool editable, bool autoSized ) - : KAction( text, 0, parent, name ), m_editable(editable), m_autoSized(autoSized), m_compMode(KGlobalSettings::completionMode()) + : KAction( text, 0, parent, name ), m_editable(editable), m_autoSized(autoSized), m_compMode(TDEGlobalSettings::completionMode()) { } @@ -160,7 +160,7 @@ void DictComboAction::setList(TQStringList items) } -KGlobalSettings::Completion DictComboAction::completionMode() +TDEGlobalSettings::Completion DictComboAction::completionMode() { if (m_combo) return m_combo->completionMode(); @@ -169,7 +169,7 @@ KGlobalSettings::Completion DictComboAction::completionMode() } -void DictComboAction::setCompletionMode(KGlobalSettings::Completion mode) +void DictComboAction::setCompletionMode(TDEGlobalSettings::Completion mode) { if (m_combo) m_combo->setCompletionMode(mode); diff --git a/kdict/actions.h b/kdict/actions.h index a1b26474..bf7553d2 100644 --- a/kdict/actions.h +++ b/kdict/actions.h @@ -53,8 +53,8 @@ class DictComboAction : public KAction void clear(); void setList(TQStringList items); - KGlobalSettings::Completion completionMode(); - void setCompletionMode(KGlobalSettings::Completion mode); + TDEGlobalSettings::Completion completionMode(); + void setCompletionMode(TDEGlobalSettings::Completion mode); signals: void activated(int); @@ -67,7 +67,7 @@ class DictComboAction : public KAction private: TQGuardedPtr m_combo; bool m_editable, m_autoSized; - KGlobalSettings::Completion m_compMode; + TDEGlobalSettings::Completion m_compMode; }; diff --git a/kdict/applet/kdictapplet.cpp b/kdict/applet/kdictapplet.cpp index 054bf953..51f02faf 100644 --- a/kdict/applet/kdictapplet.cpp +++ b/kdict/applet/kdictapplet.cpp @@ -76,7 +76,7 @@ extern "C" { KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) { - KGlobal::locale()->insertCatalogue("kdictapplet"); + TDEGlobal::locale()->insertCatalogue("kdictapplet"); return new DictApplet(configFile, KPanelApplet::Stretch, 0, parent, "kdictapplet"); } } @@ -99,7 +99,7 @@ DictApplet::DictApplet(const TQString& configFile, Type type, int actions, TQWid iconLabel = new TQLabel(baseWidget); iconLabel->setBackgroundOrigin(AncestorOrigin); - TQPixmap pm = KGlobal::iconLoader()->loadIcon("kdict", KIcon::Panel, KIcon::SizeSmall, KIcon::DefaultState, 0L, true); + TQPixmap pm = TDEGlobal::iconLoader()->loadIcon("kdict", KIcon::Panel, KIcon::SizeSmall, KIcon::DefaultState, 0L, true); iconLabel->setPixmap(pm); baseLay->addWidget(iconLabel,1,0); iconLabel->setAlignment(TQt::AlignCenter | TQt::AlignVCenter); @@ -162,10 +162,10 @@ DictApplet::DictApplet(const TQString& configFile, Type type, int actions, TQWid connect(externalCombo, TQT_SIGNAL(returnPressed(const TQString&)), TQT_SLOT(startQuery(const TQString&))); externalCombo->setFixedSize(160, externalCombo->sizeHint().height()); - connect(internalCombo, TQT_SIGNAL(completionModeChanged(KGlobalSettings::Completion)), - this, TQT_SLOT(updateCompletionMode(KGlobalSettings::Completion))); - connect(externalCombo, TQT_SIGNAL(completionModeChanged(KGlobalSettings::Completion)), - this, TQT_SLOT(updateCompletionMode(KGlobalSettings::Completion))); + connect(internalCombo, TQT_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)), + this, TQT_SLOT(updateCompletionMode(TDEGlobalSettings::Completion))); + connect(externalCombo, TQT_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)), + this, TQT_SLOT(updateCompletionMode(TDEGlobalSettings::Completion))); // restore history and completion list KConfig *c = config(); @@ -174,9 +174,9 @@ DictApplet::DictApplet(const TQString& configFile, Type type, int actions, TQWid TQStringList list = c->readListEntry("Completion list"); completionObject->setItems(list); int mode = c->readNumEntry("Completion mode", - KGlobalSettings::completionMode()); - internalCombo->setCompletionMode((KGlobalSettings::Completion)mode); - externalCombo->setCompletionMode((KGlobalSettings::Completion)mode); + TDEGlobalSettings::completionMode()); + internalCombo->setCompletionMode((TDEGlobalSettings::Completion)mode); + externalCombo->setCompletionMode((TDEGlobalSettings::Completion)mode); list = c->readListEntry("History list"); internalCombo->setHistoryItems(list); @@ -252,7 +252,7 @@ void DictApplet::resizeEvent(TQResizeEvent*) verticalBtn->setFixedSize(width(),width()); KIcon::StdSizes sz = width() < 32 ? KIcon::SizeSmall : (width() < 48 ? KIcon::SizeMedium : KIcon::SizeLarge); - TQPixmap pm = KGlobal::iconLoader()->loadIcon("kdict", KIcon::Panel, sz, KIcon::DefaultState, 0L, true); + TQPixmap pm = TDEGlobal::iconLoader()->loadIcon("kdict", KIcon::Panel, sz, KIcon::DefaultState, 0L, true); verticalBtn->setPixmap(pm); } } @@ -394,7 +394,7 @@ void DictApplet::externalComboHidden() verticalBtn->setDown(false); } -void DictApplet::updateCompletionMode(KGlobalSettings::Completion mode) +void DictApplet::updateCompletionMode(TDEGlobalSettings::Completion mode) { internalCombo->setCompletionMode(mode); externalCombo->setCompletionMode(mode); diff --git a/kdict/applet/kdictapplet.h b/kdict/applet/kdictapplet.h index b7b94286..d1127e15 100644 --- a/kdict/applet/kdictapplet.h +++ b/kdict/applet/kdictapplet.h @@ -84,7 +84,7 @@ protected slots: void startMatch(); void showExternalCombo(); void externalComboHidden(); - void updateCompletionMode(KGlobalSettings::Completion mode); + void updateCompletionMode(TDEGlobalSettings::Completion mode); private: KHistoryCombo *internalCombo, *externalCombo; diff --git a/kdict/options.cpp b/kdict/options.cpp index efb5f962..e7ff3339 100644 --- a/kdict/options.cpp +++ b/kdict/options.cpp @@ -44,7 +44,7 @@ void GlobalData::read() { - KConfig *config=KGlobal::config(); + KConfig *config=TDEGlobal::config(); // general... config->setGroup("General"); @@ -67,27 +67,27 @@ void GlobalData::read() config->setGroup("Colors"); useCustomColors=config->readBoolEntry("customColors", false); - TQColor defCol=KGlobalSettings::textColor(); + TQColor defCol=TDEGlobalSettings::textColor(); c_olors[Ctext]=config->readColorEntry("textColor",&defCol); c_olorNames[Ctext]=i18n("Text"); - defCol=KGlobalSettings::baseColor(); + defCol=TDEGlobalSettings::baseColor(); c_olors[Cbackground]=config->readColorEntry("backgroundColor",&defCol); c_olorNames[Cbackground]=i18n("Background"); - defCol=KGlobalSettings::highlightedTextColor(); + defCol=TDEGlobalSettings::highlightedTextColor(); c_olors[CheadingsText]=config->readColorEntry("headingsTextColor",&defCol); c_olorNames[CheadingsText]=i18n("Heading Text"); - defCol=KGlobalSettings::highlightColor(); + defCol=TDEGlobalSettings::highlightColor(); c_olors[CheadingsBackground]=config->readColorEntry("headingsBackgroundColor",&defCol); c_olorNames[CheadingsBackground]=i18n("Heading Background"); - defCol=KGlobalSettings::linkColor(); + defCol=TDEGlobalSettings::linkColor(); c_olors[Clinks]=config->readColorEntry("linksColor",&defCol); c_olorNames[Clinks]=i18n("Link"); - defCol=KGlobalSettings::visitedLinkColor(); + defCol=TDEGlobalSettings::visitedLinkColor(); c_olors[CvisitedLinks]=config->readColorEntry("linksColor",&defCol); c_olorNames[CvisitedLinks]=i18n("Followed Link"); @@ -95,7 +95,7 @@ void GlobalData::read() config->setGroup("Fonts"); useCustomFonts=config->readBoolEntry("customFonts", false); - TQFont defFont=KGlobalSettings::generalFont(); + TQFont defFont=TDEGlobalSettings::generalFont(); f_onts[Ftext]=config->readFontEntry("textFont",&defFont); f_ontNames[Ftext]=i18n("Text"); @@ -114,8 +114,8 @@ void GlobalData::read() splitterSizes = config->readIntListEntry("Splitter_Sizes"); config->setGroup("Query Combo"); - queryComboCompletionMode = (KGlobalSettings::Completion)config->readNumEntry("Completion_mode", - KGlobalSettings::completionMode()); + queryComboCompletionMode = (TDEGlobalSettings::Completion)config->readNumEntry("Completion_mode", + TDEGlobalSettings::completionMode()); config->setGroup("Query_History"); queryHistory = config->readListEntry("History"); @@ -182,7 +182,7 @@ void GlobalData::read() void GlobalData::write() { - KConfig *config=KGlobal::config(); + KConfig *config=TDEGlobal::config(); config->setGroup("General"); config->writeEntry("Lookup_Clipboard",defineClipboard); @@ -249,32 +249,32 @@ TQColor GlobalData::defaultColor(int i) { switch(i) { case Ctext: - return KGlobalSettings::textColor(); + return TDEGlobalSettings::textColor(); break; case Cbackground: - return KGlobalSettings::baseColor(); + return TDEGlobalSettings::baseColor(); break; case CheadingsText: - return KGlobalSettings::highlightedTextColor(); + return TDEGlobalSettings::highlightedTextColor(); break; case CheadingsBackground: - return KGlobalSettings::highlightColor(); + return TDEGlobalSettings::highlightColor(); break; case Clinks: - return KGlobalSettings::linkColor(); + return TDEGlobalSettings::linkColor(); break; case CvisitedLinks: - return KGlobalSettings::visitedLinkColor(); + return TDEGlobalSettings::visitedLinkColor(); break; } - return KGlobalSettings::baseColor(); + return TDEGlobalSettings::baseColor(); } @@ -334,7 +334,7 @@ TQColor GlobalData::visitedLinksColor() TQFont GlobalData::defaultFont(int i) { - TQFont font = KGlobalSettings::generalFont(); + TQFont font = TDEGlobalSettings::generalFont(); if (font.pointSize() < 5) font.setPointSize(12); @@ -535,10 +535,10 @@ OptionsDialog::OptionsDialog(TQWidget *parent, const char *name) grid->addWidget(w_pipesize,4,1); connect( w_pipesize, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( slotChanged() ) ); - TQStringList encodingNames = KGlobal::charsets()->descriptiveEncodingNames(); + TQStringList encodingNames = TDEGlobal::charsets()->descriptiveEncodingNames(); int i=0,x=0; for ( TQStringList::Iterator it = encodingNames.begin(); it != encodingNames.end(); ++it ) { - if (KGlobal::charsets()->encodingForName(*it)==global->encoding) { + if (TDEGlobal::charsets()->encodingForName(*it)==global->encoding) { x = i; break; } @@ -743,7 +743,7 @@ void OptionsDialog::slotApply() global->timeout = w_timeout->value(); global->idleHold = w_idleHold->value(); global->pipeSize = w_pipesize->value(); - global->encoding = KGlobal::charsets()->encodingForName(w_encoding->currentText()); + global->encoding = TDEGlobal::charsets()->encodingForName(w_encoding->currentText()); global->authEnabled = w_auth->isChecked(); global->user = w_user->text(); global->secret = w_secret->text(); @@ -792,9 +792,9 @@ void OptionsDialog::slotDefault() w_idleHold->setValue(30); w_timeout->setValue(60); w_pipesize->setValue(256); - encodingNames = KGlobal::charsets()->descriptiveEncodingNames(); + encodingNames = TDEGlobal::charsets()->descriptiveEncodingNames(); for ( TQStringList::Iterator it = encodingNames.begin(); it != encodingNames.end(); ++it ) { - if (KGlobal::charsets()->encodingForName(*it)=="utf8") + if (TDEGlobal::charsets()->encodingForName(*it)=="utf8") x = i; i++; } diff --git a/kdict/options.h b/kdict/options.h index a04f9ac6..cea767c1 100644 --- a/kdict/options.h +++ b/kdict/options.h @@ -78,7 +78,7 @@ public: bool showMatchList; TQValueList splitterSizes; - KGlobalSettings::Completion queryComboCompletionMode; + TDEGlobalSettings::Completion queryComboCompletionMode; TQStringList queryHistory; bool saveHistory; // save query history to disk on exit? diff --git a/kdict/toplevel.cpp b/kdict/toplevel.cpp index 17374766..a1bacd2b 100644 --- a/kdict/toplevel.cpp +++ b/kdict/toplevel.cpp @@ -90,7 +90,7 @@ TopLevel::TopLevel(TQWidget* parent, const char* name) if (global->showMatchList) { // show splitter, html view & match list splitter = new TQSplitter(Qt::Horizontal,this); - splitter->setOpaqueResize( KGlobalSettings::opaqueResize() ); + splitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() ); queryView->reparent(splitter,0,queryView->pos(),true); matchView->reparent(splitter,0,matchView->pos(),true); setCentralWidget(splitter); @@ -105,7 +105,7 @@ TopLevel::TopLevel(TQWidget* parent, const char* name) //apply settings resize(600,390); - applyMainWindowSettings(KGlobal::config(),"toplevel_options"); + applyMainWindowSettings(TDEGlobal::config(),"toplevel_options"); stratDbChanged(); // fill combos, build menus actQueryCombo->setFocus(); // place cursor in combobox @@ -295,7 +295,7 @@ bool TopLevel::queryClose() { kdDebug(5004) << "TopLevel::queryClose()" << endl; - saveMainWindowSettings(KGlobal::config(),"toplevel_options"); + saveMainWindowSettings(TDEGlobal::config(),"toplevel_options"); saveMatchViewSize(); global->queryComboCompletionMode = actQueryCombo->completionMode(); @@ -642,7 +642,7 @@ void TopLevel::toggleMatchListShow() { global->showMatchList = true; splitter = new TQSplitter(Qt::Horizontal,this); - splitter->setOpaqueResize( KGlobalSettings::opaqueResize() ); + splitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() ); setCentralWidget(splitter); splitter->show(); queryView->reparent(splitter,0,queryView->pos(),true); @@ -675,7 +675,7 @@ void TopLevel::adjustMatchViewSize() void TopLevel::slotConfToolbar() { - saveMainWindowSettings(KGlobal::config(),"toplevel_options"); + saveMainWindowSettings(TDEGlobal::config(),"toplevel_options"); KEditToolbar dlg(actionCollection(), "kdictui.rc"); connect(&dlg,TQT_SIGNAL( newToolbarConfig() ), this, TQT_SLOT( slotNewToolbarConfig() )); dlg.exec(); @@ -685,7 +685,7 @@ void TopLevel::slotConfToolbar() void TopLevel::slotNewToolbarConfig() { recreateGUI(); - applyMainWindowSettings(KGlobal::config(),"toplevel_options"); + applyMainWindowSettings(TDEGlobal::config(),"toplevel_options"); buildHistMenu(); // actionlists must be inserted stratDbChanged(); } diff --git a/kdnssd/kdedmodule/dnssdwatcher.cpp b/kdnssd/kdedmodule/dnssdwatcher.cpp index 7e1ef6d2..5b391423 100644 --- a/kdnssd/kdedmodule/dnssdwatcher.cpp +++ b/kdnssd/kdedmodule/dnssdwatcher.cpp @@ -86,7 +86,7 @@ void DNSSDWatcher::createNotifier(const KURL& url) extern "C" { KDE_EXPORT KDEDModule *create_dnssdwatcher(const TQCString &obj) { - KGlobal::locale()->insertCatalogue("dnssdwatcher"); + TDEGlobal::locale()->insertCatalogue("dnssdwatcher"); return new DNSSDWatcher(obj); } } diff --git a/kget/droptarget.cpp b/kget/droptarget.cpp index 9fdf6ee5..ee0c05f5 100644 --- a/kget/droptarget.cpp +++ b/kget/droptarget.cpp @@ -55,7 +55,7 @@ DropTarget::DropTarget(KMainWindow * mainWin):TQWidget() int x = ksettings.dropPosition.x(); int y = ksettings.dropPosition.y(); - TQRect desk = KGlobalSettings::desktopGeometry(this); + TQRect desk = TDEGlobalSettings::desktopGeometry(this); TQPixmap bgnd = UserIcon( "target" ); if (x != -1 && diff --git a/kget/kfileio.cpp b/kget/kfileio.cpp index 59f26af6..ac8b0f70 100644 --- a/kget/kfileio.cpp +++ b/kget/kfileio.cpp @@ -82,8 +82,8 @@ TQString kFileToString(const TQString & aFileName, bool aEnsureNL, bool aVerbose result[len] = '\0'; if (readLen < len) { - TQString msg = i18n("Could only read %1 bytes of %2.").arg(KGlobal::locale()->formatNumber(readLen, - 0)).arg(KGlobal::locale()->formatNumber(len, 0)); + TQString msg = i18n("Could only read %1 bytes of %2.").arg(TDEGlobal::locale()->formatNumber(readLen, + 0)).arg(TDEGlobal::locale()->formatNumber(len, 0)); KMessageBox::error(tqApp->mainWidget(), msg); return TQString(); @@ -152,8 +152,8 @@ static bool kBytesToFile(const char *aBuffer, int len, const TQString & aFileNam KMessageBox::error(tqApp->mainWidget(), i18n("Could not write to file:\n%1").arg(aFileName)); return FALSE; } else if (writeLen < len) { - TQString msg = i18n("Could only write %1 bytes of %2.").arg(KGlobal::locale()->formatNumber(writeLen, - 0)).arg(KGlobal::locale()->formatNumber(len, + TQString msg = i18n("Could only write %1 bytes of %2.").arg(TDEGlobal::locale()->formatNumber(writeLen, + 0)).arg(TDEGlobal::locale()->formatNumber(len, 0)); KMessageBox::error(tqApp->mainWidget(), msg); diff --git a/kget/kget_plug_in/kget_plug_in.cpp b/kget/kget_plug_in/kget_plug_in.cpp index 65ca3c99..3631873d 100644 --- a/kget/kget_plug_in/kget_plug_in.cpp +++ b/kget/kget_plug_in/kget_plug_in.cpp @@ -47,7 +47,7 @@ KGet_plug_in::KGet_plug_in( TQObject* parent, const char* name ) : Plugin( parent, name ) { - TQPixmap pix = KGlobal::iconLoader()->loadIcon("kget", + TQPixmap pix = TDEGlobal::iconLoader()->loadIcon("kget", KIcon::MainToolbar); KActionMenu *menu = new KActionMenu( i18n("Download Manager"), pix, actionCollection(), "kget_menu" ); @@ -178,7 +178,7 @@ extern "C" { KDE_EXPORT void* init_khtml_kget() { - KGlobal::locale()->insertCatalogue("kget"); + TDEGlobal::locale()->insertCatalogue("kget"); return new KPluginFactory; } diff --git a/kget/kmainwidget.cpp b/kget/kmainwidget.cpp index e6bfa2c7..b80625c6 100644 --- a/kget/kmainwidget.cpp +++ b/kget/kmainwidget.cpp @@ -101,7 +101,7 @@ struct KURLPair KMainWidget *kmain = 0L; -#define LOAD_ICON(X) KGlobal::iconLoader()->loadIcon(X, KIcon::MainToolbar) +#define LOAD_ICON(X) TDEGlobal::iconLoader()->loadIcon(X, KIcon::MainToolbar) DropTarget *kdrop = 0L; @@ -405,7 +405,7 @@ void KMainWidget::setupGUI() m_paKonquerorIntegration->setText(i18n("Disable &KGet as Konqueror Download Manager")); } - menuHelp = new KHelpMenu(this, KGlobal::instance()->aboutData()); + menuHelp = new KHelpMenu(this, TDEGlobal::instance()->aboutData()); KStdAction::whatsThis(menuHelp, TQT_SLOT(contextHelpActivated()), coll, "whats_this"); createGUI("kgetui.rc"); @@ -508,7 +508,7 @@ void KMainWidget::slotConfigureToolbars() sDebugIn << endl; #endif - saveMainWindowSettings( KGlobal::config(), "MainWindow" ); + saveMainWindowSettings( TDEGlobal::config(), "MainWindow" ); KEditToolbar edit(factory()); connect(&edit, TQT_SIGNAL( newToolbarConfig() ), this, TQT_SLOT( slotNewToolbarConfig() )); edit.exec(); @@ -526,7 +526,7 @@ void KMainWidget::slotNewToolbarConfig() #endif createGUI("kgetui.rc"); - applyMainWindowSettings( KGlobal::config(), "MainWindow" ); + applyMainWindowSettings( TDEGlobal::config(), "MainWindow" ); #ifdef _DEBUG sDebugOut << endl; diff --git a/kget/settings.cpp b/kget/settings.cpp index 9e6adc4d..4186784e 100644 --- a/kget/settings.cpp +++ b/kget/settings.cpp @@ -171,7 +171,7 @@ Settings::load() // read misc settings config->setGroup("Misc"); - TQFont font = KGlobalSettings::generalFont(); + TQFont font = TDEGlobalSettings::generalFont(); listViewFont = config->readFontEntry("Font", &font); diff --git a/kget/transferlist.cpp b/kget/transferlist.cpp index bf54cb87..62384f07 100644 --- a/kget/transferlist.cpp +++ b/kget/transferlist.cpp @@ -76,7 +76,7 @@ TransferList::TransferList(TQWidget * parent, const char *name) jobid=1; // initial layout - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("ListView"); if ( config->readListEntry("ColumnWidths").isEmpty() ) { @@ -84,7 +84,7 @@ TransferList::TransferList(TQWidget * parent, const char *name) setColumnWidth(i, defaultColumnWidth[i]); } else - restoreLayout( KGlobal::config(), "ListView" ); + restoreLayout( TDEGlobal::config(), "ListView" ); TQString connectPath = "pics/connect%2.png"; TQString tryPath = "pics/try%2.png"; @@ -120,7 +120,7 @@ TransferList::TransferList(TQWidget * parent, const char *name) TransferList::~TransferList() { - saveLayout( KGlobal::config(), "ListView" ); + saveLayout( TDEGlobal::config(), "ListView" ); } diff --git a/knewsticker/common/configaccess.cpp b/knewsticker/common/configaccess.cpp index aba34266..d0b8480e 100644 --- a/knewsticker/common/configaccess.cpp +++ b/knewsticker/common/configaccess.cpp @@ -438,7 +438,7 @@ void ConfigAccess::setMouseWheelSpeed(const unsigned int mouseWheelSpeed) TQFont ConfigAccess::font() const { - TQFont font = KGlobalSettings::fixedFont(); + TQFont font = TDEGlobalSettings::fixedFont(); return m_cfg->readFontEntry("Font", &font); } @@ -594,7 +594,7 @@ NewsSourceBase *ConfigAccess::newsSource(const TQString &newsSource) nsd = NewsSourceDefault[i]; if (nsd.enabled) nsd.enabled = (nsd.language == TQString::fromLatin1("C") || - KGlobal::locale()->languageList().contains(nsd.language)); + TDEGlobal::locale()->languageList().contains(nsd.language)); break; } diff --git a/knewsticker/common/newsengine.cpp b/knewsticker/common/newsengine.cpp index 911095d9..e503c7b1 100644 --- a/knewsticker/common/newsengine.cpp +++ b/knewsticker/common/newsengine.cpp @@ -178,13 +178,13 @@ void SourceFileNewsSource::retrieveNews() ProgramNewsSource::ProgramNewsSource(const NewsSourceBase::Data &nsd, ConfigIface *config) : NewsSourceBase(nsd, config), - m_program(new KProcess()), + m_program(new TDEProcess()), m_programOutput(0) { - connect(m_program, TQT_SIGNAL(processExited(KProcess *)), - TQT_SLOT(slotProgramExited(KProcess *))); - connect(m_program, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), - TQT_SLOT(slotGotProgramOutput(KProcess *, char *, int))); + connect(m_program, TQT_SIGNAL(processExited(TDEProcess *)), + TQT_SLOT(slotProgramExited(TDEProcess *))); + connect(m_program, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + TQT_SLOT(slotGotProgramOutput(TDEProcess *, char *, int))); m_data.sourceFile = KURL(m_data.sourceFile).encodedPathAndQuery(); } @@ -201,15 +201,15 @@ void ProgramNewsSource::retrieveNews() m_programOutput->open(IO_WriteOnly); *m_program << m_data.sourceFile; - m_program->start(KProcess::NotifyOnExit, KProcess::Stdout); + m_program->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout); } -void ProgramNewsSource::slotGotProgramOutput(KProcess *, char *data, int length) +void ProgramNewsSource::slotGotProgramOutput(TDEProcess *, char *data, int length) { m_programOutput->writeBlock(data, length); } -void ProgramNewsSource::slotProgramExited(KProcess *proc) +void ProgramNewsSource::slotProgramExited(TDEProcess *proc) { bool okSoFar = true; diff --git a/knewsticker/common/newsengine.h b/knewsticker/common/newsengine.h index b5576543..e9175317 100644 --- a/knewsticker/common/newsengine.h +++ b/knewsticker/common/newsengine.h @@ -33,7 +33,7 @@ class NewsSourceBase; class TQBuffer; class TQDomDocument; -class KProcess; +class TDEProcess; class KURL; class KDE_EXPORT Article : public XMLNewsArticle, public KShared @@ -193,13 +193,13 @@ class KDE_EXPORT ProgramNewsSource : public NewsSourceBase virtual void retrieveNews(); protected slots: - void slotGotProgramOutput(KProcess *, char *, int); - void slotProgramExited(KProcess *); + void slotGotProgramOutput(TDEProcess *, char *, int); + void slotProgramExited(TDEProcess *); private: static TQString errorMessage(const ErrorCode); - KProcess *m_program; + TDEProcess *m_program; TQBuffer *m_programOutput; }; diff --git a/knewsticker/common/newsiconmgr.cpp b/knewsticker/common/newsiconmgr.cpp index 6e8e88d7..d37a9227 100644 --- a/knewsticker/common/newsiconmgr.cpp +++ b/knewsticker/common/newsiconmgr.cpp @@ -84,7 +84,7 @@ void NewsIconMgr::getIcon(const KURL &url) ds << url; kapp->dcopClient()->send("kded", "favicons", "downloadHostIcon(KURL)", data); } else { - emit gotIcon(url, TQPixmap(KGlobal::dirs()->findResource("cache", + emit gotIcon(url, TQPixmap(TDEGlobal::dirs()->findResource("cache", TQString::fromLatin1("favicons/%1.png").arg(url.host())))); } } else { @@ -132,7 +132,7 @@ void NewsIconMgr::slotGotIcon(bool isHost, TQString hostOrURL, TQString iconName if (iconName.isNull()) emit gotIcon(url, m_stdIcon); else - emit gotIcon(url, TQPixmap(KGlobal::dirs()->findResource("cache", + emit gotIcon(url, TQPixmap(TDEGlobal::dirs()->findResource("cache", TQString::fromLatin1("favicons/%1.png").arg(url.host())))); } diff --git a/knewsticker/knewsticker.cpp b/knewsticker/knewsticker.cpp index 46930a5a..3e72fa1e 100644 --- a/knewsticker/knewsticker.cpp +++ b/knewsticker/knewsticker.cpp @@ -535,7 +535,7 @@ extern "C" { KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString &configFile) { - KGlobal::locale()->insertCatalogue(TQString::fromLatin1("knewsticker")); + TDEGlobal::locale()->insertCatalogue(TQString::fromLatin1("knewsticker")); return new KNewsTicker(configFile, KPanelApplet::Stretch, KPanelApplet::Preferences | KPanelApplet::About | KPanelApplet::Help | KPanelApplet::ReportBug, diff --git a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp index a2de376e..a6927527 100644 --- a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp +++ b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp @@ -122,7 +122,7 @@ extern "C" { KDE_EXPORT void *init_libkntsrcfilepropsdlg() { - KGlobal::locale()->insertCatalogue( "knewsticker" ); + TDEGlobal::locale()->insertCatalogue( "knewsticker" ); return new KntSrcFilePropsFactory(); } } diff --git a/knewsticker/newsscroller.cpp b/knewsticker/newsscroller.cpp index df4ede38..c06be284 100644 --- a/knewsticker/newsscroller.cpp +++ b/knewsticker/newsscroller.cpp @@ -308,7 +308,7 @@ void NewsScroller::mouseMoveEvent(TQMouseEvent *e) else dragDistance = TQABS(e->y() - m_dragPos.y()); m_mouseDrag = (e->state() & Qt::LeftButton != 0) && - dragDistance >= KGlobal::config()->readNumEntry("StartDragDist", TDEApplication::startDragDistance()); + dragDistance >= TDEGlobal::config()->readNumEntry("StartDragDist", TDEApplication::startDragDistance()); if (m_mouseDrag) // Stop the scroller if we just started a drag. m_scrollTimer->stop(); } else { diff --git a/kopete/kopete/chatwindow/chatmessagepart.cpp b/kopete/kopete/chatwindow/chatmessagepart.cpp index fbd8fa2c..341e4c47 100644 --- a/kopete/kopete/chatwindow/chatmessagepart.cpp +++ b/kopete/kopete/chatwindow/chatmessagepart.cpp @@ -296,9 +296,9 @@ void ChatMessagePart::slotImportEmoticon() TQString emo = d->activeElement.getAttribute("src").string(); TQString themeName = KopetePrefs::prefs()->iconTheme(); - KIO::copy(emo, KGlobal::dirs()->saveLocation( "emoticons", themeName, false )); + KIO::copy(emo, TDEGlobal::dirs()->saveLocation( "emoticons", themeName, false )); - TQFile *fp = new TQFile(KGlobal::dirs()->saveLocation( "emoticons", themeName, false ) + "/emoticons.xml"); + TQFile *fp = new TQFile(TDEGlobal::dirs()->saveLocation( "emoticons", themeName, false ) + "/emoticons.xml"); TQDomDocument themeXml; @@ -356,7 +356,7 @@ void ChatMessagePart::save() for(it = d->allMessages.constBegin(); it != itEnd; ++it) { Kopete::Message tempMessage = *it; - stream << "[" << KGlobal::locale()->formatDateTime(tempMessage.timestamp()) << "] "; + stream << "[" << TDEGlobal::locale()->formatDateTime(tempMessage.timestamp()) << "] "; if( tempMessage.from() && tempMessage.from()->metaContact() ) { stream << formatName(tempMessage.from()->metaContact()->displayName()); @@ -1022,7 +1022,7 @@ TQString ChatMessagePart::formatStyleKeywords( const TQString &sourceHTML, const iconName = message.from()->protocol()->pluginIcon(); } - protocolIcon = KGlobal::iconLoader()->iconPath( iconName, KIcon::Small ); + protocolIcon = TDEGlobal::iconLoader()->iconPath( iconName, KIcon::Small ); nickLink=TQString::fromLatin1("") .arg( TQStyleSheet::escape(message.from()->contactId()).replace('"',"""), @@ -1038,7 +1038,7 @@ TQString ChatMessagePart::formatStyleKeywords( const TQString &sourceHTML, const // Replace sender (contact nick) resultHTML = resultHTML.replace( TQString::fromUtf8("%sender%"), nickLink+nick+"" ); // Replace time, by default display only time and display seconds(that was true means). - resultHTML = resultHTML.replace( TQString::fromUtf8("%time%"), KGlobal::locale()->formatTime(message.timestamp().time(), true) ); + resultHTML = resultHTML.replace( TQString::fromUtf8("%time%"), TDEGlobal::locale()->formatTime(message.timestamp().time(), true) ); // Replace %screenName% (contact ID) resultHTML = resultHTML.replace( TQString::fromUtf8("%senderScreenName%"), nickLink+TQStyleSheet::escape(contactId)+"" ); // Replace service name (protocol name) @@ -1186,7 +1186,7 @@ TQString ChatMessagePart::formatStyleKeywords( const TQString &sourceHTML ) // Replace %destinationName% resultHTML = resultHTML.replace( TQString::fromUtf8("%destinationName%"), formatName(destinationName) ); // For %timeOpened%, display the date and time (also the seconds). - resultHTML = resultHTML.replace( TQString::fromUtf8("%timeOpened%"), KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), true, true ) ); + resultHTML = resultHTML.replace( TQString::fromUtf8("%timeOpened%"), TDEGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), true, true ) ); // Look for %timeOpened{X}% TQRegExp timeRegExp("%timeOpened\\{([^}]*)\\}%"); diff --git a/kopete/kopete/chatwindow/chatview.cpp b/kopete/kopete/chatwindow/chatview.cpp index 52ed7fb7..da3288b0 100644 --- a/kopete/kopete/chatwindow/chatview.cpp +++ b/kopete/kopete/chatwindow/chatview.cpp @@ -477,16 +477,16 @@ void ChatView::placeMembersList( KDockWidget::DockPosition dp ) // look up the dock width int dockWidth; - KGlobal::config()->setGroup( TQString::fromLatin1( "ChatViewDock" ) ); + TDEGlobal::config()->setGroup( TQString::fromLatin1( "ChatViewDock" ) ); if( membersDockPosition == KDockWidget::DockLeft ) { - dockWidth = KGlobal::config()->readNumEntry( + dockWidth = TDEGlobal::config()->readNumEntry( TQString::fromLatin1( "membersDock,viewDock:sepPos" ), 30); } else { - dockWidth = KGlobal::config()->readNumEntry( + dockWidth = TDEGlobal::config()->readNumEntry( TQString::fromLatin1( "viewDock,membersDock:sepPos" ), 70); } @@ -834,7 +834,7 @@ void ChatView::messageSentSuccessfully() void ChatView::saveOptions() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); writeDockConfig ( config, TQString::fromLatin1( "ChatViewDock" ) ); config->setGroup( TQString::fromLatin1( "ChatViewDock" ) ); @@ -858,7 +858,7 @@ void ChatView::saveChatSettings() if ( !mc ) return; - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); TQString contactListGroup = TQString::fromLatin1("chatwindow_") + mc->metaContactId(); @@ -878,7 +878,7 @@ void ChatView::loadChatSettings() //read settings for metacontact TQString contactListGroup = TQString::fromLatin1("chatwindow_") + contacts.first()->metaContact()->metaContactId(); - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); config->setGroup( contactListGroup ); bool enableRichText = config->readBoolEntry( "EnableRichText", true ); editPart()->slotSetRichTextEnabled( enableRichText ); @@ -889,7 +889,7 @@ void ChatView::loadChatSettings() void ChatView::readOptions() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); /** THIS IS BROKEN !!! */ //dockManager->readConfig ( config, TQString::fromLatin1("ChatViewDock") ); diff --git a/kopete/kopete/chatwindow/kopetechatwindow.cpp b/kopete/kopete/chatwindow/kopetechatwindow.cpp index 730f26cc..45ff87cf 100644 --- a/kopete/kopete/chatwindow/kopetechatwindow.cpp +++ b/kopete/kopete/chatwindow/kopetechatwindow.cpp @@ -214,9 +214,9 @@ KopeteChatWindow::KopeteChatWindow( TQWidget *parent, const char* name ) windows.append( this ); windowListChanged(); - KGlobal::config()->setGroup( TQString::fromLatin1("ChatWindowSettings") ); - m_alwaysShowTabs = KGlobal::config()->readBoolEntry( TQString::fromLatin1("AlwaysShowTabs"), false ); - m_showFormatToolbar = KGlobal::config()->readBoolEntry( TQString::fromLatin1("Show Format Toolbar"), true ); + TDEGlobal::config()->setGroup( TQString::fromLatin1("ChatWindowSettings") ); + m_alwaysShowTabs = TDEGlobal::config()->readBoolEntry( TQString::fromLatin1("AlwaysShowTabs"), false ); + m_showFormatToolbar = TDEGlobal::config()->readBoolEntry( TQString::fromLatin1("Show Format Toolbar"), true ); adjustingFormatToolbar = false; // kdDebug( 14010 ) << k_funcinfo << "Open Windows: " << windows.count() << endl; kapp->ref(); @@ -398,7 +398,7 @@ void KopeteChatWindow::initActions(void) //The Sending movie normalIcon = TQPixmap( BarIcon( TQString::fromLatin1( "kopete" ) ) ); - animIcon = KGlobal::iconLoader()->loadMovie( TQString::fromLatin1( "newmessage" ), KIcon::Toolbar); + animIcon = TDEGlobal::iconLoader()->loadMovie( TQString::fromLatin1( "newmessage" ), KIcon::Toolbar); // Pause the animation because otherwise it's running even when we're not // showing it. This eats resources, and also triggers a pixmap leak in @@ -590,11 +590,11 @@ void KopeteChatWindow::createTabBar() { if( !m_tabBar ) { - KGlobal::config()->setGroup( TQString::fromLatin1("ChatWindowSettings") ); + TDEGlobal::config()->setGroup( TQString::fromLatin1("ChatWindowSettings") ); m_tabBar = new KTabWidget( mainArea ); m_tabBar->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); - m_tabBar->setHoverCloseButton(KGlobal::config()->readBoolEntry( TQString::fromLatin1("HoverClose"), false )); + m_tabBar->setHoverCloseButton(TDEGlobal::config()->readBoolEntry( TQString::fromLatin1("HoverClose"), false )); m_tabBar->setTabReorderingEnabled(true); #if KDE_IS_VERSION(3,4,0) m_tabBar->setAutomaticResizeTabs(true); @@ -621,7 +621,7 @@ void KopeteChatWindow::createTabBar() else setActiveView( chatViewList.first() ); - int tabPosition = KGlobal::config()->readNumEntry( TQString::fromLatin1("Tab Placement") , 0 ); + int tabPosition = TDEGlobal::config()->readNumEntry( TQString::fromLatin1("Tab Placement") , 0 ); slotPlaceTabs( tabPosition ); } } @@ -1031,7 +1031,7 @@ void KopeteChatWindow::readOptions() { // load and apply config file settings affecting the appearance of the UI // kdDebug(14010) << k_funcinfo << endl; - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); applyMainWindowSettings( config, TQString::fromLatin1( "KopeteChatWindow" ) ); config->setGroup( TQString::fromLatin1("ChatWindowSettings") ); m_showFormatToolbar = config->readBoolEntry( TQString::fromLatin1("Show Format Toolbar"), true ); @@ -1041,7 +1041,7 @@ void KopeteChatWindow::saveOptions() { // kdDebug(14010) << k_funcinfo << endl; - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); // saves menubar,toolbar and statusbar setting saveMainWindowSettings( config, TQString::fromLatin1( "KopeteChatWindow" ) ); @@ -1214,7 +1214,7 @@ void KopeteChatWindow::slotConfKeys() void KopeteChatWindow::slotConfToolbar() { - saveMainWindowSettings(KGlobal::config(), TQString::fromLatin1( "KopeteChatWindow" )); + saveMainWindowSettings(TDEGlobal::config(), TQString::fromLatin1( "KopeteChatWindow" )); KEditToolbar *dlg = new KEditToolbar(factory(), this ); if (dlg->exec()) { @@ -1222,7 +1222,7 @@ void KopeteChatWindow::slotConfToolbar() createGUI( m_activeView->editPart() ); else createGUI( 0L ); - applyMainWindowSettings(KGlobal::config(), TQString::fromLatin1( "KopeteChatWindow" )); + applyMainWindowSettings(TDEGlobal::config(), TQString::fromLatin1( "KopeteChatWindow" )); } delete dlg; } @@ -1247,7 +1247,7 @@ void KopeteChatWindow::updateChatState( ChatView* cv, int newState ) break; case ChatView::Normal: default: - m_tabBar->setTabColor( cv, KGlobalSettings::textColor() ); + m_tabBar->setTabColor( cv, TDEGlobalSettings::textColor() ); break; } } diff --git a/kopete/kopete/chatwindow/kopetechatwindowstylemanager.cpp b/kopete/kopete/chatwindow/kopetechatwindowstylemanager.cpp index 67e36f3d..cf54985f 100644 --- a/kopete/kopete/chatwindow/kopetechatwindowstylemanager.cpp +++ b/kopete/kopete/chatwindow/kopetechatwindowstylemanager.cpp @@ -96,7 +96,7 @@ ChatWindowStyleManager::~ChatWindowStyleManager() void ChatWindowStyleManager::loadStyles() { - TQStringList chatStyles = KGlobal::dirs()->findDirs( "appdata", TQString::fromUtf8( "styles" ) ); + TQStringList chatStyles = TDEGlobal::dirs()->findDirs( "appdata", TQString::fromUtf8( "styles" ) ); TQString localStyleDir( locateLocal( "appdata", TQString::fromUtf8("styles/"),true) ); if( !chatStyles.contains(localStyleDir)) chatStyles<