diff options
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 <kurl.h> 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"<<command; - if (!proc.start(KProcess::Block, true)) { + if (!proc.start(TDEProcess::Block, true)) { return false; } diff --git a/filesharing/advanced/propsdlgplugin/propertiespage.cpp b/filesharing/advanced/propsdlgplugin/propertiespage.cpp index 6042b9e7..91ce79d3 100644 --- a/filesharing/advanced/propsdlgplugin/propertiespage.cpp +++ b/filesharing/advanced/propsdlgplugin/propertiespage.cpp @@ -211,20 +211,20 @@ bool PropertiesPage::save(NFSFile* nfsFile, SambaFile* sambaFile, bool nfs, bool if (nfsNeedsKDEsu) { nfsFile->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"<<command; - if (!proc.start(KProcess::Block, true)) { + if (!proc.start(TDEProcess::Block, true)) { kdDebug(FILESHARE_DEBUG) << "PropertiesPage::save: tdesu command failed" << endl; return false; } diff --git a/filesharing/advanced/propsdlgplugin/propsdlgshareplugin.cpp b/filesharing/advanced/propsdlgplugin/propsdlgshareplugin.cpp index 2af403f5..59155329 100644 --- a/filesharing/advanced/propsdlgplugin/propsdlgshareplugin.cpp +++ b/filesharing/advanced/propsdlgplugin/propsdlgshareplugin.cpp @@ -49,7 +49,7 @@ PropsDlgSharePlugin::PropsDlgSharePlugin( KPropertiesDialog *dlg, const char *, const TQStringList & ) : KPropsDlgPlugin(dlg), d(0) { - KGlobal::locale()->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<KUserGroup> & 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<KComboBox> 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<int> 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("<a href=\"kopetemessage://%1/?protocolId=%2&accountId=%3\" class=\"KopeteDisplayName\">") .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+"</a>" ); // 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)+"</a>" ); // 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<<localStyleDir; @@ -319,7 +319,7 @@ ChatWindowStyle *ChatWindowStyleManager::getStyleFromPool(const TQString &styleP // NOTE: This is a hidden config switch for style developers // Check in the config if the cache is disabled. // if the cache is disabled, reload the style everytime it's getted. - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("KopeteStyleDebug"); bool disableCache = config->readBoolEntry("disableStyleCache", false); if(disableCache) diff --git a/kopete/kopete/chatwindow/kopeteemailwindow.cpp b/kopete/kopete/chatwindow/kopeteemailwindow.cpp index bb70481f..ef51c020 100644 --- a/kopete/kopete/chatwindow/kopeteemailwindow.cpp +++ b/kopete/kopete/chatwindow/kopeteemailwindow.cpp @@ -175,7 +175,7 @@ KopeteEmailWindow::KopeteEmailWindow( Kopete::ChatSession *manager, EmailWindowP else toggleMode( Send ); - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); applyMainWindowSettings( config, TQString::fromLatin1( "KopeteEmailWindow" ) ); d->sendInProgress = false; @@ -195,7 +195,7 @@ KopeteEmailWindow::~KopeteEmailWindow() emit( closing( this ) ); // saves menubar, toolbar and statusbar setting - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); saveMainWindowSettings( config, TQString::fromLatin1( "KopeteEmailWindow" ) ); config->sync(); @@ -239,7 +239,7 @@ void KopeteEmailWindow::initActions(void) // The animated toolbarbutton d->normalIcon = TQPixmap( BarIcon( TQString::fromLatin1( "kopete" ) ) ); - d->animIcon = KGlobal::iconLoader()->loadMovie( TQString::fromLatin1( "newmessage" ), KIcon::Toolbar); + d->animIcon = TDEGlobal::iconLoader()->loadMovie( TQString::fromLatin1( "newmessage" ), KIcon::Toolbar); d->animIcon.pause(); d->anim = new TQLabel( this, "kde toolbar widget" ); @@ -280,12 +280,12 @@ void KopeteEmailWindow::slotSmileyActivated(const TQString &sm ) void KopeteEmailWindow::slotConfToolbar() { - saveMainWindowSettings(KGlobal::config(), TQString::fromLatin1( "KopeteEmailWindow" )); + saveMainWindowSettings(TDEGlobal::config(), TQString::fromLatin1( "KopeteEmailWindow" )); KEditToolbar *dlg = new KEditToolbar(actionCollection(), TQString::fromLatin1("kopeteemailwindow.rc") ); if (dlg->exec()) { createGUI( d->editPart ); - applyMainWindowSettings(KGlobal::config(), TQString::fromLatin1( "KopeteEmailWindow" )); + applyMainWindowSettings(TDEGlobal::config(), TQString::fromLatin1( "KopeteEmailWindow" )); } delete dlg; } @@ -334,7 +334,7 @@ void KopeteEmailWindow::updateNextButton() { d->btnReadNext->setEnabled( false ); - d->btnReadNext->setPaletteForegroundColor( KGlobalSettings::textColor() ); + d->btnReadNext->setPaletteForegroundColor( TDEGlobalSettings::textColor() ); } else d->btnReadNext->setEnabled( true ); diff --git a/kopete/kopete/chatwindow/kopeteemoticonaction.cpp b/kopete/kopete/chatwindow/kopeteemoticonaction.cpp index 6cdfedbd..4be23dd4 100644 --- a/kopete/kopete/chatwindow/kopeteemoticonaction.cpp +++ b/kopete/kopete/chatwindow/kopeteemoticonaction.cpp @@ -177,7 +177,7 @@ int KopeteEmoticonAction::plug( TQWidget* widget, int index ) if ( m_parentCollection ) instance = m_parentCollection->instance(); else - instance = KGlobal::instance(); + instance = TDEGlobal::instance(); bar->insertButton( icon(), id_, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotActivated() ), isEnabled(), plainText(), diff --git a/kopete/kopete/chatwindow/krichtexteditpart.cpp b/kopete/kopete/chatwindow/krichtexteditpart.cpp index ed05e036..16ebe584 100644 --- a/kopete/kopete/chatwindow/krichtexteditpart.cpp +++ b/kopete/kopete/chatwindow/krichtexteditpart.cpp @@ -300,19 +300,19 @@ void KopeteRichTextEditPart::readConfig() { // Don't update config untill we read whole config first m_configWriteLock = true; - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("RichTextEditor"); - TQColor tmpColor = KGlobalSettings::textColor(); + TQColor tmpColor = TDEGlobalSettings::textColor(); setFgColor( config->readColorEntry("FgColor", &tmpColor ) ); - tmpColor = KGlobalSettings::baseColor(); + tmpColor = TDEGlobalSettings::baseColor(); setBgColor( config->readColorEntry("BgColor", &tmpColor ) ); TQFont tmpFont = KopetePrefs::prefs()->fontFace(); setFont( config->readFontEntry("Font", &tmpFont ) ); - int tmp = KGlobalSettings::generalFont().pixelSize(); + int tmp = TDEGlobalSettings::generalFont().pixelSize(); setFontSize( config->readNumEntry( "FontSize", tmp ) ); action_bold->setChecked( config->readBoolEntry( "FontBold" ) ); @@ -342,7 +342,7 @@ void KopeteRichTextEditPart::writeConfig() // If true we're still reading the conf write now, so don't write. if( m_configWriteLock ) return; - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("RichTextEditor"); config->writeEntry("Font", mFont ); config->writeEntry("FontSize", mFont.pointSize() ); @@ -359,9 +359,9 @@ void KopeteRichTextEditPart::setFgColor() { TQColor col=editor->color(); - int s = KColorDialog::getColor( col, KGlobalSettings::textColor() , editor ); + int s = KColorDialog::getColor( col, TDEGlobalSettings::textColor() , editor ); if(!col.isValid()) - col= KGlobalSettings::textColor() ; + col= TDEGlobalSettings::textColor() ; if ( s != TQDialog::Accepted ) return; @@ -391,7 +391,7 @@ void KopeteRichTextEditPart::setFgColor( const TQColor &newColor ) TQColor KopeteRichTextEditPart::fgColor() { - if( mFgColor == KGlobalSettings::textColor()) + if( mFgColor == TDEGlobalSettings::textColor()) return TQColor(); return mFgColor; } @@ -400,10 +400,10 @@ void KopeteRichTextEditPart::setBgColor() { TQColor col=mBgColor; - int s = KColorDialog::getColor( col, KGlobalSettings::baseColor(), editor ); + int s = KColorDialog::getColor( col, TDEGlobalSettings::baseColor(), editor ); if(!col.isValid()) { - col=KGlobalSettings::baseColor(); + col=TDEGlobalSettings::baseColor(); } if ( s != TQDialog::Accepted ) @@ -431,7 +431,7 @@ void KopeteRichTextEditPart::setBgColor( const TQColor &newColor ) TQColor KopeteRichTextEditPart::bgColor() { - if( mBgColor == KGlobalSettings::baseColor()) + if( mBgColor == TDEGlobalSettings::baseColor()) return TQColor(); return mBgColor; } diff --git a/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp b/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp index fad57bb2..d195434d 100644 --- a/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp +++ b/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp @@ -205,7 +205,7 @@ void ChatWindowStyleRendering_Test::testHeaderRendering() "<div>Outgoing/buddy_icon.png</div>\n" "<div>%1</div>\n" "<div>%2</div>" - ).arg(KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), true, true ) ) + ).arg(TDEGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), true, true ) ) .arg(TQDateTime::currentDateTime().toString("hh:mm")); TQString headerHtml = d->testStyle->getHeaderHtml(); diff --git a/kopete/kopete/config/appearance/appearanceconfig.cpp b/kopete/kopete/config/appearance/appearanceconfig.cpp index 4ce921aa..aff81a39 100644 --- a/kopete/kopete/config/appearance/appearanceconfig.cpp +++ b/kopete/kopete/config/appearance/appearanceconfig.cpp @@ -188,7 +188,7 @@ AppearanceConfig::AppearanceConfig(TQWidget *parent, const char* /*name*/, const (new TQVBoxLayout(this))->setAutoAdd(true); d->mAppearanceTabCtl = new TQTabWidget(this, "mAppearanceTabCtl"); - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "ChatWindowSettings" ); // "Emoticons" TAB ========================================================== @@ -337,7 +337,7 @@ AppearanceConfig::~AppearanceConfig() void AppearanceConfig::updateEmoticonsButton(bool _b) { TQString themeName = d->mPrfsEmoticons->icon_theme_list->currentText(); - TQFileInfo fileInf(KGlobal::dirs()->findResource("emoticons", themeName+"/")); + TQFileInfo fileInf(TDEGlobal::dirs()->findResource("emoticons", themeName+"/")); d->mPrfsEmoticons->btnRemoveTheme->setEnabled( _b && fileInf.isWritable()); d->mPrfsEmoticons->btnGetThemes->setEnabled( false ); } @@ -508,7 +508,7 @@ void AppearanceConfig::updateEmoticonlist() d->mPrfsEmoticons->icon_theme_list->clear(); // Wipe out old list // Get a list of directories in our icon theme dir - TQStringList themeDirs = KGlobal::dirs()->findDirs("emoticons", ""); + TQStringList themeDirs = TDEGlobal::dirs()->findDirs("emoticons", ""); // loop adding themes from all dirs into theme-list for(unsigned int x = 0;x < themeDirs.count();x++) { @@ -540,7 +540,7 @@ void AppearanceConfig::updateEmoticonlist() void AppearanceConfig::slotSelectedEmoticonsThemeChanged() { TQString themeName = d->mPrfsEmoticons->icon_theme_list->currentText(); - TQFileInfo fileInf(KGlobal::dirs()->findResource("emoticons", themeName+"/")); + TQFileInfo fileInf(TDEGlobal::dirs()->findResource("emoticons", themeName+"/")); d->mPrfsEmoticons->btnRemoveTheme->setEnabled( fileInf.isWritable() ); Kopete::Emoticons emoticons( themeName ); @@ -845,7 +845,7 @@ void AppearanceConfig::removeSelectedEmoticonTheme() if (res!=KMessageBox::Continue) return; - KURL themeUrl(KGlobal::dirs()->findResource("emoticons", themeName+"/")); + KURL themeUrl(TDEGlobal::dirs()->findResource("emoticons", themeName+"/")); KIO::NetAccess::del(themeUrl, this); updateEmoticonlist(); @@ -853,7 +853,7 @@ void AppearanceConfig::removeSelectedEmoticonTheme() void AppearanceConfig::slotGetEmoticonThemes() { - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); config->setGroup( "KNewStuff" ); config->writeEntry( "ProvidersUrl", "http://download.kde.org/khotnewstuff/emoticons-providers.xml" ); diff --git a/kopete/kopete/config/appearance/emoticonseditdialog.cpp b/kopete/kopete/config/appearance/emoticonseditdialog.cpp index ea2fff3d..4bfb0468 100644 --- a/kopete/kopete/config/appearance/emoticonseditdialog.cpp +++ b/kopete/kopete/config/appearance/emoticonseditdialog.cpp @@ -111,7 +111,7 @@ EmoticonsEditDialog::EmoticonsEditDialog(TQWidget *parent, TQString theme, const itm->setText(1, text); } - TQFile *fp = new TQFile(KGlobal::dirs()->saveLocation( "emoticons", themeName, false ) + "/emoticons.xml"); + TQFile *fp = new TQFile(TDEGlobal::dirs()->saveLocation( "emoticons", themeName, false ) + "/emoticons.xml"); if( !fp->exists() ) { kdWarning() << "EmoticonsEditDialog::EmoticonsEditDialog() " << fp->name() << " doesn't exist!" << endl; @@ -142,7 +142,7 @@ EmoticonsEditDialog::EmoticonsEditDialog(TQWidget *parent, TQString theme, const void EmoticonsEditDialog::slotOkClicked() { - TQFile *fp = new TQFile(KGlobal::dirs()->saveLocation( "emoticons", themeName, false ) + "/emoticons.xml"); + TQFile *fp = new TQFile(TDEGlobal::dirs()->saveLocation( "emoticons", themeName, false ) + "/emoticons.xml"); if( !fp->exists() ) { kdWarning() << "EmoticonsEditDialog::slotOkClicked() " << fp->name() << " doesn't exist!" << endl; @@ -196,7 +196,7 @@ void EmoticonsEditDialog::slotEditClicked() copy = false; TQString f = mMainWidget->klvEmoticons->selectedItem()->text(2); - KStandardDirs *dir = KGlobal::dirs(); + KStandardDirs *dir = TDEGlobal::dirs(); emo = dir->findResource( "emoticons", themeName + TQString::fromLatin1( "/" ) + f ); if( emo.isNull() ) @@ -226,7 +226,7 @@ void EmoticonsEditDialog::slotRemoveClicked() void EmoticonsEditDialog::addEmoticon(TQString emo, TQString text, bool copy) { if(copy) - KIO::copy(emo, KGlobal::dirs()->saveLocation( "emoticons", themeName, false )); + KIO::copy(emo, TDEGlobal::dirs()->saveLocation( "emoticons", themeName, false )); KListViewItem *itm = new KListViewItem(mMainWidget->klvEmoticons); itm->setPixmap(0, TQPixmap(emo)); diff --git a/kopete/kopete/config/behavior/behaviorconfig.cpp b/kopete/kopete/config/behavior/behaviorconfig.cpp index b133a64b..dc21e28a 100644 --- a/kopete/kopete/config/behavior/behaviorconfig.cpp +++ b/kopete/kopete/config/behavior/behaviorconfig.cpp @@ -159,7 +159,7 @@ void BehaviorConfig::save() // kdDebug(14000) << k_funcinfo << "called." << endl; KopetePrefs *p = KopetePrefs::prefs(); - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); // "General" TAB ============================================================ p->setShowTray(mPrfsGeneral->mShowTrayChk->isChecked()); @@ -219,7 +219,7 @@ void BehaviorConfig::load() { // kdDebug(14000) << k_funcinfo << "called" << endl; KopetePrefs *p = KopetePrefs::prefs(); - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); awayInstance = Kopete::Away::getInstance(); // "General" TAB ============================================================ diff --git a/kopete/kopete/contactlist/kopetelviprops.cpp b/kopete/kopete/contactlist/kopetelviprops.cpp index 0c66892c..a731b504 100644 --- a/kopete/kopete/contactlist/kopetelviprops.cpp +++ b/kopete/kopete/contactlist/kopetelviprops.cpp @@ -535,8 +535,8 @@ void KopeteMetaLVIProps::slotOpenSoundDialog( KURLRequester *requester ) // find the first "sound"-resource that contains files TQStringList soundDirs = - KGlobal::dirs()->findDirs("data", "kopete/sounds"); - soundDirs += KGlobal::dirs()->resourceDirs( "sound" ); + TDEGlobal::dirs()->findDirs("data", "kopete/sounds"); + soundDirs += TDEGlobal::dirs()->resourceDirs( "sound" ); if ( !soundDirs.isEmpty() ) { KURL soundURL; diff --git a/kopete/kopete/contactlist/kopetemetacontactlvi.cpp b/kopete/kopete/contactlist/kopetemetacontactlvi.cpp index 51334e8d..7daabb61 100644 --- a/kopete/kopete/contactlist/kopetemetacontactlvi.cpp +++ b/kopete/kopete/contactlist/kopetemetacontactlvi.cpp @@ -254,7 +254,7 @@ void KopeteMetaContactLVI::initLVI() mIsBlinkIcon = false; //if ( !mBlinkIcon ) - // mBlinkIcon = new TQPixmap( KGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "newmsg" ), KIcon::Small ) ); + // mBlinkIcon = new TQPixmap( TDEGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "newmsg" ), KIcon::Small ) ); slotConfigChanged(); // this calls slotIdleStateChanged(), which sets up the constituent components, spacing, fonts and indirectly, the contact icon slotDisplayNameChanged(); @@ -515,7 +515,7 @@ void KopeteMetaContactLVI::slotPhotoChanged() { m_oldStatusIcon= d->metaContactIcon->pixmap(); TQPixmap photoPixmap; - //TQPixmap defaultIcon( KGlobal::iconLoader()->loadIcon( "vcard", KIcon::Desktop ) ); + //TQPixmap defaultIcon( TDEGlobal::iconLoader()->loadIcon( "vcard", KIcon::Desktop ) ); TQImage photoImg = m_metaContact->photo(); if ( !photoImg.isNull() && (photoImg.width() > 0) && (photoImg.height() > 0) ) { @@ -884,8 +884,8 @@ void KopeteMetaContactLVI::updateContactIcons() void KopeteMetaContactLVI::updateContactIcon( Kopete::Contact *c ) { - KGlobal::config()->setGroup( TQString::fromLatin1("ContactList") ); - bool bHideOffline = KGlobal::config()->readBoolEntry( + TDEGlobal::config()->setGroup( TQString::fromLatin1("ContactList") ); + bool bHideOffline = TDEGlobal::config()->readBoolEntry( TQString::fromLatin1("HideOfflineContacts"), false ); if ( KopetePrefs::prefs()->showOffline() ) bHideOffline = false; diff --git a/kopete/kopete/kopeteapplication.cpp b/kopete/kopete/kopeteapplication.cpp index 4c37e059..8dba350d 100644 --- a/kopete/kopete/kopeteapplication.cpp +++ b/kopete/kopete/kopeteapplication.cpp @@ -118,7 +118,7 @@ void KopeteApplication::slotLoadPlugins() Kopete::AccountManager::self()->load(); Kopete::ContactList::self()->load(); - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); // Parse command-line arguments TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); diff --git a/kopete/kopete/kopeteballoon.cpp b/kopete/kopete/kopeteballoon.cpp index d7d6d096..c961a91a 100644 --- a/kopete/kopete/kopeteballoon.cpp +++ b/kopete/kopete/kopeteballoon.cpp @@ -161,7 +161,7 @@ void KopeteBalloon::updateMask() // get screen-geometry for screen our anchor is on // (geometry can differ from screen to screen! - TQRect deskRect = KGlobalSettings::desktopGeometry(mAnchor); + TQRect deskRect = TDEGlobalSettings::desktopGeometry(mAnchor); bool bottom = (mAnchor.y() + height()) > ((deskRect.y() + deskRect.height()-48)); bool right = (mAnchor.x() + width()) > ((deskRect.x() + deskRect.width()-48)); diff --git a/kopete/kopete/kopeteiface.cpp b/kopete/kopete/kopeteiface.cpp index a197c649..46049498 100644 --- a/kopete/kopete/kopeteiface.cpp +++ b/kopete/kopete/kopeteiface.cpp @@ -35,7 +35,7 @@ KopeteIface::KopeteIface() : DCOPObject( "KopeteIface" ) { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("AutoAway"); if (config->readBoolEntry("UseAutoAway", true)) diff --git a/kopete/kopete/kopetewindow.cpp b/kopete/kopete/kopetewindow.cpp index 87581866..d55caa81 100644 --- a/kopete/kopete/kopetewindow.cpp +++ b/kopete/kopete/kopetewindow.cpp @@ -326,7 +326,7 @@ void KopeteWindow::initActions() connect ( KopetePrefs::prefs(), TQT_SIGNAL(saved()), TQT_TQOBJECT(this), TQT_SLOT(slotConfigChanged()) ); slotConfigChanged(); - globalAccel = new KGlobalAccel( TQT_TQOBJECT(this) ); + globalAccel = new TDEGlobalAccel( TQT_TQOBJECT(this) ); globalAccel->insert( TQString::fromLatin1("Read Message"), i18n("Read Message"), i18n("Read the next pending message"), CTRL+SHIFT+Key_I, KKey::QtWIN+CTRL+Key_I, Kopete::ChatSessionManager::self(), TQT_SLOT(slotReadMessage()) ); @@ -422,7 +422,7 @@ bool KopeteWindow::eventFilter( TQObject* target, TQEvent* event ) void KopeteWindow::loadOptions() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); toolBar("mainToolBar")->applySettings( config, "ToolBar Settings" ); toolBar("quickSearchBar")->applySettings( config, "QuickSearchBar Settings" ); @@ -469,7 +469,7 @@ void KopeteWindow::loadOptions() void KopeteWindow::saveOptions() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); toolBar("mainToolBar")->saveSettings ( config, "ToolBar Settings" ); toolBar("quickSearchBar")->saveSettings( config, "QuickSearchBar Settings" ); @@ -576,7 +576,7 @@ void KopeteWindow::slotConfGlobalKeys() void KopeteWindow::slotConfToolbar() { - saveMainWindowSettings(KGlobal::config(), "General Options"); + saveMainWindowSettings(TDEGlobal::config(), "General Options"); KEditToolbar *dlg = new KEditToolbar(factory()); connect( dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(slotUpdateToolbar()) ); connect( dlg, TQT_SIGNAL(finished()) , dlg, TQT_SLOT(deleteLater())); @@ -585,7 +585,7 @@ void KopeteWindow::slotConfToolbar() void KopeteWindow::slotUpdateToolbar() { - applyMainWindowSettings(KGlobal::config(), "General Options"); + applyMainWindowSettings(TDEGlobal::config(), "General Options"); } void KopeteWindow::slotGlobalAway() @@ -828,7 +828,7 @@ void KopeteWindow::slotAccountStatusIconChanged( Kopete::Contact *contact ) // Because we want null pixmaps to detect the need for a loadMovie // we can't use the SmallIcon() method directly - KIconLoader *loader = KGlobal::instance()->iconLoader(); + KIconLoader *loader = TDEGlobal::instance()->iconLoader(); TQMovie mv = loader->loadMovie( status.overlayIcons().first(), KIcon::Small ); diff --git a/kopete/kopete/kopetewindow.h b/kopete/kopete/kopetewindow.h index 0a687831..a9625931 100644 --- a/kopete/kopete/kopetewindow.h +++ b/kopete/kopete/kopetewindow.h @@ -35,7 +35,7 @@ class TQPoint; class KAction; class KActionMenu; -class KGlobalAccel; +class TDEGlobalAccel; class KSelectAction; class KSqueezedTextLabel; class KToggleAction; @@ -220,7 +220,7 @@ public: KToggleAction *statusbarAction; KToggleAction *actionShowOffliners; KToggleAction *actionShowEmptyGroups; - KGlobalAccel *globalAccel; + TDEGlobalAccel *globalAccel; KopeteEditGlobalIdentityWidget *editGlobalIdentityWidget; private: diff --git a/kopete/kopete/systemtray.cpp b/kopete/kopete/systemtray.cpp index 89ce1351..75fef262 100644 --- a/kopete/kopete/systemtray.cpp +++ b/kopete/kopete/systemtray.cpp @@ -132,7 +132,7 @@ void KopeteSystemTray::contextMenuAboutToShow( KPopupMenu *me ) void KopeteSystemTray::startBlink( const TQString &icon ) { - startBlink( KGlobal::iconLoader()->loadIcon( icon , KIcon::Panel ) ); + startBlink( TDEGlobal::iconLoader()->loadIcon( icon , KIcon::Panel ) ); } void KopeteSystemTray::startBlink( const TQPixmap &icon ) @@ -164,7 +164,7 @@ void KopeteSystemTray::startBlink( const TQMovie &movie ) void KopeteSystemTray::startBlink() { if ( mMovie.isNull() ) - mMovie = KGlobal::iconLoader()->loadMovie( TQString::fromLatin1( "newmessage" ), KIcon::Panel ); + mMovie = TDEGlobal::iconLoader()->loadMovie( TQString::fromLatin1( "newmessage" ), KIcon::Panel ); startBlink( mMovie ); } diff --git a/kopete/libkopete/avdevice/videodevicepool.cpp b/kopete/libkopete/avdevice/videodevicepool.cpp index cbfe7cb1..a229937c 100644 --- a/kopete/libkopete/avdevice/videodevicepool.cpp +++ b/kopete/libkopete/avdevice/videodevicepool.cpp @@ -756,7 +756,7 @@ void VideoDevicePool::loadConfig() kdDebug(14010) << k_funcinfo << "called" << endl; if((hasDevices())&&(m_clients==0)) { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Video Device Settings"); const TQString currentdevice = config->readEntry("Current Device", TQString()); kdDebug(14010) << k_funcinfo << "Current device: " << currentdevice << endl; @@ -817,7 +817,7 @@ void VideoDevicePool::saveConfig() kdDebug(14010) << k_funcinfo << "called" << endl; if(hasDevices()) { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Video Device Settings"); /* if(m_modelvector.size()) diff --git a/kopete/libkopete/kautoconfig.cpp b/kopete/libkopete/kautoconfig.cpp index c1347d75..c6c0b2c0 100644 --- a/kopete/libkopete/kautoconfig.cpp +++ b/kopete/libkopete/kautoconfig.cpp @@ -107,7 +107,7 @@ KAutoConfig::KAutoConfig(KConfig *kconfig, TQObject *parent, } KAutoConfig::KAutoConfig(TQObject *parent, const char *name) : - TQObject(parent, name), config(KGlobal::config()) { + TQObject(parent, name), config(TDEGlobal::config()) { d = new KAutoConfigPrivate(); } diff --git a/kopete/libkopete/kautoconfig.h b/kopete/libkopete/kautoconfig.h index c9b4fa2a..0aecd380 100644 --- a/kopete/libkopete/kautoconfig.h +++ b/kopete/libkopete/kautoconfig.h @@ -128,7 +128,7 @@ public: /** * Constructor. - * Uses KGlobal::config() when retrieving/saving the widgets that + * Uses TDEGlobal::config() when retrieving/saving the widgets that * KAutoConfig knows about. * @param parent - Parent object. * @param name - Object name. diff --git a/kopete/libkopete/kcautoconfigmodule.h b/kopete/libkopete/kcautoconfigmodule.h index 91ce9886..be76dc26 100644 --- a/kopete/libkopete/kcautoconfigmodule.h +++ b/kopete/libkopete/kcautoconfigmodule.h @@ -56,12 +56,12 @@ class KOPETE_EXPORT KCAutoConfigModule : public KCModule public: /** - * Standard KCModule constructor. Use KGlobal::config() + * Standard KCModule constructor. Use TDEGlobal::config() */ KCAutoConfigModule( TQWidget * parent = 0, const char * name = 0, const TQStringList & args = TQStringList() ); /** - * Standard KCModule constructor. Use KGlobal::config() + * Standard KCModule constructor. Use TDEGlobal::config() */ KCAutoConfigModule( TDEInstance * instance, TQWidget * parent = 0, const TQStringList & args = TQStringList() ); diff --git a/kopete/libkopete/knotification.cpp b/kopete/libkopete/knotification.cpp index f072254f..5bae36fb 100644 --- a/kopete/libkopete/knotification.cpp +++ b/kopete/libkopete/knotification.cpp @@ -92,10 +92,10 @@ void KNotification::notifyByExecute(const TQString &command, const TQString& eve if ( execLine.isEmpty() ) execLine = command; // fallback - KProcess p; + TDEProcess p; p.setUseShell(true); p << execLine; - p.start(KProcess::DontCare); + p.start(TDEProcess::DontCare); // return true; } //return false; diff --git a/kopete/libkopete/kopeteaccount.cpp b/kopete/libkopete/kopeteaccount.cpp index bb8b3d36..f549d1f0 100644 --- a/kopete/libkopete/kopeteaccount.cpp +++ b/kopete/libkopete/kopeteaccount.cpp @@ -86,7 +86,7 @@ public: Account::Account( Protocol *parent, const TQString &accountId, const char *name ) : TQObject( parent, name ), d( new Private( parent, accountId ) ) { - d->configGroup=new KConfigGroup(KGlobal::config(), TQString::fromLatin1( "Account_%1_%2" ).arg( d->protocol->pluginId(), d->id )); + d->configGroup=new KConfigGroup(TDEGlobal::config(), TQString::fromLatin1( "Account_%1_%2" ).arg( d->protocol->pluginId(), d->id )); d->excludeconnect = d->configGroup->readBoolEntry( "ExcludeConnect", false ); d->color = d->configGroup->readColorEntry( "Color", &d->color ); @@ -185,7 +185,7 @@ TQPixmap Account::accountIcon(const int size) const TQString icon= d->customIcon.isEmpty() ? d->protocol->pluginIcon() : d->customIcon; // FIXME: this code is duplicated with OnlineStatus, can we merge it somehow? - TQPixmap base = KGlobal::instance()->iconLoader()->loadIcon( + TQPixmap base = TDEGlobal::instance()->iconLoader()->loadIcon( icon, KIcon::Small, size ); if ( d->color.isValid() ) diff --git a/kopete/libkopete/kopeteaccountmanager.cpp b/kopete/libkopete/kopeteaccountmanager.cpp index 7f014519..69f741cb 100644 --- a/kopete/libkopete/kopeteaccountmanager.cpp +++ b/kopete/libkopete/kopeteaccountmanager.cpp @@ -352,7 +352,7 @@ void AccountManager::save() config->writeEntry( "AccountId", it.current()->accountId() ); } - KGlobal::config()->sync(); + TDEGlobal::config()->sync(); } void AccountManager::load() @@ -364,7 +364,7 @@ void AccountManager::load() // and load the required protocols if the account is enabled. // Don't try to optimize duplicate calls out, the plugin queue is smart enough // (and fast enough) to handle that without adding complexity here - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); TQStringList accountGroups = config->groupList().grep( TQRegExp( TQString::fromLatin1( "^Account_" ) ) ); for ( TQStringList::Iterator it = accountGroups.begin(); it != accountGroups.end(); ++it ) { @@ -387,7 +387,7 @@ void AccountManager::slotPluginLoaded( Plugin *plugin ) // Iterate over all groups that start with "Account_" as those are accounts // and parse them if they are from this protocol - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); TQStringList accountGroups = config->groupList().grep( TQRegExp( TQString::fromLatin1( "^Account_" ) ) ); for ( TQStringList::Iterator it = accountGroups.begin(); it != accountGroups.end(); ++it ) { diff --git a/kopete/libkopete/kopeteaway.cpp b/kopete/libkopete/kopeteaway.cpp index 2b18da9c..13b4ca5d 100644 --- a/kopete/libkopete/kopeteaway.cpp +++ b/kopete/libkopete/kopeteaway.cpp @@ -143,9 +143,9 @@ Kopete::Away::Away() : TQObject( kapp , "Kopete::Away") load(); - KSettings::Dispatcher::self()->registerInstance( KGlobal::instance(), this, TQT_SLOT( load() ) ); + KSettings::Dispatcher::self()->registerInstance( TDEGlobal::instance(), this, TQT_SLOT( load() ) ); // Set up the config object - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); /* Load the saved away messages */ config->setGroup("Away Messages"); @@ -255,7 +255,7 @@ void Kopete::Away::setGlobalAway(bool status) void Kopete::Away::save() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); /* Set the away message settings in the Away Messages config group */ config->setGroup("Away Messages"); config->writeEntry("Messages", d->awayMessageList); @@ -267,7 +267,7 @@ void Kopete::Away::save() void Kopete::Away::load() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("AutoAway"); d->awayTimeout=config->readNumEntry("Timeout", 600); d->goAvailable=config->readBoolEntry("GoAvailable", true); diff --git a/kopete/libkopete/kopeteblacklister.cpp b/kopete/libkopete/kopeteblacklister.cpp index 29dbf727..88fbd0ce 100644 --- a/kopete/libkopete/kopeteblacklister.cpp +++ b/kopete/libkopete/kopeteblacklister.cpp @@ -37,7 +37,7 @@ public: BlackLister::BlackLister(const TQString &protocolId, const TQString &accountId, TQObject *parent, const char *name) : TQObject(parent, name), d( new Private ) { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); d->owner = accountId; d->protocol = protocolId; @@ -87,7 +87,7 @@ void BlackLister::removeContact(Contact *contact) void BlackLister::saveToDisk() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("BlackLister"); config->writeEntry( d->protocol + TQString::fromLatin1("_") + d->owner, d->blacklist ); diff --git a/kopete/libkopete/kopetecommandhandler.cpp b/kopete/libkopete/kopetecommandhandler.cpp index 2b0aeb4d..eba7c4ed 100644 --- a/kopete/libkopete/kopetecommandhandler.cpp +++ b/kopete/libkopete/kopetecommandhandler.cpp @@ -87,7 +87,7 @@ struct CommandHandlerPrivate { PluginCommandMap pluginCommands; Kopete::CommandHandler *s_handler; - TQMap<KProcess*,ManagerPair> processMap; + TQMap<TDEProcess*,ManagerPair> processMap; bool inCommand; TQPtrList<KAction> m_commands; }; @@ -274,9 +274,9 @@ void Kopete::CommandHandler::slotExecCommand( const TQString &args, Kopete::Chat { if( !args.isEmpty() ) { - KProcess *proc = 0L; + TDEProcess *proc = 0L; if ( kapp->authorize( TQString::fromLatin1( "shell_access" ) ) ) - proc = new KProcess(manager); + proc = new TDEProcess(manager); if( proc ) { @@ -294,9 +294,9 @@ void Kopete::CommandHandler::slotExecCommand( const TQString &args, Kopete::Chat *proc << args; } - connect(proc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), this, TQT_SLOT(slotExecReturnedData(KProcess *, char *, int))); - connect(proc, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), this, TQT_SLOT(slotExecReturnedData(KProcess *, char *, int))); - proc->start( KProcess::NotifyOnExit, KProcess::AllOutput ); + connect(proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), this, TQT_SLOT(slotExecReturnedData(TDEProcess *, char *, int))); + connect(proc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), this, TQT_SLOT(slotExecReturnedData(TDEProcess *, char *, int))); + proc->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ); } else { @@ -350,7 +350,7 @@ void Kopete::CommandHandler::slotCloseCommand( const TQString &, Kopete::ChatSes manager->view()->closeView(); } -void Kopete::CommandHandler::slotExecReturnedData(KProcess *proc, char *buff, int bufflen ) +void Kopete::CommandHandler::slotExecReturnedData(TDEProcess *proc, char *buff, int bufflen ) { kdDebug(14010) << k_funcinfo << endl; TQString buffer = TQString::fromLocal8Bit( buff, bufflen ); @@ -362,7 +362,7 @@ void Kopete::CommandHandler::slotExecReturnedData(KProcess *proc, char *buff, in mgrPair.first->appendMessage( msg ); } -void Kopete::CommandHandler::slotExecFinished(KProcess *proc) +void Kopete::CommandHandler::slotExecFinished(TDEProcess *proc) { delete proc; p->processMap.remove( proc ); diff --git a/kopete/libkopete/kopetecommandhandler.h b/kopete/libkopete/kopetecommandhandler.h index 143a0fc6..7c26ace5 100644 --- a/kopete/libkopete/kopetecommandhandler.h +++ b/kopete/libkopete/kopetecommandhandler.h @@ -23,7 +23,7 @@ #include "kopete_export.h" -class KProcess; +class TDEProcess; struct CommandHandlerPrivate; @@ -183,8 +183,8 @@ class KOPETE_EXPORT CommandHandler : public TQObject private slots: void slotPluginLoaded( Kopete::Plugin * ); void slotPluginDestroyed( TQObject * ); - void slotExecReturnedData(KProcess *proc, char *buff, int bufflen ); - void slotExecFinished(KProcess *proc); + void slotExecReturnedData(TDEProcess *proc, char *buff, int bufflen ); + void slotExecFinished(TDEProcess *proc); void slotViewCreated( KopeteView *view ); void slotHelpCommand( const TQString & args, Kopete::ChatSession *manager ); diff --git a/kopete/libkopete/kopetecontact.cpp b/kopete/libkopete/kopetecontact.cpp index e692b6f5..85387709 100644 --- a/kopete/libkopete/kopetecontact.cpp +++ b/kopete/libkopete/kopetecontact.cpp @@ -721,15 +721,15 @@ TQString Contact::toolTip() const switch(val.type()) { case TQVariant::DateTime: - valueText = KGlobal::locale()->formatDateTime(val.toDateTime()); + valueText = TDEGlobal::locale()->formatDateTime(val.toDateTime()); valueText = Kopete::Message::escape( valueText ); break; case TQVariant::Date: - valueText = KGlobal::locale()->formatDate(val.toDate()); + valueText = TDEGlobal::locale()->formatDate(val.toDate()); valueText = Kopete::Message::escape( valueText ); break; case TQVariant::Time: - valueText = KGlobal::locale()->formatTime(val.toTime()); + valueText = TDEGlobal::locale()->formatTime(val.toTime()); valueText = Kopete::Message::escape( valueText ); break; default: diff --git a/kopete/libkopete/kopeteonlinestatusmanager.cpp b/kopete/libkopete/kopeteonlinestatusmanager.cpp index 1ecd1d00..07b23e81 100644 --- a/kopete/libkopete/kopeteonlinestatusmanager.cpp +++ b/kopete/libkopete/kopeteonlinestatusmanager.cpp @@ -324,7 +324,7 @@ TQPixmap* OnlineStatusManager::renderIcon( const OnlineStatus &statusFor, const TQStringList overlays = statusFor.overlayIcons(); if ( !( overlays.isEmpty() ) ) // otherwise leave the basis as-is { - KIconLoader *loader = KGlobal::instance()->iconLoader(); + KIconLoader *loader = TDEGlobal::instance()->iconLoader(); int i = 0; for( TQStringList::iterator it = overlays.begin(), end = overlays.end(); it != end; ++it ) diff --git a/kopete/libkopete/kopetepassword.cpp b/kopete/libkopete/kopetepassword.cpp index ab2bc683..5fb1b847 100644 --- a/kopete/libkopete/kopetepassword.cpp +++ b/kopete/libkopete/kopetepassword.cpp @@ -380,7 +380,7 @@ Kopete::Password &Kopete::Password::operator=( Password &other ) void Kopete::Password::readConfig() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( d->configGroup ); TQString passwordCrypted = config->readEntry( "Password" ); @@ -395,7 +395,7 @@ void Kopete::Password::readConfig() void Kopete::Password::writeConfig() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); if(!config->hasGroup(d->configGroup)) { //### (KOPETE) diff --git a/kopete/libkopete/kopetepluginmanager.cpp b/kopete/libkopete/kopetepluginmanager.cpp index 12b3822a..4322dc34 100644 --- a/kopete/libkopete/kopetepluginmanager.cpp +++ b/kopete/libkopete/kopetepluginmanager.cpp @@ -258,7 +258,7 @@ void PluginManager::loadAllPlugins() { // FIXME: We need session management here - Martijn - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); if ( config->hasGroup( TQString::fromLatin1( "Plugins" ) ) ) { TQMap<TQString, bool> pluginsMap; @@ -502,7 +502,7 @@ bool PluginManager::setPluginEnabled( const TQString &_pluginId, bool enabled /* { TQString pluginId = _pluginId; - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "Plugins" ); // FIXME: What is this for? This sort of thing is kconf_update's job - Richard diff --git a/kopete/libkopete/kopeteprefs.cpp b/kopete/libkopete/kopeteprefs.cpp index 6e9072d0..353ea46d 100644 --- a/kopete/libkopete/kopeteprefs.cpp +++ b/kopete/libkopete/kopeteprefs.cpp @@ -39,7 +39,7 @@ KopetePrefs *KopetePrefs::prefs() KopetePrefs::KopetePrefs() : TQObject( kapp, "KopetePrefs" ) { - config = KGlobal::config(); + config = TDEGlobal::config(); load(); } @@ -82,20 +82,20 @@ void KopetePrefs::load() mChatViewBufferSize = config->readNumEntry("ChatView BufferSize", 250); - TQColor tmpColor = KGlobalSettings::highlightColor(); + TQColor tmpColor = TDEGlobalSettings::highlightColor(); mHighlightBackground = config->readColorEntry("Highlight Background Color", &tmpColor); - tmpColor = KGlobalSettings::highlightedTextColor(); + tmpColor = TDEGlobalSettings::highlightedTextColor(); mHighlightForeground = config->readColorEntry("Highlight Foreground Color", &tmpColor); mHighlightEnabled = config->readBoolEntry("Highlighting Enabled", true); mBgOverride = config->readBoolEntry("ChatView Override Background", false); mFgOverride = config->readBoolEntry("ChatView Override Foreground", false); mRtfOverride = config->readBoolEntry("ChatView Override RTF", false); mInterfacePreference = config->readEntry("View Plugin", TQString::fromLatin1("kopete_chatwindow") ); - tmpColor = KGlobalSettings::textColor(); + tmpColor = TDEGlobalSettings::textColor(); mTextColor = config->readColorEntry("Text Color", &tmpColor ); - tmpColor = KGlobalSettings::baseColor(); + tmpColor = TDEGlobalSettings::baseColor(); mBgColor = config->readColorEntry("Bg Color", &tmpColor ); - tmpColor = KGlobalSettings::linkColor(); + tmpColor = TDEGlobalSettings::linkColor(); mLinkColor = config->readColorEntry("Link Color", &tmpColor ); mFontFace = config->readFontEntry("Font Face"); tmpColor = darkGray; @@ -137,7 +137,7 @@ void KopetePrefs::load() mContactListIconMode = (IconDisplayMode) metaObject()->property( n )->keyToValue( value.latin1() ); mContactListIndentContacts = config->readBoolEntry("IndentContacts", false); mContactListUseCustomFonts = config->readBoolEntry("UseCustomFonts", false); - TQFont font = KGlobalSettings::generalFont(); + TQFont font = TDEGlobalSettings::generalFont(); mContactListGroupFont = config->readFontEntry("GroupFont", &font); mContactListNormalFont = config->readFontEntry("NormalFont", &font); if ( font.pixelSize() != -1 ) @@ -616,7 +616,7 @@ TQFont KopetePrefs::contactListSmallFont() const { if ( mContactListUseCustomFonts ) return contactListCustomSmallFont(); - TQFont smallFont = KGlobalSettings::generalFont(); + TQFont smallFont = TDEGlobalSettings::generalFont(); if ( smallFont.pixelSize() != -1 ) smallFont.setPixelSize( (smallFont.pixelSize() * 3) / 4 ); else diff --git a/kopete/libkopete/private/kopeteemoticons.cpp b/kopete/libkopete/private/kopeteemoticons.cpp index f7fbb373..8ea3dad4 100644 --- a/kopete/libkopete/private/kopeteemoticons.cpp +++ b/kopete/libkopete/private/kopeteemoticons.cpp @@ -296,7 +296,7 @@ Emoticons::~Emoticons( ) void Emoticons::addIfPossible( const TQString& filenameNoExt, const TQStringList &emoticons ) { - KStandardDirs *dir = KGlobal::dirs(); + KStandardDirs *dir = TDEGlobal::dirs(); TQString pic; //maybe an extension was given, so try to find the exact file @@ -365,10 +365,10 @@ void Emoticons::initEmoticons( const TQString &theme ) d->emoticonAndPicList.clear(); d->emoticonMap.clear(); - TQString filename= KGlobal::dirs()->findResource( "emoticons", d->theme + TQString::fromLatin1( "/emoticons.xml" ) ); + TQString filename= TDEGlobal::dirs()->findResource( "emoticons", d->theme + TQString::fromLatin1( "/emoticons.xml" ) ); if(!filename.isEmpty()) return initEmoticon_emoticonsxml( filename ); - filename= KGlobal::dirs()->findResource( "emoticons", d->theme + TQString::fromLatin1( "/icondef.xml" ) ); + filename= TDEGlobal::dirs()->findResource( "emoticons", d->theme + TQString::fromLatin1( "/icondef.xml" ) ); if(!filename.isEmpty()) return initEmoticon_JEP0038( filename ); kdWarning(14010) << k_funcinfo << "emotiucon XML theme description not found" <<endl; diff --git a/kopete/libkopete/private/kopeteviewmanager.cpp b/kopete/libkopete/private/kopeteviewmanager.cpp index 783c399c..2a5074f8 100644 --- a/kopete/libkopete/private/kopeteviewmanager.cpp +++ b/kopete/libkopete/private/kopeteviewmanager.cpp @@ -205,7 +205,7 @@ void KopeteViewManager::messageAppended( Kopete::Message &msg, Kopete::ChatSessi && msg.direction() != Kopete::Message::Internal ) { TQWidget *w=dynamic_cast<TQWidget*>(manager->view(false)); - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("General"); if( (!manager->view(false) || !w || manager->view() != d->activeView || config->readBoolEntry("EventIfActive", true) || !w->isActiveWindow()) diff --git a/kopete/libkopete/tests/kopeteemoticontest.cpp b/kopete/libkopete/tests/kopeteemoticontest.cpp index 08910d46..83c0e64c 100644 --- a/kopete/libkopete/tests/kopeteemoticontest.cpp +++ b/kopete/libkopete/tests/kopeteemoticontest.cpp @@ -94,7 +94,7 @@ void KopeteEmoticonTest::testEmoticonParser() inputFile.close(); expectedFile.close(); - TQString path = KGlobal::dirs()->findResource( "emoticons", "Default/smile.png" ).replace( "smile.png", TQString() ); + TQString path = TDEGlobal::dirs()->findResource( "emoticons", "Default/smile.png" ).replace( "smile.png", TQString() ); Kopete::Emoticons::self(); TQString result = emo.parse( inputData ).replace( path, TQString() ); diff --git a/kopete/libkopete/ui/kopetefileconfirmdialog.cpp b/kopete/libkopete/ui/kopetefileconfirmdialog.cpp index fffeec66..7291feb9 100644 --- a/kopete/libkopete/ui/kopetefileconfirmdialog.cpp +++ b/kopete/libkopete/ui/kopetefileconfirmdialog.cpp @@ -42,12 +42,12 @@ KopeteFileConfirmDialog::KopeteFileConfirmDialog(const Kopete::FileTransferInfo m_view=new FileConfirmBase(this, "FileConfirmView"); m_view->m_from->setText( info.contact()->metaContact()->displayName() + TQString::fromLatin1( " <" ) + info.contact()->contactId() + TQString::fromLatin1( "> " ) ); - m_view->m_size->setText( KGlobal::locale()->formatNumber( long( info.size() ), 0 ) ); + m_view->m_size->setText( TDEGlobal::locale()->formatNumber( long( info.size() ), 0 ) ); m_view->m_description->setText( description ); m_view->m_filename->setText( info.file() ); - KGlobal::config()->setGroup("File Transfer"); - const TQString defaultPath=KGlobal::config()->readEntry("defaultPath" , TQDir::homeDirPath() ); + TDEGlobal::config()->setGroup("File Transfer"); + const TQString defaultPath=TDEGlobal::config()->readEntry("defaultPath" , TQDir::homeDirPath() ); m_view->m_saveto->setText(defaultPath + TQString::fromLatin1( "/" ) + info.file() ); setMainWidget(m_view); @@ -77,8 +77,8 @@ void KopeteFileConfirmDialog::slotUser2() const TQString directory=url.directory(); if(!directory.isEmpty()) { - KGlobal::config()->setGroup("File Transfer"); - KGlobal::config()->writeEntry("defaultPath" , directory ); + TDEGlobal::config()->setGroup("File Transfer"); + TDEGlobal::config()->writeEntry("defaultPath" , directory ); } if(TQFile(m_view->m_saveto->text()).exists()) diff --git a/kopete/plugins/addbookmarks/addbookmarksprefssettings.cpp b/kopete/plugins/addbookmarks/addbookmarksprefssettings.cpp index 34d921c3..acb1b1b1 100644 --- a/kopete/plugins/addbookmarks/addbookmarksprefssettings.cpp +++ b/kopete/plugins/addbookmarks/addbookmarksprefssettings.cpp @@ -28,7 +28,7 @@ BookmarksPrefsSettings::~BookmarksPrefsSettings() void BookmarksPrefsSettings::load() { - KConfig * configfile = KGlobal::config(); + KConfig * configfile = TDEGlobal::config(); m_isfolderforeachcontact = Always; m_contactslist.clear(); m_addbookmarksfromunknowns = false; @@ -48,7 +48,7 @@ void BookmarksPrefsSettings::load() void BookmarksPrefsSettings::save() { - KConfig * configfile = KGlobal::config(); + KConfig * configfile = TDEGlobal::config(); if( configfile->getConfigState() != KConfigBase::ReadWrite ){ kdDebug( 14501 ) << "save: failed to open config file for writing" << endl; diff --git a/kopete/plugins/alias/aliaspreferences.cpp b/kopete/plugins/alias/aliaspreferences.cpp index 9a1a0594..60c4b0f2 100644 --- a/kopete/plugins/alias/aliaspreferences.cpp +++ b/kopete/plugins/alias/aliaspreferences.cpp @@ -158,7 +158,7 @@ AliasPreferences::~AliasPreferences() // reload configuration reading it from kopeterc void AliasPreferences::load() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); if( config->hasGroup( "AliasPlugin" ) ) { config->setGroup("AliasPlugin"); @@ -189,7 +189,7 @@ void AliasPreferences::slotPluginLoaded( Kopete::Plugin *plugin ) Kopete::Protocol *protocol = static_cast<Kopete::Protocol*>( plugin ); if( protocol ) { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); if( config->hasGroup( "AliasPlugin" ) ) { config->setGroup("AliasPlugin"); @@ -240,7 +240,7 @@ void AliasPreferences::slotPluginLoaded( Kopete::Plugin *plugin ) // save list to kopeterc and creates map out of it void AliasPreferences::save() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->deleteGroup( TQString::fromLatin1("AliasPlugin") ); config->setGroup( TQString::fromLatin1("AliasPlugin") ); diff --git a/kopete/plugins/autoreplace/autoreplaceconfig.cpp b/kopete/plugins/autoreplace/autoreplaceconfig.cpp index 2537f44a..96de543f 100644 --- a/kopete/plugins/autoreplace/autoreplaceconfig.cpp +++ b/kopete/plugins/autoreplace/autoreplaceconfig.cpp @@ -30,7 +30,7 @@ AutoReplaceConfig::AutoReplaceConfig() // reload configuration reading it from kopeterc void AutoReplaceConfig::load() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "AutoReplace Plugin" ); TQStringList wordsList = config->readListEntry( "WordsToReplace" ); @@ -113,7 +113,7 @@ AutoReplaceConfig::WordsToReplace AutoReplaceConfig::map() const void AutoReplaceConfig::save() { - KConfig * config = KGlobal::config(); + KConfig * config = TDEGlobal::config(); config->setGroup( "AutoReplace Plugin" ); TQStringList newWords; diff --git a/kopete/plugins/connectionstatus/connectionstatusplugin.cpp b/kopete/plugins/connectionstatus/connectionstatusplugin.cpp index d6365c0a..fbbe7c8b 100644 --- a/kopete/plugins/connectionstatus/connectionstatusplugin.cpp +++ b/kopete/plugins/connectionstatus/connectionstatusplugin.cpp @@ -63,16 +63,16 @@ void ConnectionStatusPlugin::slotCheckStatus() m_buffer = TQString(); - // Use KProcess to run netstat -rn. We'll then parse the output of + // Use TDEProcess to run netstat -rn. We'll then parse the output of // netstat -rn in slotProcessStdout() to see if it mentions the // default gateway. If so, we're connected, if not, we're offline - m_process = new KProcess; + m_process = new TDEProcess; *m_process << "netstat" << "-r"; - connect( m_process, TQT_SIGNAL( receivedStdout( KProcess *, char *, int ) ), this, TQT_SLOT( slotProcessStdout( KProcess *, char *, int ) ) ); - connect( m_process, TQT_SIGNAL( processExited( KProcess * ) ), this, TQT_SLOT( slotProcessExited( KProcess * ) ) ); + connect( m_process, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), this, TQT_SLOT( slotProcessStdout( TDEProcess *, char *, int ) ) ); + connect( m_process, TQT_SIGNAL( processExited( TDEProcess * ) ), this, TQT_SLOT( slotProcessExited( TDEProcess * ) ) ); - if ( !m_process->start( KProcess::NotifyOnExit, KProcess::Stdout ) ) + if ( !m_process->start( TDEProcess::NotifyOnExit, TDEProcess::Stdout ) ) { kdWarning( 14301 ) << k_funcinfo << "Unable to start netstat process!" << endl; @@ -81,7 +81,7 @@ void ConnectionStatusPlugin::slotCheckStatus() } } -void ConnectionStatusPlugin::slotProcessExited( KProcess *process ) +void ConnectionStatusPlugin::slotProcessExited( TDEProcess *process ) { kdDebug( 14301 ) << m_buffer << endl; @@ -94,7 +94,7 @@ void ConnectionStatusPlugin::slotProcessExited( KProcess *process ) } } -void ConnectionStatusPlugin::slotProcessStdout( KProcess *, char *buffer, int buflen ) +void ConnectionStatusPlugin::slotProcessStdout( TDEProcess *, char *buffer, int buflen ) { // Look for a default gateway //kdDebug( 14301 ) << k_funcinfo << endl; diff --git a/kopete/plugins/connectionstatus/connectionstatusplugin.h b/kopete/plugins/connectionstatus/connectionstatusplugin.h index 6240e11e..9920bec2 100644 --- a/kopete/plugins/connectionstatus/connectionstatusplugin.h +++ b/kopete/plugins/connectionstatus/connectionstatusplugin.h @@ -21,7 +21,7 @@ #include "kopeteplugin.h" class TQTimer; -class KProcess; +class TDEProcess; /** * @author Chris Howells <howells@kde.org> @@ -37,18 +37,18 @@ public: private slots: void slotCheckStatus(); - void slotProcessStdout( KProcess *process, char *buffer, int len ); + void slotProcessStdout( TDEProcess *process, char *buffer, int len ); /** * Notify when the netstat process has exited */ - void slotProcessExited( KProcess *process ); + void slotProcessExited( TDEProcess *process ); private: void setConnectedStatus( bool newStatus ); bool m_pluginConnected; - KProcess *m_process; + TDEProcess *m_process; TQTimer *m_timer; TQString m_buffer; }; diff --git a/kopete/plugins/cryptography/cryptographyplugin.cpp b/kopete/plugins/cryptography/cryptographyplugin.cpp index 903e73d3..f76fae2f 100644 --- a/kopete/plugins/cryptography/cryptographyplugin.cpp +++ b/kopete/plugins/cryptography/cryptographyplugin.cpp @@ -94,7 +94,7 @@ CryptographyPlugin::~CryptographyPlugin() void CryptographyPlugin::loadSettings() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Cryptography Plugin"); mPrivateKeyID = config->readEntry("PGP_private_key"); diff --git a/kopete/plugins/cryptography/kgpgselkey.cpp b/kopete/plugins/cryptography/kgpgselkey.cpp index 88078ece..37a0d8ab 100644 --- a/kopete/plugins/cryptography/kgpgselkey.cpp +++ b/kopete/plugins/cryptography/kgpgselkey.cpp @@ -43,7 +43,7 @@ KgpgSelKey::KgpgSelKey(TQWidget *parent, const char *name,bool showlocal):KDialo TQString keyname; TQWidget *page = new TQWidget(this); TQLabel *labeltxt; - KIconLoader *loader = KGlobal::iconLoader(); + KIconLoader *loader = TDEGlobal::iconLoader(); keyPair=loader->loadIcon("kgpg_key2",KIcon::Small,20); @@ -69,7 +69,7 @@ KgpgSelKey::KgpgSelKey(TQWidget *parent, const char *name,bool showlocal):KDialo TQString tst,tst2; char line[130]; - // FIXME: Why use popen instead of KProcess, TQProcess or KProcIO?!? + // FIXME: Why use popen instead of TDEProcess, TQProcess or KProcIO?!? // Are we interested in having buffer overflows now? - Martijn fp = popen( "gpg --no-tty --with-colon --list-secret-keys", "r" ); while ( fgets( line, sizeof(line), fp)) diff --git a/kopete/plugins/cryptography/popuppublic.cpp b/kopete/plugins/cryptography/popuppublic.cpp index 116abd4a..39560eeb 100644 --- a/kopete/plugins/cryptography/popuppublic.cpp +++ b/kopete/plugins/cryptography/popuppublic.cpp @@ -102,7 +102,7 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent /* if (KGpgSettings::allowCustomEncryptionOptions()) customOptions=KGpgSettings::customEncryptionOptions();*/ - KIconLoader *loader = KGlobal::iconLoader(); + KIconLoader *loader = TDEGlobal::iconLoader(); keyPair=loader->loadIcon("kgpg_key2",KIcon::Small,20); keySingle=loader->loadIcon("kgpg_key1",KIcon::Small,20); @@ -194,7 +194,7 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent CBuntrusted->setChecked( KGpgSettings::allowUntrustedKeys() ); CBhideid->setChecked( KGpgSettings::hideUserID() ); if (filemode) CBshred->setChecked( KGpgSettings::shredSource() );*/ - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Cryptography Plugin"); CBarmor->hide(); @@ -350,9 +350,9 @@ void popupPublic::refreshkeys() KProcIO *encid=new KProcIO(); *encid << "gpg"<<"--no-secmem-warning"<<"--no-tty"<<"--with-colon"<<"--list-keys"; ///////// when process ends, update dialog infos - TQObject::connect(encid, TQT_SIGNAL(processExited(KProcess *)),this, TQT_SLOT(slotpreselect())); + TQObject::connect(encid, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotpreselect())); TQObject::connect(encid, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(slotprocread(KProcIO *))); - encid->start(KProcess::NotifyOnExit,true); + encid->start(TDEProcess::NotifyOnExit,true); } void popupPublic::slotpreselect() @@ -467,7 +467,7 @@ void popupPublic::slotprocread(KProcIO *p) void popupPublic::slotOk() { //BEGIN modified for Kopete - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Cryptography Plugin"); config->writeEntry("UntrustedKeys", CBuntrusted->isChecked()); diff --git a/kopete/plugins/history/converter.cpp b/kopete/plugins/history/converter.cpp index 2bf748ce..1c5c573d 100644 --- a/kopete/plugins/history/converter.cpp +++ b/kopete/plugins/history/converter.cpp @@ -71,32 +71,32 @@ void HistoryPlugin::convertOldHistory() if(fi->fileName() == "MSNProtocol" || fi->fileName() == "msn_logs" ) { protocolId="MSNProtocol"; - KGlobal::config()->setGroup("MSN"); - accountId=KGlobal::config()->readEntry( "UserID" ); + TDEGlobal::config()->setGroup("MSN"); + accountId=TDEGlobal::config()->readEntry( "UserID" ); } else if(fi->fileName() == "ICTQProtocol" || fi->fileName() == "icq_logs" ) { protocolId="ICTQProtocol"; - KGlobal::config()->setGroup("ICQ"); - accountId=KGlobal::config()->readEntry( "UIN" ); + TDEGlobal::config()->setGroup("ICQ"); + accountId=TDEGlobal::config()->readEntry( "UIN" ); } else if(fi->fileName() == "AIMProtocol" || fi->fileName() == "aim_logs" ) { protocolId="AIMProtocol"; - KGlobal::config()->setGroup("AIM"); - accountId=KGlobal::config()->readEntry( "UserID" ); + TDEGlobal::config()->setGroup("AIM"); + accountId=TDEGlobal::config()->readEntry( "UserID" ); } else if(fi->fileName() == "OscarProtocol" ) { protocolId="AIMProtocol"; - KGlobal::config()->setGroup("OSCAR"); - accountId=KGlobal::config()->readEntry( "UserID" ); + TDEGlobal::config()->setGroup("OSCAR"); + accountId=TDEGlobal::config()->readEntry( "UserID" ); } else if(fi->fileName() == "JabberProtocol" || fi->fileName() == "jabber_logs") { protocolId="JabberProtocol"; - KGlobal::config()->setGroup("Jabber"); - accountId=KGlobal::config()->readEntry( "UserID" ); + TDEGlobal::config()->setGroup("Jabber"); + accountId=TDEGlobal::config()->readEntry( "UserID" ); } //TODO: gadu, wp } @@ -303,8 +303,8 @@ void HistoryPlugin::convertOldHistory() bool HistoryPlugin::detectOldHistory() { - KGlobal::config()->setGroup("History Plugin"); - TQString version=KGlobal::config()->readEntry( "Version" ,"0.6" ); + TDEGlobal::config()->setGroup("History Plugin"); + TQString version=TDEGlobal::config()->readEntry( "Version" ,"0.6" ); if(version != "0.6") return false; diff --git a/kopete/plugins/latex/latexplugin.cpp b/kopete/plugins/latex/latexplugin.cpp index 11537aba..d8169311 100644 --- a/kopete/plugins/latex/latexplugin.cpp +++ b/kopete/plugins/latex/latexplugin.cpp @@ -180,7 +180,7 @@ void LatexPlugin::slotMessageAboutToSend( Kopete::Message& msg) Q_UNUSED(msg) //disabled because to work correctly, we need to find what special has the gif we can send over MSN #if 0 - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Latex Plugin"); if(!config->readBoolEntry("ParseOutgoing", false)) @@ -222,7 +222,7 @@ TQString LatexPlugin::handleLatex(const TQString &latexFormula) m_tempFiles.setAutoDelete(true); TQString fileName = tempFile->name(); - KProcess p; + TDEProcess p; TQString argumentRes = "-r %1x%2"; TQString argumentOut = "-o %1"; @@ -235,7 +235,7 @@ TQString LatexPlugin::handleLatex(const TQString &latexFormula) kdDebug() << k_funcinfo << " Rendering " << m_convScript << " " << argumentRes.arg(TQString::number(hDPI), TQString::number(vDPI)) << " " << argumentOut.arg(fileName) << endl; // FIXME our sucky sync filter API limitations :-) - p.start(KProcess::Block); + p.start(TDEProcess::Block); return fileName; } diff --git a/kopete/plugins/motionautoaway/motionawayplugin.cpp b/kopete/plugins/motionautoaway/motionawayplugin.cpp index ea37878d..56958bec 100644 --- a/kopete/plugins/motionautoaway/motionawayplugin.cpp +++ b/kopete/plugins/motionautoaway/motionawayplugin.cpp @@ -159,7 +159,7 @@ MotionAwayPlugin::~MotionAwayPlugin() } void MotionAwayPlugin::loadSettings(){ - KConfig *kconfig = KGlobal::config(); + KConfig *kconfig = TDEGlobal::config(); kconfig->setGroup("MotionAway Plugin"); awayTimeout = kconfig->readNumEntry("AwayTimeout", 1); diff --git a/kopete/plugins/netmeeting/netmeetinginvitation.cpp b/kopete/plugins/netmeeting/netmeetinginvitation.cpp index 5fb799c1..8d310bc0 100644 --- a/kopete/plugins/netmeeting/netmeetinginvitation.cpp +++ b/kopete/plugins/netmeeting/netmeetinginvitation.cpp @@ -158,9 +158,9 @@ void NetMeetingInvitation::slotTimeout() void NetMeetingInvitation::startMeeting(const TQString & ip_address) { - //TODO: use KProcess + //TODO: use TDEProcess - KConfig *config=KGlobal::config(); + KConfig *config=TDEGlobal::config(); config->setGroup("Netmeeting Plugin"); TQString app=config->readEntry("NetmeetingApplication","ekiga -c callto://%1").arg(ip_address); @@ -168,7 +168,7 @@ void NetMeetingInvitation::startMeeting(const TQString & ip_address) TQStringList args=TQStringList::split(" ", app); - KProcess p; + TDEProcess p; for(TQStringList::Iterator it=args.begin() ; it != args.end() ; ++it) { p << *it; diff --git a/kopete/plugins/netmeeting/netmeetingplugin.cpp b/kopete/plugins/netmeeting/netmeetingplugin.cpp index 827270f7..2f76b09a 100644 --- a/kopete/plugins/netmeeting/netmeetingplugin.cpp +++ b/kopete/plugins/netmeeting/netmeetingplugin.cpp @@ -36,7 +36,7 @@ static const TDEAboutData aboutdata("kopete_netmeeting", I18N_NOOP("NetMeeting") K_EXPORT_COMPONENT_FACTORY( kopete_netmeeting, KGenericFactory<NetMeetingPlugin>( &aboutdata ) ) NetMeetingPlugin::NetMeetingPlugin( TQObject *parent, const char *name, const TQStringList &/*args*/ ) -: Kopete::Plugin( KGlobal::instance(), parent, name ) +: Kopete::Plugin( TDEGlobal::instance(), parent, name ) { if(MSNProtocol::protocol()) slotPluginLoaded(MSNProtocol::protocol()); diff --git a/kopete/plugins/netmeeting/netmeetingpreferences.cpp b/kopete/plugins/netmeeting/netmeetingpreferences.cpp index 313eb197..a1801fbf 100644 --- a/kopete/plugins/netmeeting/netmeetingpreferences.cpp +++ b/kopete/plugins/netmeeting/netmeetingpreferences.cpp @@ -56,7 +56,7 @@ NetmeetingPreferences::~NetmeetingPreferences() void NetmeetingPreferences::load() { - KConfig *config=KGlobal::config(); + KConfig *config=TDEGlobal::config(); config->setGroup("Netmeeting Plugin"); preferencesDialog->m_app->setCurrentText(config->readEntry("NetmeetingApplication","ekiga -c callto://%1")); emit KCModule::changed(false); @@ -64,7 +64,7 @@ void NetmeetingPreferences::load() void NetmeetingPreferences::save() { - KConfig *config=KGlobal::config(); + KConfig *config=TDEGlobal::config(); config->setGroup("Netmeeting Plugin"); config->writeEntry("NetmeetingApplication",preferencesDialog->m_app->currentText()); emit KCModule::changed(false); diff --git a/kopete/plugins/smpppdcs/detectornetstat.cpp b/kopete/plugins/smpppdcs/detectornetstat.cpp index f1ed21b5..6cb85d0e 100644 --- a/kopete/plugins/smpppdcs/detectornetstat.cpp +++ b/kopete/plugins/smpppdcs/detectornetstat.cpp @@ -39,16 +39,16 @@ void DetectorNetstat::checkStatus() const { m_buffer = TQString(); - // Use KProcess to run netstat -r. We'll then parse the output of + // Use TDEProcess to run netstat -r. We'll then parse the output of // netstat -r in slotProcessStdout() to see if it mentions the // default gateway. If so, we're connected, if not, we're offline - m_process = new KProcess; + m_process = new TDEProcess; *m_process << "netstat" << "-r"; - connect(m_process, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), this, TQT_SLOT(slotProcessStdout( KProcess *, char *, int))); - connect(m_process, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(slotProcessExited(KProcess *))); + connect(m_process, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), this, TQT_SLOT(slotProcessStdout( TDEProcess *, char *, int))); + connect(m_process, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotProcessExited(TDEProcess *))); - if(!m_process->start(KProcess::NotifyOnExit, KProcess::Stdout)) { + if(!m_process->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout)) { kdWarning(14312) << k_funcinfo << "Unable to start netstat process!" << endl; delete m_process; @@ -56,14 +56,14 @@ void DetectorNetstat::checkStatus() const { } } -void DetectorNetstat::slotProcessStdout(KProcess *, char *buffer, int buflen) { +void DetectorNetstat::slotProcessStdout(TDEProcess *, char *buffer, int buflen) { // Look for a default gateway kdDebug(14312) << k_funcinfo << endl; m_buffer += TQString::fromLatin1(buffer, buflen); kdDebug(14312) << m_buffer << endl; } -void DetectorNetstat::slotProcessExited(KProcess *process) { +void DetectorNetstat::slotProcessExited(TDEProcess *process) { kdDebug(14312) << k_funcinfo << m_buffer << endl; if(process == m_process) { m_connector->setConnectedStatus(m_buffer.contains("default")); diff --git a/kopete/plugins/smpppdcs/detectornetstat.h b/kopete/plugins/smpppdcs/detectornetstat.h index 959cf7fc..9542c58b 100644 --- a/kopete/plugins/smpppdcs/detectornetstat.h +++ b/kopete/plugins/smpppdcs/detectornetstat.h @@ -21,7 +21,7 @@ #include "detector.h" -class KProcess; +class TDEProcess; class IConnector; /** @@ -42,16 +42,16 @@ public: private slots: // Original cs-plugin code - void slotProcessStdout(KProcess * process, char * buffer, int len); + void slotProcessStdout(TDEProcess * process, char * buffer, int len); /** * Notify when the netstat process has exited */ - void slotProcessExited(KProcess *process); + void slotProcessExited(TDEProcess *process); private: mutable TQString m_buffer; - mutable KProcess * m_process; + mutable TDEProcess * m_process; }; #endif diff --git a/kopete/plugins/smpppdcs/smpppdsearcher.cpp b/kopete/plugins/smpppdcs/smpppdsearcher.cpp index a06e30a9..8f4c92de 100644 --- a/kopete/plugins/smpppdcs/smpppdsearcher.cpp +++ b/kopete/plugins/smpppdcs/smpppdsearcher.cpp @@ -42,12 +42,12 @@ void SMPPPDSearcher::searchNetwork() { // the first point to search is localhost if(!scan("127.0.0.1", "255.0.0.0")) { - m_procNetstat = new KProcess; + m_procNetstat = new TDEProcess; m_procNetstat->setEnvironment("LANG", "C"); // we want to force english output *m_procNetstat << "/bin/netstat" << "-rn"; - connect(m_procNetstat, TQT_SIGNAL(receivedStdout(KProcess *,char *,int)), this, TQT_SLOT(slotStdoutReceivedNetstat(KProcess *,char *,int))); - if(!m_procNetstat->start(KProcess::Block, KProcess::Stdout)) { + connect(m_procNetstat, TQT_SIGNAL(receivedStdout(TDEProcess *,char *,int)), this, TQT_SLOT(slotStdoutReceivedNetstat(TDEProcess *,char *,int))); + if(!m_procNetstat->start(TDEProcess::Block, TDEProcess::Stdout)) { kdDebug(14312) << k_funcinfo << "Couldn't execute /sbin/netstat -rn" << endl << "Perhaps the package net-tools isn't installed." << endl; emit smpppdNotFound(); @@ -59,9 +59,9 @@ void SMPPPDSearcher::searchNetwork() { } /*! - \fn SMPPPDSearcher::slotStdoutReceived(KProcess * proc, char * buf, int len) + \fn SMPPPDSearcher::slotStdoutReceived(TDEProcess * proc, char * buf, int len) */ -void SMPPPDSearcher::slotStdoutReceivedIfconfig(KProcess * /* proc */, char * buf, int len) { +void SMPPPDSearcher::slotStdoutReceivedIfconfig(TDEProcess * /* proc */, char * buf, int len) { kdDebug(14312) << k_funcinfo << endl; TQString myBuf = TQString::fromLatin1(buf,len); @@ -78,7 +78,7 @@ void SMPPPDSearcher::slotStdoutReceivedIfconfig(KProcess * /* proc */, char * bu emit smpppdNotFound(); } -void SMPPPDSearcher::slotStdoutReceivedNetstat(KProcess * /* proc */, char * buf, int len) { +void SMPPPDSearcher::slotStdoutReceivedNetstat(TDEProcess * /* proc */, char * buf, int len) { kdDebug(14312) << k_funcinfo << endl; TQRegExp rexGW(".*\\n0.0.0.0[ ]*([0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}).*"); @@ -86,12 +86,12 @@ void SMPPPDSearcher::slotStdoutReceivedNetstat(KProcess * /* proc */, char * buf if(!(rexGW.exactMatch(myBuf) && scan(rexGW.cap(1), "255.255.255.255"))) { // if netstat -r found no gateway we search the network - m_procIfconfig = new KProcess; + m_procIfconfig = new TDEProcess; m_procIfconfig->setEnvironment("LANG", "C"); // we want to force english output *m_procIfconfig << "/sbin/ifconfig"; - connect(m_procIfconfig, TQT_SIGNAL(receivedStdout(KProcess *,char *,int)), this, TQT_SLOT(slotStdoutReceivedIfconfig(KProcess *,char *,int))); - if(!m_procIfconfig->start(KProcess::Block, KProcess::Stdout)) { + connect(m_procIfconfig, TQT_SIGNAL(receivedStdout(TDEProcess *,char *,int)), this, TQT_SLOT(slotStdoutReceivedIfconfig(TDEProcess *,char *,int))); + if(!m_procIfconfig->start(TDEProcess::Block, TDEProcess::Stdout)) { kdDebug(14312) << k_funcinfo << "Couldn't execute /sbin/ifconfig" << endl << "Perhaps the package net-tools isn't installed." << endl; emit smpppdNotFound(); diff --git a/kopete/plugins/smpppdcs/smpppdsearcher.h b/kopete/plugins/smpppdcs/smpppdsearcher.h index 36c4ac9c..e6c0b8ea 100644 --- a/kopete/plugins/smpppdcs/smpppdsearcher.h +++ b/kopete/plugins/smpppdcs/smpppdsearcher.h @@ -20,7 +20,7 @@ #include <kresolver.h> -class KProcess; +class TDEProcess; /** * @brief Searches a network for a smpppd @@ -86,13 +86,13 @@ signals: void scanFinished(); protected slots: - void slotStdoutReceivedIfconfig(KProcess * proc, char * buf, int len); - void slotStdoutReceivedNetstat (KProcess * proc, char * buf, int len); + void slotStdoutReceivedIfconfig(TDEProcess * proc, char * buf, int len); + void slotStdoutReceivedNetstat (TDEProcess * proc, char * buf, int len); private: bool m_cancelSearchNow; - KProcess * m_procIfconfig; - KProcess * m_procNetstat; + TDEProcess * m_procIfconfig; + TDEProcess * m_procNetstat; }; inline void SMPPPDSearcher::cancelSearch() { diff --git a/kopete/plugins/statistics/statisticsdialog.cpp b/kopete/plugins/statistics/statisticsdialog.cpp index 0e775405..a4bd07cf 100644 --- a/kopete/plugins/statistics/statisticsdialog.cpp +++ b/kopete/plugins/statistics/statisticsdialog.cpp @@ -404,8 +404,8 @@ void StatisticsDialog::generatePageFromTQStringList(TQStringList values, const T generalHTMLPart->write(TQString("</div>")); generalHTMLPart->write(TQString("<div class=\"statgroup\">")); - generalHTMLPart->write(i18n("<b title=\"The last time you talked with %1\">Last talk :</b> %2<br>").arg(m_contact->metaContact()->displayName()).arg(KGlobal::locale()->formatDateTime(m_contact->lastTalk()))); - generalHTMLPart->write(i18n("<b title=\"The last time I have seen %1 online or away\">Last time contact was present :</b> %2").arg(m_contact->metaContact()->displayName()).arg(KGlobal::locale()->formatDateTime(m_contact->lastPresent()))); + generalHTMLPart->write(i18n("<b title=\"The last time you talked with %1\">Last talk :</b> %2<br>").arg(m_contact->metaContact()->displayName()).arg(TDEGlobal::locale()->formatDateTime(m_contact->lastTalk()))); + generalHTMLPart->write(i18n("<b title=\"The last time I have seen %1 online or away\">Last time contact was present :</b> %2").arg(m_contact->metaContact()->displayName()).arg(TDEGlobal::locale()->formatDateTime(m_contact->lastPresent()))); generalHTMLPart->write(TQString("</div>")); //generalHTMLPart->write(TQString("<div class=\"statgroup\">")); @@ -418,7 +418,7 @@ void StatisticsDialog::generatePageFromTQStringList(TQStringList values, const T generalHTMLPart->write("<div title=\"" +i18n("Current status") + "\" class=\"statgroup\">"); generalHTMLPart->write(i18n("Is <b>%1</b> since <b>%2</b>").arg( Kopete::OnlineStatus(m_contact->oldStatus()).description(), - KGlobal::locale()->formatDateTime(m_contact->oldStatusDateTime()))); + TDEGlobal::locale()->formatDateTime(m_contact->oldStatusDateTime()))); generalHTMLPart->write(TQString("</div>")); } @@ -524,7 +524,7 @@ void StatisticsDialog::slotAskButtonClicked() if (mainWidget->questionComboBox->currentItem()==0) { TQString text = i18n("1 is date, 2 is contact name, 3 is online status", "%1, %2 was %3") - .arg(KGlobal::locale()->formatDateTime(TQDateTime(mainWidget->datePicker->date(), mainWidget->timePicker->time()))) + .arg(TDEGlobal::locale()->formatDateTime(TQDateTime(mainWidget->datePicker->date(), mainWidget->timePicker->time()))) .arg(m_contact->metaContact()->displayName()) .arg(m_contact->statusAt(TQDateTime(mainWidget->datePicker->date(), mainWidget->timePicker->time()))); mainWidget->answerEdit->setText(text); diff --git a/kopete/plugins/texteffect/texteffectconfig.cpp b/kopete/plugins/texteffect/texteffectconfig.cpp index 2f6da206..bf05d59a 100644 --- a/kopete/plugins/texteffect/texteffectconfig.cpp +++ b/kopete/plugins/texteffect/texteffectconfig.cpp @@ -30,7 +30,7 @@ TextEffectConfig::TextEffectConfig() void TextEffectConfig::load() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("TextEffect Plugin"); mColors = config->readListEntry("Colors"); @@ -54,7 +54,7 @@ TQStringList TextEffectConfig::defaultColorList() void TextEffectConfig::save() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("TextEffect Plugin"); config->writeEntry("Colors", mColors ); diff --git a/kopete/plugins/translator/translatorplugin.cpp b/kopete/plugins/translator/translatorplugin.cpp index f4a9e8a0..d331f8f2 100644 --- a/kopete/plugins/translator/translatorplugin.cpp +++ b/kopete/plugins/translator/translatorplugin.cpp @@ -107,7 +107,7 @@ TranslatorPlugin* TranslatorPlugin::pluginStatic_ = 0L; void TranslatorPlugin::loadSettings() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); int mode = 0; config->setGroup( "Translator Plugin" ); diff --git a/kopete/plugins/webpresence/webpresenceplugin.cpp b/kopete/plugins/webpresence/webpresenceplugin.cpp index bb7b9d4c..59cf8315 100644 --- a/kopete/plugins/webpresence/webpresenceplugin.cpp +++ b/kopete/plugins/webpresence/webpresenceplugin.cpp @@ -73,7 +73,7 @@ WebPresencePlugin::~WebPresencePlugin() void WebPresencePlugin::loadSettings() { - KConfig *kconfig = KGlobal::config(); + KConfig *kconfig = TDEGlobal::config(); kconfig->setGroup( "Web Presence Plugin" ); frequency = kconfig->readNumEntry("UploadFrequency", 15); @@ -228,7 +228,7 @@ KTempFile* WebPresencePlugin::generateFile() // insert the current date/time TQDomElement date = doc.createElement( "listdate" ); TQDomText t = doc.createTextNode( - KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime() ) ); + TDEGlobal::locale()->formatDateTime( TQDateTime::currentDateTime() ) ); date.appendChild( t ); root.appendChild( date ); diff --git a/kopete/plugins/webpresence/webpresencepreferences.cpp b/kopete/plugins/webpresence/webpresencepreferences.cpp index e25458ee..e62e63bc 100644 --- a/kopete/plugins/webpresence/webpresencepreferences.cpp +++ b/kopete/plugins/webpresence/webpresencepreferences.cpp @@ -37,7 +37,7 @@ WebPresencePreferences::WebPresencePreferences(TQWidget *parent, const char* /*n preferencesDialog->formatStylesheetURL->setFilter( "*.xsl" ); // KAutoConfig stuff - kautoconfig = new KAutoConfig(KGlobal::config(), TQT_TQOBJECT(this), "kautoconfig"); + kautoconfig = new KAutoConfig(TDEGlobal::config(), TQT_TQOBJECT(this), "kautoconfig"); connect(kautoconfig, TQT_SIGNAL(widgetModified()), TQT_SLOT(widgetModified())); connect(kautoconfig, TQT_SIGNAL(settingsChanged()), TQT_SLOT(widgetModified())); kautoconfig->addWidget(preferencesDialog, "Web Presence Plugin"); diff --git a/kopete/protocols/gadu/gaduaccount.cpp b/kopete/protocols/gadu/gaduaccount.cpp index 19db0db7..76ec8b4f 100644 --- a/kopete/protocols/gadu/gaduaccount.cpp +++ b/kopete/protocols/gadu/gaduaccount.cpp @@ -128,7 +128,7 @@ static const char* const servers_ip[] = { p->textcodec_ = TQTextCodec::codecForName( "CP1250" ); p->session_ = new GaduSession( this, "GaduSession" ); - KGlobal::config()->setGroup( "Gadu" ); + TDEGlobal::config()->setGroup( "Gadu" ); setMyself( new GaduContact( accountId().toInt(), accountId(), this, Kopete::ContactList::self()->myself() ) ); diff --git a/kopete/protocols/gadu/gaduregisteraccount.cpp b/kopete/protocols/gadu/gaduregisteraccount.cpp index e33b4959..a5eb3dce 100644 --- a/kopete/protocols/gadu/gaduregisteraccount.cpp +++ b/kopete/protocols/gadu/gaduregisteraccount.cpp @@ -49,7 +49,7 @@ GaduRegisterAccount::GaduRegisterAccount( TQWidget* parent, const char* name ) cRegister = new RegisterCommand( TQT_TQOBJECT(this) ); emailRegexp = new TQRegExp( "[\\w\\d.+_-]{1,}@[\\w\\d.-]{1,}" ); - hintPixmap = KGlobal::iconLoader()->loadIcon ( "gadu_protocol", KIcon::Small ); + hintPixmap = TDEGlobal::iconLoader()->loadIcon ( "gadu_protocol", KIcon::Small ); connect( this, TQT_SIGNAL( user1Clicked() ), TQT_SLOT( doRegister() ) ); connect( this, TQT_SIGNAL( okClicked() ), TQT_SLOT( slotClose() ) ); diff --git a/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp b/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp index 6005f61a..d4c65412 100644 --- a/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp +++ b/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp @@ -49,7 +49,7 @@ ReceiveInvitationDialog::ReceiveInvitationDialog( GroupWiseAccount * account, co else //something is very wrong m_wid->m_contactName->setText( event.user ); - m_wid->m_dateTime->setText( KGlobal::locale()->formatDateTime( event.timeStamp ) ); + m_wid->m_dateTime->setText( TDEGlobal::locale()->formatDateTime( event.timeStamp ) ); m_wid->m_message->setText( TQString("<b>%1</b>").arg( event.message ) ); setMainWidget( m_wid ); diff --git a/kopete/protocols/irc/ircaccount.cpp b/kopete/protocols/irc/ircaccount.cpp index 318a8f20..ffede29f 100644 --- a/kopete/protocols/irc/ircaccount.cpp +++ b/kopete/protocols/irc/ircaccount.cpp @@ -757,7 +757,7 @@ void IRCAccount::slotJoinChannel() comp.insertItems( chans ); dlg.lineEdit()->setCompletionObject( &comp ); - dlg.lineEdit()->setCompletionMode( KGlobalSettings::CompletionPopup ); + dlg.lineEdit()->setCompletionMode( TDEGlobalSettings::CompletionPopup ); while( true ) { diff --git a/kopete/protocols/irc/ircchannelcontact.cpp b/kopete/protocols/irc/ircchannelcontact.cpp index 94d67d3a..cab34817 100644 --- a/kopete/protocols/irc/ircchannelcontact.cpp +++ b/kopete/protocols/irc/ircchannelcontact.cpp @@ -495,7 +495,7 @@ void IRCChannelContact::topicUser(const TQString &nick, const TQDateTime &time) Kopete::Message msg(account->myServer(), mMyself, i18n("Topic set by %1 at %2").arg(nick).arg( - KGlobal::locale()->formatDateTime(time, true) + TDEGlobal::locale()->formatDateTime(time, true) ), Kopete::Message::Internal, Kopete::Message::PlainText, CHAT_VIEW); msg.setImportance(Kopete::Message::Low); //set the importance manualy to low appendMessage(msg); diff --git a/kopete/protocols/irc/ircusercontact.cpp b/kopete/protocols/irc/ircusercontact.cpp index c4607cb9..54c40132 100644 --- a/kopete/protocols/irc/ircusercontact.cpp +++ b/kopete/protocols/irc/ircusercontact.cpp @@ -472,7 +472,7 @@ void IRCUserContact::whoWasComplete() .arg(mInfo.realName); msg += i18n("Last Online: %1\n").arg( - KGlobal::locale()->formatDateTime( + TDEGlobal::locale()->formatDateTime( property( m_protocol->propLastSeen ).value().toDateTime() ) ); diff --git a/kopete/protocols/irc/kcodecaction.cpp b/kopete/protocols/irc/kcodecaction.cpp index 5dca8771..97964885 100644 --- a/kopete/protocols/irc/kcodecaction.cpp +++ b/kopete/protocols/irc/kcodecaction.cpp @@ -34,9 +34,9 @@ void KCodecAction::slotActivated( const TQString & text ) /* text is something like "Western European ( iso-8859-1 )", but we must give * codecForName() only the "iso-8859-1" part. */ - TQString encoding = KGlobal::charsets()->encodingForName(text); + TQString encoding = TDEGlobal::charsets()->encodingForName(text); - emit activated( KGlobal::charsets()->codecForName(encoding) ); + emit activated( TDEGlobal::charsets()->codecForName(encoding) ); } void KCodecAction::setCodec( const TQTextCodec *codec ) @@ -44,9 +44,9 @@ void KCodecAction::setCodec( const TQTextCodec *codec ) TQStringList items = this->items(); int i = 0; for (TQStringList::ConstIterator it = items.begin(), end = items.end(); it != end; ++it, ++i) { - TQString encoding = KGlobal::charsets()->encodingForName(*it); + TQString encoding = TDEGlobal::charsets()->encodingForName(*it); - if (KGlobal::charsets()->codecForName(encoding)->mibEnum() == codec->mibEnum()) { + if (TDEGlobal::charsets()->codecForName(encoding)->mibEnum() == codec->mibEnum()) { setCurrentItem(i); break; } @@ -61,25 +61,25 @@ void KCodecAction::setCodec( const TQTextCodec *codec ) TQStringList KCodecAction::supportedEncodings(bool usAscii) { - TQStringList encodingNames = KGlobal::charsets()->availableEncodingNames(); + TQStringList encodingNames = TDEGlobal::charsets()->availableEncodingNames(); TQStringList encodings; TQMap<TQString, bool> mimeNames; for (TQStringList::ConstIterator it = encodingNames.begin(); it != encodingNames.end(); ++it) { - TQTextCodec *codec = KGlobal::charsets()->codecForName(*it); + TQTextCodec *codec = TDEGlobal::charsets()->codecForName(*it); TQString mimeName = (codec) ? TQString(codec->mimeName()).lower() : (*it); if (mimeNames.find(mimeName) == mimeNames.end()) { - encodings.append(KGlobal::charsets()->languageForEncoding(*it) + encodings.append(TDEGlobal::charsets()->languageForEncoding(*it) + " ( " + mimeName + " )"); mimeNames.insert(mimeName, true); } } encodings.sort(); - if (usAscii) encodings.prepend(KGlobal::charsets() + if (usAscii) encodings.prepend(TDEGlobal::charsets() ->languageForEncoding("us-ascii") + " ( us-ascii )"); return encodings; } diff --git a/kopete/protocols/irc/ui/irceditaccountwidget.cpp b/kopete/protocols/irc/ui/irceditaccountwidget.cpp index c0d5a87a..1b268027 100644 --- a/kopete/protocols/irc/ui/irceditaccountwidget.cpp +++ b/kopete/protocols/irc/ui/irceditaccountwidget.cpp @@ -98,9 +98,9 @@ IRCEditAccountWidget::IRCEditAccountWidget(IRCProtocol *proto, IRCAccount *ident charset->insertStringList( KCodecAction::supportedEncodings() ); for (int i = 0; i < charset->count(); ++i) { - TQString encoding = KGlobal::charsets()->encodingForName(charset->text(i)); + TQString encoding = TDEGlobal::charsets()->encodingForName(charset->text(i)); - if (KGlobal::charsets()->codecForName(encoding)->mibEnum() == currentCodec) { + if (TDEGlobal::charsets()->codecForName(encoding)->mibEnum() == currentCodec) { charset->setCurrentItem( i ); break; } @@ -208,7 +208,7 @@ void IRCEditAccountWidget::slotAddCtcp() TQString IRCEditAccountWidget::generateAccountId( const TQString &network ) { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); TQString nextId = network; uint accountNumber = 1; @@ -262,7 +262,7 @@ Kopete::Account *IRCEditAccountWidget::apply() account()->setCustomCtcpReplies( replies ); account()->setConnectCommands( cmds ); - KCharsets *c = KGlobal::charsets(); + KCharsets *c = TDEGlobal::charsets(); account()->setCodec( c->codecForName( c->encodingForName( charset->currentText() ) ) ); return account(); diff --git a/kopete/protocols/jabber/jabberaccount.cpp b/kopete/protocols/jabber/jabberaccount.cpp index d46f8707..bb4766e8 100644 --- a/kopete/protocols/jabber/jabberaccount.cpp +++ b/kopete/protocols/jabber/jabberaccount.cpp @@ -348,9 +348,9 @@ void JabberAccount::connectWithPassword ( const TQString &password ) m_jabberClient->setAllowPlainTextPassword ( configGroup()->readBoolEntry ( "AllowPlainTextPassword", false ) ); // enable file transfer (if empty, IP will be set after connection has been established) - KGlobal::config()->setGroup ( "Jabber" ); - m_jabberClient->setFileTransfersEnabled ( true, KGlobal::config()->readEntry ( "LocalIP" ) ); - setS5BServerPort ( KGlobal::config()->readNumEntry ( "LocalPort", 8010 ) ); + TDEGlobal::config()->setGroup ( "Jabber" ); + m_jabberClient->setFileTransfersEnabled ( true, TDEGlobal::config()->readEntry ( "LocalIP" ) ); + setS5BServerPort ( TDEGlobal::config()->readNumEntry ( "LocalPort", 8010 ) ); // // Determine system name diff --git a/kopete/protocols/jabber/jabberbasecontact.cpp b/kopete/protocols/jabber/jabberbasecontact.cpp index 5dac2e18..6ed0bcfd 100644 --- a/kopete/protocols/jabber/jabberbasecontact.cpp +++ b/kopete/protocols/jabber/jabberbasecontact.cpp @@ -277,7 +277,7 @@ void JabberBaseContact::updateResourceList () // resource timestamp resourceListStr += TQString ( "<tr><td>%1: %2</td></tr>" ). - arg ( i18n ( "Timestamp" ), KGlobal::locale()->formatDateTime ( (*it)->resource().status().timeStamp(), true, true ) ); + arg ( i18n ( "Timestamp" ), TDEGlobal::locale()->formatDateTime ( (*it)->resource().status().timeStamp(), true, true ) ); // message, if any if ( !(*it)->resource().status().status().stripWhiteSpace().isEmpty () ) diff --git a/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp b/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp index b8a9c080..71ad871f 100644 --- a/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp +++ b/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp @@ -115,9 +115,9 @@ void JabberEditAccountWidget::reopen () cbAllowPlainTextPassword->setChecked (account()->configGroup()->readBoolEntry("AllowPlainTextPassword", true)); - KGlobal::config()->setGroup("Jabber"); - leLocalIP->setText (KGlobal::config()->readEntry("LocalIP", "")); - sbLocalPort->setValue (KGlobal::config()->readNumEntry("LocalPort", 8010)); + TDEGlobal::config()->setGroup("Jabber"); + leLocalIP->setText (TDEGlobal::config()->readEntry("LocalIP", "")); + sbLocalPort->setValue (TDEGlobal::config()->readNumEntry("LocalPort", 8010)); leProxyJID->setText (account()->configGroup()->readEntry("ProxyJID", TQString())); @@ -178,9 +178,9 @@ void JabberEditAccountWidget::writeConfig () account()->setExcludeConnect(cbAutoConnect->isChecked()); - KGlobal::config()->setGroup("Jabber"); - KGlobal::config()->writeEntry("LocalIP", leLocalIP->text()); - KGlobal::config()->writeEntry("LocalPort", sbLocalPort->value()); + TDEGlobal::config()->setGroup("Jabber"); + TDEGlobal::config()->writeEntry("LocalIP", leLocalIP->text()); + TDEGlobal::config()->writeEntry("LocalPort", sbLocalPort->value()); account()->configGroup()->writeEntry("ProxyJID", leProxyJID->text()); diff --git a/kopete/protocols/jabber/ui/jabberregisteraccount.cpp b/kopete/protocols/jabber/ui/jabberregisteraccount.cpp index 00f228d5..7cb869e9 100644 --- a/kopete/protocols/jabber/ui/jabberregisteraccount.cpp +++ b/kopete/protocols/jabber/ui/jabberregisteraccount.cpp @@ -73,7 +73,7 @@ JabberRegisterAccount::JabberRegisterAccount ( JabberEditAccountWidget *parent, connect ( jabberClient, TQT_SIGNAL ( connected () ), this, TQT_SLOT ( slotConnected () ) ); jidRegExp.setPattern ( "[\\w\\d.+_-]{1,}@[\\w\\d.-]{1,}" ); - hintPixmap = KGlobal::iconLoader()->loadIcon ( "jabber_online", KIcon::Small ); + hintPixmap = TDEGlobal::iconLoader()->loadIcon ( "jabber_online", KIcon::Small ); mSuccess = false; diff --git a/kopete/protocols/msn/msnaccount.cpp b/kopete/protocols/msn/msnaccount.cpp index c4dcabf2..034f2548 100644 --- a/kopete/protocols/msn/msnaccount.cpp +++ b/kopete/protocols/msn/msnaccount.cpp @@ -1184,8 +1184,8 @@ void MSNAccount::slotCreateChat( const TQString& ID, const TQString& address, co * see MSNChatSession::receivedTypingMsg * - KGlobal::config()->setGroup( "MSN" ); - bool notifyNewChat = KGlobal::config()->readBoolEntry( "NotifyNewChat", false ); + TDEGlobal::config()->setGroup( "MSN" ); + bool notifyNewChat = TDEGlobal::config()->readBoolEntry( "NotifyNewChat", false ); if ( !ID.isEmpty() && notifyNewChat ) { // this temporary message should open the window if they not exist diff --git a/kopete/protocols/msn/msnchatsession.cpp b/kopete/protocols/msn/msnchatsession.cpp index 6709f0f1..8e2113a1 100644 --- a/kopete/protocols/msn/msnchatsession.cpp +++ b/kopete/protocols/msn/msnchatsession.cpp @@ -173,7 +173,7 @@ void MSNChatSession::createChat( const TQString &handle, this, TQT_SLOT( slotSwitchBoardClosed() ) ); connect( m_chatService, TQT_SIGNAL( receivedTypingMsg( const TQString &, bool ) ), this, TQT_SLOT( receivedTypingMsg( const TQString &, bool ) ) ); - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "MSN" ); if(config->readBoolEntry( "SendTypingNotification" , true) ) { @@ -223,7 +223,7 @@ void MSNChatSession::slotUserJoined( const TQString &handle, const TQString &pub if(!m_messagesQueue.empty() || !m_invitations.isEmpty()) sendMessageQueue(); - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "MSN" ); if ( members().count()==1 && config->readNumEntry( "DownloadPicture", 1 ) >= 1 && !c->object().isEmpty() && !c->hasProperty(Kopete::Global::Properties::self()->photo().key())) slotRequestPicture(); @@ -584,7 +584,7 @@ void MSNChatSession::slotDisplayPictureChanged() } else { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "MSN" ); if ( config->readNumEntry( "DownloadPicture", 1 ) >= 1 && !c->object().isEmpty() ) slotRequestPicture(); @@ -616,8 +616,8 @@ void MSNChatSession::receivedTypingMsg( const TQString &contactId, bool b ) if(c && m_newSession && !view(false)) { //this was originaly in MSNAccount::slotCreateChat - KGlobal::config()->setGroup( "MSN" ); - bool notifyNewChat = KGlobal::config()->readBoolEntry( "NotifyNewChat", false ); + TDEGlobal::config()->setGroup( "MSN" ); + bool notifyNewChat = TDEGlobal::config()->readBoolEntry( "NotifyNewChat", false ); if ( notifyNewChat ) { // this internal message should open the window if they not exist diff --git a/kopete/protocols/msn/msncontact.cpp b/kopete/protocols/msn/msncontact.cpp index 700bf213..e77ba2ff 100644 --- a/kopete/protocols/msn/msncontact.cpp +++ b/kopete/protocols/msn/msncontact.cpp @@ -700,7 +700,7 @@ void MSNContact::setObject(const TQString &obj) removeProperty( Kopete::Global::Properties::self()->photo() ) ; emit displayPictureChanged(); - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "MSN" ); if ( config->readNumEntry( "DownloadPicture", 2 ) >= 2 && !obj.isEmpty() && account()->myself()->onlineStatus().status() != Kopete::OnlineStatus::Invisible ) diff --git a/kopete/protocols/msn/msnswitchboardsocket.cpp b/kopete/protocols/msn/msnswitchboardsocket.cpp index 3298e46e..f2a7e667 100644 --- a/kopete/protocols/msn/msnswitchboardsocket.cpp +++ b/kopete/protocols/msn/msnswitchboardsocket.cpp @@ -419,7 +419,7 @@ void MSNSwitchBoardSocket::slotReadMessage( const TQByteArray &bytes ) else if( type== "text/x-mms-emoticon" || type== "text/x-mms-animemoticon") { // TODO remove Displatcher. - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "MSN" ); if ( config->readBoolEntry( "useCustomEmoticons", true ) ) { @@ -466,7 +466,7 @@ void MSNSwitchBoardSocket::slotReadMessage( const TQByteArray &bytes ) if(!m_clientcapsSent) { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "MSN" ); TQString JabberID; @@ -667,7 +667,7 @@ int MSNSwitchBoardSocket::sendMsg( const Kopete::Message &msg ) } #endif - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "MSN" ); if ( config->readBoolEntry( "exportEmoticons", false ) ) { diff --git a/kopete/protocols/msn/ui/msneditaccountwidget.cpp b/kopete/protocols/msn/ui/msneditaccountwidget.cpp index 4bb246a2..60672824 100644 --- a/kopete/protocols/msn/ui/msneditaccountwidget.cpp +++ b/kopete/protocols/msn/ui/msneditaccountwidget.cpp @@ -84,8 +84,8 @@ MSNEditAccountWidget::MSNEditAccountWidget( MSNProtocol *proto, Kopete::Account d->autoConfig->retrieveSettings( true ); //Get a list of all jabber accounts - KGlobal::config()->setGroup("MSN"); - TQString jab_account=KGlobal::config()->readEntry("JabberAccount"); + TDEGlobal::config()->setGroup("MSN"); + TQString jab_account=TDEGlobal::config()->readEntry("JabberAccount"); TQPtrList<Kopete::Account> accounts = Kopete::AccountManager::self()->accounts(); for(Kopete::Account *a=accounts.first() ; a; a=accounts.next() ) @@ -192,8 +192,8 @@ MSNEditAccountWidget::~MSNEditAccountWidget() Kopete::Account * MSNEditAccountWidget::apply() { d->autoConfig->saveSettings(); - KGlobal::config()->setGroup("MSN"); - KGlobal::config()->writeEntry("JabberAccount", d->ui->JabberAccount->currentText()); + TDEGlobal::config()->setGroup("MSN"); + TDEGlobal::config()->writeEntry("JabberAccount", d->ui->JabberAccount->currentText()); if ( !account() ) setAccount( new MSNAccount( d->protocol, d->ui->m_login->text() ) ); diff --git a/kopete/protocols/msn/webcam.cpp b/kopete/protocols/msn/webcam.cpp index 88fe7d33..43b0f33e 100644 --- a/kopete/protocols/msn/webcam.cpp +++ b/kopete/protocols/msn/webcam.cpp @@ -54,7 +54,7 @@ Webcam::Webcam(Who who, const TQString& to, Dispatcher *parent, TQ_UINT32 sessio m_mimic=0L; m_widget=0L; - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "MSN" ); // Read the configuration to get the number of frame per second to send @@ -519,7 +519,7 @@ TQString Webcam::xml(uint session , uint rid) int Webcam::getAvailablePort() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "MSN" ); TQString basePort=config->readEntry("WebcamPort"); if(basePort.isEmpty() || basePort == "0" ) diff --git a/kopete/protocols/oscar/icq/icqprotocol.cpp b/kopete/protocols/oscar/icq/icqprotocol.cpp index cf86118f..a7e3f001 100644 --- a/kopete/protocols/oscar/icq/icqprotocol.cpp +++ b/kopete/protocols/oscar/icq/icqprotocol.cpp @@ -219,7 +219,7 @@ void ICQProtocol::initGenders() void ICQProtocol::initCountries() { mCountries.insert(0, ""); // unspecified - KLocale *kl = KGlobal::locale(); //KLocale(TQString::fromLatin1("kopete")); + KLocale *kl = TDEGlobal::locale(); //KLocale(TQString::fromLatin1("kopete")); mCountries.insert(93, kl->twoAlphaToCountryName("af")); mCountries.insert(355, kl->twoAlphaToCountryName("al")); @@ -468,7 +468,7 @@ void ICQProtocol::initCountries() void ICQProtocol::initLang() { - KLocale *kl = KGlobal::locale(); //KLocale(TQString::fromLatin1("kopete")); + KLocale *kl = TDEGlobal::locale(); //KLocale(TQString::fromLatin1("kopete")); mLanguages.insert(0 , ""); mLanguages.insert(1 , kl->twoAlphaToLanguageName("ar") /*i18n("Arabic")*/); diff --git a/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp b/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp index 44fd5afd..4d09d70f 100644 --- a/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp +++ b/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp @@ -47,28 +47,28 @@ ICQUserInfoWidget::ICQUserInfoWidget( TQWidget * parent, const char * name ) TQFrame* genInfo = addPage( i18n( "General Info" ), i18n( "General ICQ Information" ), - KGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "identity" ), KIcon::Desktop ) ); + TDEGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "identity" ), KIcon::Desktop ) ); TQVBoxLayout* genLayout = new TQVBoxLayout( genInfo ); m_genInfoWidget = new ICQGeneralInfoWidget( genInfo, "Basic Information" ); genLayout->addWidget( m_genInfoWidget ); TQFrame* workInfo = addPage( i18n( "Work Info" ), i18n( "Work Information" ), - KGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "attach" ), KIcon::Desktop ) ); + TDEGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "attach" ), KIcon::Desktop ) ); TQVBoxLayout* workLayout = new TQVBoxLayout( workInfo ); m_workInfoWidget = new ICQWorkInfoWidget( workInfo, "Work Information" ); workLayout->addWidget( m_workInfoWidget ); TQFrame* otherInfo = addPage( i18n( "Other Info" ), i18n( "Other ICQ Information" ), - KGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "email" ), KIcon::Desktop ) ); + TDEGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "email" ), KIcon::Desktop ) ); TQVBoxLayout* otherLayout = new TQVBoxLayout( otherInfo ); m_otherInfoWidget = new ICQOtherInfoWidget( otherInfo, "Other Information" ); otherLayout->addWidget( m_otherInfoWidget ); TQFrame* interestInfo = addPage( i18n( "Interest Info" ), i18n( "Interest" ), - KGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "email" ), KIcon::Desktop ) ); + TDEGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "email" ), KIcon::Desktop ) ); TQVBoxLayout* interestLayout = new TQVBoxLayout( interestInfo ); m_interestInfoWidget = new ICQInterestInfoWidget( interestInfo, "Other Information" ); interestLayout->addWidget( m_interestInfoWidget ); @@ -165,7 +165,7 @@ void ICQUserInfoWidget::fillMoreInfo( const ICQMoreUserInfo& ui ) TQTextCodec* codec = m_contact->contactCodec(); m_genInfoWidget->ageSpinBox->setValue( ui.age ); if ( ui.birthday.isValid() ) - m_genInfoWidget->birthday->setText( KGlobal::locale()->formatDate( ui.birthday,true ) ); + m_genInfoWidget->birthday->setText( TDEGlobal::locale()->formatDate( ui.birthday,true ) ); TQString gender = static_cast<ICQProtocol*>( m_contact->protocol() )->genders()[ui.gender]; m_genInfoWidget->genderEdit->setText( gender ); diff --git a/kopete/protocols/oscar/oscarversionupdater.cpp b/kopete/protocols/oscar/oscarversionupdater.cpp index 90981434..d79e47fc 100644 --- a/kopete/protocols/oscar/oscarversionupdater.cpp +++ b/kopete/protocols/oscar/oscarversionupdater.cpp @@ -66,7 +66,7 @@ bool OscarVersionUpdater::update( unsigned int stamp ) { mVersionData.resize( 0 ); - KConfigGroup config( KGlobal::config(), "Oscar" ); + KConfigGroup config( TDEGlobal::config(), "Oscar" ); TQString url = config.readEntry( "NewVersionURL", "http://kopete.kde.org/oscarversions.xml" ); mTransferJob = KIO::get ( url ); kdDebug(OSCAR_GEN_DEBUG) << k_funcinfo << "Download version info from server."<< endl; @@ -87,7 +87,7 @@ unsigned int OscarVersionUpdater::stamp() const void OscarVersionUpdater::initICQVersionInfo() { kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << endl; - KConfigGroup config( KGlobal::config(), "ICQVersion" ); + KConfigGroup config( TDEGlobal::config(), "ICQVersion" ); mICQVersion.clientString = config.readEntry( "ClientString", "ICQ Client" ); mICQVersion.clientId = config.readEntry( "ClientId", "0x010A" ).toUShort( 0, 0 ); @@ -104,7 +104,7 @@ void OscarVersionUpdater::initAIMVersionInfo() { kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << endl; - KConfigGroup config( KGlobal::config(), "AIMVersion" ); + KConfigGroup config( TDEGlobal::config(), "AIMVersion" ); mAIMVersion.clientString = config.readEntry( "ClientString", "AOL Instant Messenger (SM), version 5.1.3036/WIN32" ); mAIMVersion.clientId = config.readEntry( "ClientId", "0x0109" ).toUShort( 0, 0 ); @@ -264,7 +264,7 @@ bool OscarVersionUpdater::parseVersion( Oscar::ClientVersion& version, TQDomElem void OscarVersionUpdater::storeVersionInfo( const TQString& group, const Oscar::ClientVersion& version ) const { kdDebug(OSCAR_GEN_DEBUG) << k_funcinfo << "Storing version info to group: " << group << endl; - KConfigGroup config( KGlobal::config(), group ); + KConfigGroup config( TDEGlobal::config(), group ); config.writeEntry( "ClientString", version.clientString ); config.writeEntry( "ClientId", version.clientId ); diff --git a/kopete/protocols/sms/services/gsmlib.h b/kopete/protocols/sms/services/gsmlib.h index c49e26b7..5f7b9257 100644 --- a/kopete/protocols/sms/services/gsmlib.h +++ b/kopete/protocols/sms/services/gsmlib.h @@ -40,7 +40,7 @@ class GSMLibPrefsUI; class SMSContact; class TQListViewItem; -class KProcess; +class TDEProcess; class GSMLibThread; class GSMLib : public SMSService diff --git a/kopete/protocols/sms/services/smsclient.cpp b/kopete/protocols/sms/services/smsclient.cpp index 984e8435..9a1898a8 100644 --- a/kopete/protocols/sms/services/smsclient.cpp +++ b/kopete/protocols/sms/services/smsclient.cpp @@ -71,7 +71,7 @@ void SMSClient::send(const Kopete::Message& msg) if (programName.isNull()) programName = "/usr/bin/sms_client"; - KProcess* p = new KProcess; + TDEProcess* p = new TDEProcess; TQString message = msg.plainBody(); TQString nr = msg.to().first()->contactId(); @@ -80,11 +80,11 @@ void SMSClient::send(const Kopete::Message& msg) *p << provider + ":" + nr; *p << message; - TQObject::connect(p, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(slotSendFinished(KProcess*))); - TQObject::connect(p, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)), this, TQT_SLOT(slotReceivedOutput(KProcess*, char*, int))); - TQObject::connect(p, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), this, TQT_SLOT(slotReceivedOutput(KProcess*, char*, int))); + TQObject::connect(p, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotSendFinished(TDEProcess*))); + TQObject::connect(p, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + TQObject::connect(p, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - p->start(KProcess::Block, KProcess::AllOutput); + p->start(TDEProcess::Block, TDEProcess::AllOutput); } TQWidget* SMSClient::configureWidget(TQWidget* parent) @@ -152,14 +152,14 @@ TQStringList SMSClient::providers() return p; } -void SMSClient::slotReceivedOutput(KProcess*, char *buffer, int buflen) +void SMSClient::slotReceivedOutput(TDEProcess*, char *buffer, int buflen) { TQStringList lines = TQStringList::split("\n", TQString::fromLocal8Bit(buffer, buflen)); for (TQStringList::Iterator it = lines.begin(); it != lines.end(); ++it) output.append(*it); } -void SMSClient::slotSendFinished(KProcess* p) +void SMSClient::slotSendFinished(TDEProcess* p) { if (p->exitStatus() == 0) emit messageSent(m_msg); diff --git a/kopete/protocols/sms/services/smsclient.h b/kopete/protocols/sms/services/smsclient.h index 988565b1..ffb146c6 100644 --- a/kopete/protocols/sms/services/smsclient.h +++ b/kopete/protocols/sms/services/smsclient.h @@ -26,7 +26,7 @@ class SMSClientPrefsUI; class SMSContact; class TQListViewItem; -class KProcess; +class TDEProcess; class SMSClient : public SMSService { @@ -46,8 +46,8 @@ public slots: void savePreferences(); private slots: - void slotReceivedOutput(KProcess*, char *buffer, int buflen); - void slotSendFinished(KProcess* p); + void slotReceivedOutput(TDEProcess*, char *buffer, int buflen); + void slotSendFinished(TDEProcess* p); signals: void messageSent(const Kopete::Message &); diff --git a/kopete/protocols/sms/services/smssendprovider.cpp b/kopete/protocols/sms/services/smssendprovider.cpp index 8feb94a9..e2095d25 100644 --- a/kopete/protocols/sms/services/smssendprovider.cpp +++ b/kopete/protocols/sms/services/smssendprovider.cpp @@ -237,21 +237,21 @@ void SMSSendProvider::send(const Kopete::Message& msg) values[messagePos] = message; values[telPos] = nr; - KProcess* p = new KProcess; + TDEProcess* p = new TDEProcess; kdWarning( 14160 ) << "Executing " << TQString("%1/bin/smssend").arg(prefix) << " \"" << provider << "\" " << values.join("\" \"") << "\"" << endl; *p << TQString("%1/bin/smssend").arg(prefix) << provider << values; output = ""; - connect( p, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(slotSendFinished(KProcess *))); - connect( p, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), this, TQT_SLOT(slotReceivedOutput(KProcess *, char *, int))); -// connect( p, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), this, TQT_SLOT(slotReceivedOutput(KProcess *, char *, int))); + connect( p, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotSendFinished(TDEProcess *))); + connect( p, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), this, TQT_SLOT(slotReceivedOutput(TDEProcess *, char *, int))); +// connect( p, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), this, TQT_SLOT(slotReceivedOutput(TDEProcess *, char *, int))); - p->start(KProcess::NotifyOnExit, KProcess::AllOutput); + p->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput); } -void SMSSendProvider::slotSendFinished(KProcess *p) +void SMSSendProvider::slotSendFinished(TDEProcess *p) { kdWarning( 14160 ) << k_funcinfo << "this = " << this << ", es = " << p->exitStatus() << ", p = " << p << " (should be non-zero!!)" << endl; if (p->exitStatus() == 0) @@ -262,7 +262,7 @@ void SMSSendProvider::slotSendFinished(KProcess *p) p->deleteLater(); } -void SMSSendProvider::slotReceivedOutput(KProcess *, char *buffer, int buflen) +void SMSSendProvider::slotReceivedOutput(TDEProcess *, char *buffer, int buflen) { // TQStringList lines = TQStringList::split("\n", TQString::fromLocal8Bit(buffer, buflen)); // for (TQStringList::Iterator it = lines.begin(); it != lines.end(); ++it) diff --git a/kopete/protocols/sms/services/smssendprovider.h b/kopete/protocols/sms/services/smssendprovider.h index 97d60542..fbe238e1 100644 --- a/kopete/protocols/sms/services/smssendprovider.h +++ b/kopete/protocols/sms/services/smssendprovider.h @@ -29,7 +29,7 @@ #include "smsaccount.h" -class KProcess; +class TDEProcess; namespace Kopete { class Account; } class SMSContact; @@ -54,8 +54,8 @@ public: int maxSize(); private slots: - void slotReceivedOutput(KProcess*, char *buffer, int buflen); - void slotSendFinished(KProcess*); + void slotReceivedOutput(TDEProcess*, char *buffer, int buflen); + void slotSendFinished(TDEProcess*); private: TQStringList names; TQStringList descriptions; diff --git a/kopete/protocols/sms/smsaccount.h b/kopete/protocols/sms/smsaccount.h index f127759f..b543d191 100644 --- a/kopete/protocols/sms/smsaccount.h +++ b/kopete/protocols/sms/smsaccount.h @@ -23,7 +23,7 @@ class KActionMenu; class SMSProtocol; class SMSContact; class SMSService; -class KProcess; +class TDEProcess; enum SMSMsgAction { ACT_ASK = 0, ACT_CANCEL, ACT_SPLIT }; diff --git a/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp b/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp index c408d0ad..05eabee7 100644 --- a/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp +++ b/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp @@ -163,9 +163,9 @@ void WinPopupLib::startReadProcess(const TQString &Host) *reader << smbClientBin << "-N" << "-E" << "-g" << "-L" << Host << "-"; connect(reader, TQT_SIGNAL(readReady(KProcIO *)), this, TQT_SLOT(slotReadProcessReady(KProcIO *))); - connect(reader, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(slotReadProcessExited(KProcess *))); + connect(reader, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotReadProcessExited(TDEProcess *))); - if (!reader->start(KProcess::NotifyOnExit, true)) { + if (!reader->start(TDEProcess::NotifyOnExit, true)) { // still to come kdDebug(14170) << "ReadProcess not started!" << endl; } @@ -189,7 +189,7 @@ void WinPopupLib::slotReadProcessReady(KProcIO *r) } } -void WinPopupLib::slotReadProcessExited(KProcess *r) +void WinPopupLib::slotReadProcessExited(TDEProcess *r) { delete r; @@ -327,13 +327,13 @@ void WinPopupLib::readMessages(const KFileItemList &items) */ void WinPopupLib::sendMessage(const TQString &Body, const TQString &Destination) { - KProcess *sender = new KProcess(this); + TDEProcess *sender = new TDEProcess(this); *sender << smbClientBin << "-M" << Destination; *sender << "-N" << "-"; - connect(sender, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(slotSendProcessExited(KProcess *))); + connect(sender, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotSendProcessExited(TDEProcess *))); - if (sender->start(KProcess::NotifyOnExit, KProcess::Stdin)) { + if (sender->start(TDEProcess::NotifyOnExit, TDEProcess::Stdin)) { sender->writeStdin(Body.local8Bit(), Body.local8Bit().length()); if (!sender->closeStdin()) { delete sender; @@ -343,7 +343,7 @@ void WinPopupLib::sendMessage(const TQString &Body, const TQString &Destination) } } -void WinPopupLib::slotSendProcessExited(KProcess *p) +void WinPopupLib::slotSendProcessExited(TDEProcess *p) { // emit sendJobDone(p->pid()); delete p; diff --git a/kopete/protocols/winpopup/libwinpopup/libwinpopup.h b/kopete/protocols/winpopup/libwinpopup/libwinpopup.h index c4789ebc..1213b3cf 100644 --- a/kopete/protocols/winpopup/libwinpopup/libwinpopup.h +++ b/kopete/protocols/winpopup/libwinpopup/libwinpopup.h @@ -77,8 +77,8 @@ private slots: void slotUpdateGroupData(); void startReadProcess(const TQString &Host); void slotReadProcessReady(KProcIO *r); - void slotReadProcessExited(KProcess *r); - void slotSendProcessExited(KProcess *p); + void slotReadProcessExited(TDEProcess *r); + void slotSendProcessExited(TDEProcess *p); void slotStartDirLister(); void slotListCompleted(); void slotNewMessages(const KFileItemList &items); diff --git a/kopete/protocols/winpopup/wpeditaccount.cpp b/kopete/protocols/winpopup/wpeditaccount.cpp index 217ac462..0e0b6f43 100644 --- a/kopete/protocols/winpopup/wpeditaccount.cpp +++ b/kopete/protocols/winpopup/wpeditaccount.cpp @@ -58,9 +58,9 @@ WPEditAccount::WPEditAccount(TQWidget *parent, Kopete::Account *theAccount) mHostName->setText(account()->accountId()); // mAutoConnect->setChecked(account()->excludeConnect()); mHostName->setReadOnly(true); - KGlobal::config()->setGroup("WinPopup"); - mHostCheckFreq->setValue(KGlobal::config()->readNumEntry("HostCheckFreq", 60)); - mSmbcPath->setURL(KGlobal::config()->readEntry("SmbcPath", tmpSmbcPath)); + TDEGlobal::config()->setGroup("WinPopup"); + mHostCheckFreq->setValue(TDEGlobal::config()->readNumEntry("HostCheckFreq", 60)); + mSmbcPath->setURL(TDEGlobal::config()->readEntry("SmbcPath", tmpSmbcPath)); } else { @@ -112,9 +112,9 @@ bool WPEditAccount::validateData() void WPEditAccount::writeConfig() { - KGlobal::config()->setGroup("WinPopup"); - KGlobal::config()->writeEntry("SmbcPath", mSmbcPath->url()); - KGlobal::config()->writeEntry("HostCheckFreq", mHostCheckFreq->text()); + TDEGlobal::config()->setGroup("WinPopup"); + TDEGlobal::config()->writeEntry("SmbcPath", mSmbcPath->url()); + TDEGlobal::config()->writeEntry("HostCheckFreq", mHostCheckFreq->text()); } Kopete::Account *WPEditAccount::apply() diff --git a/kopete/protocols/winpopup/wpprotocol.cpp b/kopete/protocols/winpopup/wpprotocol.cpp index 8e21a16d..5d4f708a 100644 --- a/kopete/protocols/winpopup/wpprotocol.cpp +++ b/kopete/protocols/winpopup/wpprotocol.cpp @@ -128,9 +128,9 @@ void WPProtocol::settingsChanged() void WPProtocol::readConfig() { - KGlobal::config()->setGroup("WinPopup"); - smbClientBin = KGlobal::config()->readEntry("SmbcPath", "/usr/bin/smbclient"); - groupCheckFreq = KGlobal::config()->readNumEntry("HostCheckFreq", 60); + TDEGlobal::config()->setGroup("WinPopup"); + smbClientBin = TDEGlobal::config()->readEntry("SmbcPath", "/usr/bin/smbclient"); + groupCheckFreq = TDEGlobal::config()->readNumEntry("HostCheckFreq", 60); } void WPProtocol::installSamba() diff --git a/kopete/protocols/winpopup/wpuserinfo.cpp b/kopete/protocols/winpopup/wpuserinfo.cpp index 162374b7..39651475 100644 --- a/kopete/protocols/winpopup/wpuserinfo.cpp +++ b/kopete/protocols/winpopup/wpuserinfo.cpp @@ -59,16 +59,16 @@ WPUserInfo::WPUserInfo( WPContact *contact, WPAccount */*account*/, TQWidget *pa // if we would do this in libwinpopup. GF void WPUserInfo::startDetailsProcess(const TQString &host) { - KGlobal::config()->setGroup("WinPopup"); - TQString theSMBClientPath = KGlobal::config()->readEntry("SMBClientPath", "/usr/bin/smbclient"); + TDEGlobal::config()->setGroup("WinPopup"); + TQString theSMBClientPath = TDEGlobal::config()->readEntry("SMBClientPath", "/usr/bin/smbclient"); KProcIO *details = new KProcIO; *details << theSMBClientPath << "-N" << "-E" << "-g" << "-L" << host << "-"; connect(details, TQT_SIGNAL(readReady(KProcIO *)), this, TQT_SLOT(slotDetailsProcessReady(KProcIO *))); - connect(details, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(slotDetailsProcessExited(KProcess *))); + connect(details, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotDetailsProcessExited(TDEProcess *))); - if (!details->start(KProcess::NotifyOnExit, KProcess::Stderr)) { + if (!details->start(TDEProcess::NotifyOnExit, TDEProcess::Stderr)) { slotDetailsProcessExited(details); kdDebug(14170) << "DetailsProcess not started!" << endl; } @@ -91,7 +91,7 @@ void WPUserInfo::slotDetailsProcessReady(KProcIO *d) } } -void WPUserInfo::slotDetailsProcessExited(KProcess *d) +void WPUserInfo::slotDetailsProcessExited(TDEProcess *d) { delete d; diff --git a/kopete/protocols/winpopup/wpuserinfo.h b/kopete/protocols/winpopup/wpuserinfo.h index 09d2f332..f70f9c8d 100644 --- a/kopete/protocols/winpopup/wpuserinfo.h +++ b/kopete/protocols/winpopup/wpuserinfo.h @@ -43,7 +43,7 @@ class WPUserInfo : public KDialogBase private slots: void slotDetailsProcessReady(KProcIO *d); - void slotDetailsProcessExited(KProcess *d); + void slotDetailsProcessExited(TDEProcess *d); void slotCloseClicked(); signals: diff --git a/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp b/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp index 90245b29..e90b45f2 100644 --- a/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp @@ -470,11 +470,11 @@ void WebcamTask::parseData( TQByteArray &data, KStreamSocket *socket ) file->writeBlock((info->buffer->buffer()).data(), info->buffer->size()); file->close(); - KProcess p; + TDEProcess p; p << "jasper"; p << "--input" << jpcTmpImageFile.name() << "--output" << bmpTmpImageFile.name() << "--output-format" << "bmp"; - p.start( KProcess::Block ); + p.start( TDEProcess::Block ); if( p.exitStatus() != 0 ) { kdDebug(YAHOO_RAW_DEBUG) << " jasper exited with status " << p.exitStatus() << " " << info->sender << endl; diff --git a/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp b/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp index 700c91e5..7b1839d4 100644 --- a/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp +++ b/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp @@ -47,21 +47,21 @@ YahooUserInfoDialog::YahooUserInfoDialog( YahooContact *c, TQWidget * parent, co showButton( User2, false ); TQFrame* genInfo = addPage( i18n( "General Info" ), i18n( "General Yahoo Information" ), - KGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "identity" ), KIcon::Desktop ) ); + TDEGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "identity" ), KIcon::Desktop ) ); TQVBoxLayout* genLayout = new TQVBoxLayout( genInfo ); m_genInfoWidget = new YahooGeneralInfoWidget( genInfo, "Basic Information" ); genLayout->addWidget( m_genInfoWidget ); TQFrame* workInfo = addPage( i18n( "Work Info" ), i18n( "Work Information" ), - KGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "attach" ), KIcon::Desktop ) ); + TDEGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "attach" ), KIcon::Desktop ) ); TQVBoxLayout* workLayout = new TQVBoxLayout( workInfo ); m_workInfoWidget = new YahooWorkInfoWidget( workInfo, "Work Information" ); workLayout->addWidget( m_workInfoWidget ); TQFrame* otherInfo = addPage( i18n( "Other Info" ), i18n( "Other Yahoo Information" ), - KGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "email" ), KIcon::Desktop ) ); + TDEGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "email" ), KIcon::Desktop ) ); TQVBoxLayout* otherLayout = new TQVBoxLayout( otherInfo ); m_otherInfoWidget = new YahooOtherInfoWidget( otherInfo, "Other Information" ); otherLayout->addWidget( m_otherInfoWidget ); diff --git a/kopete/protocols/yahoo/yahoowebcam.cpp b/kopete/protocols/yahoo/yahoowebcam.cpp index 1e22b89c..0ddf8a45 100644 --- a/kopete/protocols/yahoo/yahoowebcam.cpp +++ b/kopete/protocols/yahoo/yahoowebcam.cpp @@ -97,12 +97,12 @@ void YahooWebcam::sendImage() m_img->save( origImg->name(), "JPEG"); - KProcess p; + TDEProcess p; p << "jasper"; p << "--input" << origImg->name() << "--output" << convertedImg->name() << "--output-format" << "jpc" << "-O" <<"cblkwidth=64\ncblkheight=64\nnumrlvls=4\nrate=0.0165\nprcheight=128\nprcwidth=2048\nmode=real"; - p.start( KProcess::Block ); + p.start( TDEProcess::Block ); if( p.exitStatus() != 0 ) { kdDebug(YAHOO_GEN_DEBUG) << " jasper exited with status " << p.exitStatus() << endl; diff --git a/kpf/src/Applet.cpp b/kpf/src/Applet.cpp index 04a355c6..217128a5 100644 --- a/kpf/src/Applet.cpp +++ b/kpf/src/Applet.cpp @@ -72,7 +72,7 @@ extern "C" { kpf::blockSigPipe(); - KGlobal::locale()->insertCatalogue("kpf"); + TDEGlobal::locale()->insertCatalogue("kpf"); return new KPF::Applet ( @@ -372,11 +372,11 @@ namespace KPF TQPixmap px; if (width() > 48) - px = KGlobal::iconLoader()->loadIcon("kpf", KIcon::Panel, 48); + px = TDEGlobal::iconLoader()->loadIcon("kpf", KIcon::Panel, 48); else if (width() > 32) - px = KGlobal::iconLoader()->loadIcon("kpf", KIcon::Panel, 32); + px = TDEGlobal::iconLoader()->loadIcon("kpf", KIcon::Panel, 32); else if (width() > 16) - px = KGlobal::iconLoader()->loadIcon("kpf", KIcon::Panel, 16); + px = TDEGlobal::iconLoader()->loadIcon("kpf", KIcon::Panel, 16); else return; diff --git a/kpf/src/BandwidthGraph.cpp b/kpf/src/BandwidthGraph.cpp index d5a26233..ba02e69d 100644 --- a/kpf/src/BandwidthGraph.cpp +++ b/kpf/src/BandwidthGraph.cpp @@ -144,11 +144,11 @@ namespace KPF buffer_.resize(size()); if ( width() > 48 ) - bgPix_ = KGlobal::iconLoader()->loadIcon( "kpf", KIcon::Panel, 48 ); + bgPix_ = TDEGlobal::iconLoader()->loadIcon( "kpf", KIcon::Panel, 48 ); else if ( width() > 32 ) - bgPix_ = KGlobal::iconLoader()->loadIcon( "kpf", KIcon::Panel, 32 ); + bgPix_ = TDEGlobal::iconLoader()->loadIcon( "kpf", KIcon::Panel, 32 ); else if ( width() > 16 ) - bgPix_ = KGlobal::iconLoader()->loadIcon( "kpf", KIcon::Panel, 16 ); + bgPix_ = TDEGlobal::iconLoader()->loadIcon( "kpf", KIcon::Panel, 16 ); else bgPix_.fill( this, TQPoint( 0, 0 ) ); diff --git a/kpf/src/DirectoryLister.cpp b/kpf/src/DirectoryLister.cpp index 6aec78d7..c0b0a503 100644 --- a/kpf/src/DirectoryLister.cpp +++ b/kpf/src/DirectoryLister.cpp @@ -117,7 +117,7 @@ namespace KPF << "background-color: " << colorToCSS ( - KGlobalSettings::calculateAlternateBackgroundColor + TDEGlobalSettings::calculateAlternateBackgroundColor (pal.color(TQPalette::Normal, TQColorGroup::Base)) ) << "; " diff --git a/kpf/src/PropertiesDialogPlugin.cpp b/kpf/src/PropertiesDialogPlugin.cpp index 8cf14a7c..d3a0a7c9 100644 --- a/kpf/src/PropertiesDialogPlugin.cpp +++ b/kpf/src/PropertiesDialogPlugin.cpp @@ -661,7 +661,7 @@ namespace KPF { TQString noWarningKey("DoNotWarnAboutSharingDirectoriesViaHTTP"); - KConfig * config(KGlobal::config()); + KConfig * config(TDEGlobal::config()); if (config->readBoolEntry(noWarningKey, false)) return true; diff --git a/kppp/accounting.cpp b/kppp/accounting.cpp index 76c5f02e..7f346eef 100644 --- a/kppp/accounting.cpp +++ b/kppp/accounting.cpp @@ -77,7 +77,7 @@ AccountingBase::AccountingBase(TQObject *parent) : .arg(TQDate::shortMonthName(dt.month())) .arg(dt.year(), 4); - LogFileName = KGlobal::dirs()->saveLocation("appdata", "Log") + LogFileName = TDEGlobal::dirs()->saveLocation("appdata", "Log") + "/" + LogFileName; kdDebug(5002) << "LogFileName: " << LogFileName << endl; @@ -156,7 +156,7 @@ TQString AccountingBase::getCosts(const TQString & accountname) { gpppdata.setAccount(accountname); TQString val = gpppdata.totalCosts(); // ### currency from rule file - // TQString val = KGlobal::locale()->formatMoney(gpppdata.totalCosts().toDouble(), currency); + // TQString val = TDEGlobal::locale()->formatMoney(gpppdata.totalCosts().toDouble(), currency); gpppdata.setAccount(prev_account); @@ -377,7 +377,7 @@ bool ExecutableAccounting::loadRuleSet(const TQString &) { } -void ExecutableAccounting::gotData(KProcess */*proc*/, char *buffer, int /*buflen*/) { +void ExecutableAccounting::gotData(TDEProcess */*proc*/, char *buffer, int /*buflen*/) { TQString field[8]; int nFields = 0; int pos, last_pos = 0; @@ -434,13 +434,13 @@ void ExecutableAccounting::slotStart() { loadCosts(); TQString s = AccountingBase::getAccountingFile(gpppdata.accountingFile()); - proc = new KProcess; + proc = new TDEProcess; TQString s_total; s_total.sprintf("%0.8f", total()); *proc << s << s_total; - connect(proc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), - this, TQT_SLOT(gotData(KProcess *, char *, int))); + connect(proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + this, TQT_SLOT(gotData(TDEProcess *, char *, int))); proc->start(); time_t start_time = time(0); diff --git a/kppp/accounting.h b/kppp/accounting.h index 614b3560..c1ef870b 100644 --- a/kppp/accounting.h +++ b/kppp/accounting.h @@ -132,13 +132,13 @@ public slots: virtual void slotStop(); private slots: - void gotData(KProcess *proc, char *buffer, int buflen); + void gotData(TDEProcess *proc, char *buffer, int buflen); signals: void changed(TQString total, TQString session); private: - KProcess *proc; + TDEProcess *proc; TQString currency; TQString provider; PPPStats *stats; diff --git a/kppp/accounts.cpp b/kppp/accounts.cpp index 740755e6..2605ad86 100644 --- a/kppp/accounts.cpp +++ b/kppp/accounts.cpp @@ -415,7 +415,7 @@ TQString AccountWidget::prettyPrintVolume(unsigned int n) { while(i--) n1 = n1 / 1024.0; - TQString s = KGlobal::locale()->formatNumber( n1, idx==0 ? 0 : 1 ); + TQString s = TDEGlobal::locale()->formatNumber( n1, idx==0 ? 0 : 1 ); s += " " + quant[idx]; return s; } diff --git a/kppp/acctselect.cpp b/kppp/acctselect.cpp index 1782d27f..55c30e9c 100644 --- a/kppp/acctselect.cpp +++ b/kppp/acctselect.cpp @@ -256,7 +256,7 @@ void AccountingSelector::setupTreeWidget() { tl->setRootIsDecorated(true); // look in ~/.trinity/share/apps/kppp/Rules and $TDEDIR/share/apps/kppp/Rules - TQStringList dirs = KGlobal::dirs()->resourceDirs("appdata"); + TQStringList dirs = TDEGlobal::dirs()->resourceDirs("appdata"); for (TQStringList::ConstIterator it = dirs.begin(); it != dirs.end(); it++) { insertDir(TQDir((*it) + "Rules"), 0); diff --git a/kppp/conwindow.cpp b/kppp/conwindow.cpp index 2e6f2281..fb0aa27b 100644 --- a/kppp/conwindow.cpp +++ b/kppp/conwindow.cpp @@ -108,7 +108,7 @@ TQString ConWindow::prettyPrintVolume(unsigned int n) { while(i--) n1 = n1 / 1024.0; - TQString s = KGlobal::locale()->formatNumber( n1, idx==0 ? 0 : 1 ); + TQString s = TDEGlobal::locale()->formatNumber( n1, idx==0 ? 0 : 1 ); s += " " + quant[idx]; return s; } diff --git a/kppp/debug.cpp b/kppp/debug.cpp index 3dee5797..8ad64d41 100644 --- a/kppp/debug.cpp +++ b/kppp/debug.cpp @@ -59,7 +59,7 @@ DebugWidget::DebugWidget(TQWidget *parent, const char *name) statuslabel->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); statuslabel->setAlignment( AlignLeft|AlignVCenter ); statuslabel->setGeometry(2, 307, 400, 20); - //statusPageLabel->setFont( KGlobalSettings::generalFont() ); + //statusPageLabel->setFont( TDEGlobalSettings::generalFont() ); dismiss = new TQPushButton(this); dismiss->setGeometry(330,340,70,30); diff --git a/kppp/kpppwidget.cpp b/kppp/kpppwidget.cpp index 89058d94..6380ba8f 100644 --- a/kppp/kpppwidget.cpp +++ b/kppp/kpppwidget.cpp @@ -203,7 +203,7 @@ KPPPWidget::KPPPWidget( TQWidget *parent, const char *name ) help_b = new KPushButton(KStdGuiItem::help(), this); connect( help_b, TQT_SIGNAL(clicked()), TQT_SLOT(helpbutton())); - KHelpMenu *helpMenu = new KHelpMenu(this, KGlobal::instance()->aboutData(), true); + KHelpMenu *helpMenu = new KHelpMenu(this, TDEGlobal::instance()->aboutData(), true); help_b->setPopup((TQPopupMenu*)helpMenu->menu()); if(help_b->sizeHint().width() > minw) @@ -258,7 +258,7 @@ KPPPWidget::KPPPWidget( TQWidget *parent, const char *name ) KWin::setIcons(con->winId(), kapp->icon(), kapp->miniIcon() ); connect(this, TQT_SIGNAL(begin_connect()),con, TQT_SLOT(preinit())); - TQRect desk = KGlobalSettings::desktopGeometry(topLevelWidget()); + TQRect desk = TDEGlobalSettings::desktopGeometry(topLevelWidget()); con->setGeometry(desk.center().x()-175, desk.center().y()-55, 350,110); // connect the ConnectWidgets various signals diff --git a/kppp/logview/monthly.cpp b/kppp/logview/monthly.cpp index 0844f85a..0838417d 100644 --- a/kppp/logview/monthly.cpp +++ b/kppp/logview/monthly.cpp @@ -38,9 +38,9 @@ static void formatBytes(double bytes, TQString &result) { if(bytes < 1024) result.setNum(bytes); else if(bytes < 1024*1024) - result = i18n("%1 KB").arg(KGlobal::locale()->formatNumber((float)bytes / 1024.0, 1)); + result = i18n("%1 KB").arg(TDEGlobal::locale()->formatNumber((float)bytes / 1024.0, 1)); else - result = i18n("%1 MB").arg(KGlobal::locale()->formatNumber((float)bytes / 1024.0 / 1024.0, 1)); + result = i18n("%1 MB").arg(TDEGlobal::locale()->formatNumber((float)bytes / 1024.0 / 1024.0, 1)); } static void formatBytesMonth(double bytes, TQString &result) { @@ -54,9 +54,9 @@ static void formatBytesMonth(double bytes, TQString &result) { if(bytes < 1024) result.setNum(bytes); else if(bytes < 1024*1024) - result = i18n("%1 KB").arg(KGlobal::locale()->formatNumber((float)bytes / 1024.0, 1)); + result = i18n("%1 KB").arg(TDEGlobal::locale()->formatNumber((float)bytes / 1024.0, 1)); else - result = i18n("%1 MB").arg(KGlobal::locale()->formatNumber((float)bytes / 1024.0 / 1024.0, 1)); + result = i18n("%1 MB").arg(TDEGlobal::locale()->formatNumber((float)bytes / 1024.0 / 1024.0, 1)); } static void formatDuration(int seconds, TQString &result) { @@ -292,7 +292,7 @@ void MonthlyWidget::plotMonth() { selectionItem = 0L; lv2->clear(); - const KCalendarSystem * calendar = KGlobal::locale()->calendar(); + const KCalendarSystem * calendar = TDEGlobal::locale()->calendar(); TQDate startDate = periodeFirst(); for(int i = 0; i < (int)logList.count(); i++) { @@ -354,9 +354,9 @@ void MonthlyWidget::plotMonth() { s_duration); TQString s_lifrom, s_liuntil, s_costs; - s_lifrom = KGlobal::locale()->formatTime(li->from().time(), false); - s_liuntil = KGlobal::locale()->formatTime(li->until().time(), false); - s_costs = KGlobal::locale()->formatMoney(li->sessionCosts()); + s_lifrom = TDEGlobal::locale()->formatTime(li->from().time(), false); + s_liuntil = TDEGlobal::locale()->formatTime(li->until().time(), false); + s_costs = TDEGlobal::locale()->formatMoney(li->sessionCosts()); (void) new LogListItem(li, lv, con, day, s_lifrom, s_liuntil, s_duration, s_costs, _bin, _bout); } @@ -384,7 +384,7 @@ void MonthlyWidget::plotMonth() { formatDuration(duration, s_duration); - TQString s_costs(KGlobal::locale()->formatMoney(costs, TQString(), 2)); + TQString s_costs(TDEGlobal::locale()->formatMoney(costs, TQString(), 2)); selectionItem = new LogListItem(0, lv2, i18n("Selection (%n connection)", "Selection (%n connections)", 0), @@ -394,7 +394,7 @@ void MonthlyWidget::plotMonth() { i18n("%n connection", "%n connections", count), s_duration, s_costs, _bin, _bout, TQString(), TQString(), TQString()); - const KCalendarSystem * calendar = KGlobal::locale()->calendar(); + const KCalendarSystem * calendar = TDEGlobal::locale()->calendar(); if(calendar->month(periodeFirst()) == calendar->month(TQDate::currentDate())) { @@ -414,7 +414,7 @@ void MonthlyWidget::plotMonth() { formatDurationMonth(duration, m_duration); costsMonth(costs, costs); - TQString m_costs(KGlobal::locale()->formatMoney(costs, TQString(), 2)); + TQString m_costs(TDEGlobal::locale()->formatMoney(costs, TQString(), 2)); (void) new TQListViewItem(lv2, selectionItem, i18n("Monthly estimates"), m_duration, m_costs, m_bin, m_bout, @@ -443,19 +443,19 @@ void MonthlyWidget::slotConnections(int) { } void MonthlyWidget::nextMonth() { - m_periodeFirst = KGlobal::locale()->calendar()->addMonths(m_periodeFirst, 1); + m_periodeFirst = TDEGlobal::locale()->calendar()->addMonths(m_periodeFirst, 1); plotMonth(); } void MonthlyWidget::prevMonth() { - m_periodeFirst = KGlobal::locale()->calendar()->addMonths(m_periodeFirst, -1); + m_periodeFirst = TDEGlobal::locale()->calendar()->addMonths(m_periodeFirst, -1); plotMonth(); } void MonthlyWidget::currentMonth() { - const KCalendarSystem * calendar = KGlobal::locale()->calendar(); + const KCalendarSystem * calendar = TDEGlobal::locale()->calendar(); TQDate dt = TQDate::currentDate(); calendar->setYMD(m_periodeFirst, calendar->year(dt), calendar->month(dt), 1); @@ -463,7 +463,7 @@ void MonthlyWidget::currentMonth() { } void MonthlyWidget::exportWizard() { - const KCalendarSystem * calendar = KGlobal::locale()->calendar(); + const KCalendarSystem * calendar = TDEGlobal::locale()->calendar(); TQString date = TQString::fromLatin1("%1-%2") // e.g.: June-2001 .arg(calendar->monthName(periodeFirst())) .arg(calendar->year(periodeFirst())); @@ -565,9 +565,9 @@ void MonthlyWidget::exportWizard() { s_duration); TQString s_lifrom, s_liuntil, s_costs; - s_lifrom = KGlobal::locale()->formatTime(li->from().time(), false); - s_liuntil = KGlobal::locale()->formatTime(li->until().time(), false); - s_costs = KGlobal::locale()->formatMoney(li->sessionCosts()); + s_lifrom = TDEGlobal::locale()->formatTime(li->from().time(), false); + s_liuntil = TDEGlobal::locale()->formatTime(li->until().time(), false); + s_costs = TDEGlobal::locale()->formatMoney(li->sessionCosts()); // call export method exportIFace->addDataline(con, day, s_lifrom, s_liuntil, s_duration, @@ -593,9 +593,9 @@ void MonthlyWidget::exportWizard() { formatDurationMonth(duration, m_duration); costsMonth(costs, costs); - TQString m_costs(KGlobal::locale()->formatMoney(costs, TQString(), 2)); + TQString m_costs(TDEGlobal::locale()->formatMoney(costs, TQString(), 2)); - TQString datetime = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), true); + TQString datetime = TDEGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), true); exportIFace->addEmptyLine(); exportIFace->addDataline(i18n("Monthly estimates (%1)").arg(datetime), @@ -624,7 +624,7 @@ void MonthlyWidget::exportWizard() { formatDuration(duration, s_duration); - TQString s_costs(KGlobal::locale()->formatMoney(costs, TQString(), 2)); + TQString s_costs(TDEGlobal::locale()->formatMoney(costs, TQString(), 2)); // call export methods exportIFace->addEmptyLine(); @@ -650,7 +650,7 @@ TQDate MonthlyWidget::periodeFirst() const TQDate MonthlyWidget::periodeLast() const { - const KCalendarSystem * calendar = KGlobal::locale()->calendar(); + const KCalendarSystem * calendar = TDEGlobal::locale()->calendar(); // One month minus one day return calendar->addDays(calendar->addMonths(m_periodeFirst, 1), -1); @@ -716,7 +716,7 @@ void MonthlyWidget::slotSelectionChanged() formatDuration(duration, s_duration); - TQString s_costs(KGlobal::locale()->formatMoney(costs, TQString(), 2)); + TQString s_costs(TDEGlobal::locale()->formatMoney(costs, TQString(), 2)); selectionItem->setText(0, i18n("Selection (%n connection)", "Selection (%n connections)", count)); selectionItem->setText(1, s_duration); selectionItem->setText(2, s_costs); diff --git a/kppp/main.cpp b/kppp/main.cpp index 379529ee..f61b21ae 100644 --- a/kppp/main.cpp +++ b/kppp/main.cpp @@ -232,13 +232,13 @@ int main( int argc, char **argv ) { // make sure that nobody can read the password from the // config file - TQString configFile = KGlobal::dirs()->saveLocation("config") + TQString configFile = TDEGlobal::dirs()->saveLocation("config") + TQString(kapp->name()) + "rc"; if(access(TQFile::encodeName(configFile), F_OK) == 0) chmod(TQFile::encodeName(configFile), S_IRUSR | S_IWUSR); // do we really need to generate an empty directory structure here ? - KGlobal::dirs()->saveLocation("appdata", "Rules"); + TDEGlobal::dirs()->saveLocation("appdata", "Rules"); int pid = create_pidfile(); TQString err_msg = i18n("kppp can't create or read from\n%1.").arg(pidfile); @@ -359,7 +359,7 @@ pid_t create_pidfile() { int fd = -1; char pidstr[40]; // safe - pidfile = KGlobal::dirs()->saveLocation("appdata") + "kppp.pid"; + pidfile = TDEGlobal::dirs()->saveLocation("appdata") + "kppp.pid"; if(access(TQFile::encodeName(pidfile), F_OK) == 0) { diff --git a/kppp/miniterm.cpp b/kppp/miniterm.cpp index 990a1088..25d0d94a 100644 --- a/kppp/miniterm.cpp +++ b/kppp/miniterm.cpp @@ -228,7 +228,7 @@ void MiniTerm::help() { MyTerm::MyTerm(TQWidget *parent, const char* name) : TQMultiLineEdit(parent, name) { - setFont(KGlobalSettings::fixedFont()); + setFont(TDEGlobalSettings::fixedFont()); } void MyTerm::keyPressEvent(TQKeyEvent *k) { diff --git a/kppp/modems.cpp b/kppp/modems.cpp index 42e82049..491c5b1b 100644 --- a/kppp/modems.cpp +++ b/kppp/modems.cpp @@ -269,7 +269,7 @@ TQString ModemsWidget::prettyPrintVolume(unsigned int n) { while(i--) n1 = n1 / 1024.0; - TQString s = KGlobal::locale()->formatNumber( n1, idx==0 ? 0 : 1 ); + TQString s = TDEGlobal::locale()->formatNumber( n1, idx==0 ? 0 : 1 ); s += " " + quant[idx]; return s; } diff --git a/kppp/pppdata.cpp b/kppp/pppdata.cpp index c258eda6..c7b2f044 100644 --- a/kppp/pppdata.cpp +++ b/kppp/pppdata.cpp @@ -1464,7 +1464,7 @@ void PPPData::setpppdError(int err) { // window position // void PPPData::winPosConWin(int& p_x, int& p_y) { - TQRect desk = KGlobalSettings::splashScreenDesktopGeometry(); + TQRect desk = TDEGlobalSettings::splashScreenDesktopGeometry(); p_x = readNumConfig(WINPOS_GRP, WINPOS_CONWIN_X, desk.center().x()-160); p_y = readNumConfig(WINPOS_GRP, WINPOS_CONWIN_Y, desk.center().y()-55); } @@ -1475,7 +1475,7 @@ void PPPData::setWinPosConWin(int p_x, int p_y) { } void PPPData::winPosStatWin(int& p_x, int& p_y) { - TQRect desk = KGlobalSettings::splashScreenDesktopGeometry(); + TQRect desk = TDEGlobalSettings::splashScreenDesktopGeometry(); p_x = readNumConfig(WINPOS_GRP, WINPOS_STATWIN_X, desk.center().x()-160); p_y = readNumConfig(WINPOS_GRP, WINPOS_STATWIN_Y, desk.center().y()-55); } diff --git a/kppp/pppstatdlg.cpp b/kppp/pppstatdlg.cpp index 4a816121..073d3f55 100644 --- a/kppp/pppstatdlg.cpp +++ b/kppp/pppstatdlg.cpp @@ -286,12 +286,12 @@ void PPPStatsDlg::paintGraph() { // plot scale line p.setPen(text); - p.setFont(TQFont(KGlobalSettings::fixedFont().family(), 8)); + p.setFont(TQFont(TDEGlobalSettings::fixedFont().family(), 8)); TQRect r; TQString s = i18n("%1 (max. %2) kb/sec") - .arg(KGlobal::locale()->formatNumber((float)last_max / 1024.0, 1)) - .arg(KGlobal::locale()->formatNumber((float)max / 1024.0, 1)); + .arg(TDEGlobal::locale()->formatNumber((float)last_max / 1024.0, 1)) + .arg(TDEGlobal::locale()->formatNumber((float)max / 1024.0, 1)); p.drawText(0, 0, pm.width(), 2*8, AlignRight|AlignVCenter, s, -1, &r); p.drawLine(0, 8, r.left() - 8, 8); @@ -378,12 +378,12 @@ void PPPStatsDlg::closeEvent(TQCloseEvent *) { void PPPStatsDlg::update_data() { timeclick(); - ibytes_string = KGlobal::locale()->formatNumber(stats->ibytes, 0); + ibytes_string = TDEGlobal::locale()->formatNumber(stats->ibytes, 0); ipackets_string.setNum(stats->ipackets); compressedin_string.setNum(stats->compressedin); uncompressedin_string.setNum(stats->uncompressedin); errorin_string.setNum(stats->errorin); - obytes_string = KGlobal::locale()->formatNumber(stats->obytes, 0); + obytes_string = TDEGlobal::locale()->formatNumber(stats->obytes, 0); opackets_string.setNum(stats->opackets); compressed_string.setNum(stats->compressed); packetsunc_string.setNum(stats->packetsunc); diff --git a/kppp/providerdb.cpp b/kppp/providerdb.cpp index 41297545..703d9375 100644 --- a/kppp/providerdb.cpp +++ b/kppp/providerdb.cpp @@ -208,7 +208,7 @@ PDB_Country::PDB_Country(TQWidget *parent) : TQWidget(parent) { // fill the listbox // set up filter - TQDir d(KGlobal::dirs()->findDirs("appdata", "Provider").first()); + TQDir d(TDEGlobal::dirs()->findDirs("appdata", "Provider").first()); d.setFilter(TQDir::Dirs); d.setSorting(TQDir::Name); @@ -294,7 +294,7 @@ void PDB_Provider::setDir(const TQString &_dir) { // set up filter dir = _dir; - TQString dir1 = KGlobal::dirs()->findDirs("appdata", "Provider").first(); + TQString dir1 = TDEGlobal::dirs()->findDirs("appdata", "Provider").first(); TQRegExp re1(" "); dir = dir.replace(re1, "_"); dir1 += dir; diff --git a/kppp/pwentry.cpp b/kppp/pwentry.cpp index 270b4b72..7584c3c6 100644 --- a/kppp/pwentry.cpp +++ b/kppp/pwentry.cpp @@ -43,7 +43,7 @@ PWEntry::PWEntry( TQWidget *parent, const char *name ) 300, 90); } else { - TQRect desk = KGlobalSettings::desktopGeometry(parent); + TQRect desk = TDEGlobalSettings::desktopGeometry(parent); setGeometry( desk.center().x() - 150, desk.center().y() - 50, 300, 90 ); } diff --git a/kppp/ruleset.cpp b/kppp/ruleset.cpp index e60e4be1..41fc12c5 100644 --- a/kppp/ruleset.cpp +++ b/kppp/ruleset.cpp @@ -507,7 +507,7 @@ TQString RuleSet::currencySymbol() const { } TQString RuleSet::currencyString(double f) const { - return KGlobal::locale()->formatMoney(f, _currency_symbol, _currency_digits); + return TDEGlobal::locale()->formatMoney(f, _currency_symbol, _currency_digits); } diff --git a/krdc/rdp/krdpview.cpp b/krdc/rdp/krdpview.cpp index 73ea3753..00ebf1a6 100644 --- a/krdc/rdp/krdpview.cpp +++ b/krdc/rdp/krdpview.cpp @@ -228,7 +228,7 @@ bool KRdpView::start() m_container->show(); - m_process = new KProcess(TQT_TQOBJECT(m_container)); + m_process = new TDEProcess(TQT_TQOBJECT(m_container)); *m_process << "rdesktop"; // Check for fullscreen mode if ((hp->width() == 0) && (hp->height() == 0)) { @@ -291,12 +291,12 @@ bool KRdpView::start() *m_process << "-X" << ("0x" + TQString::number(m_container->winId(), 16)); *m_process << "-a" << TQString::number(hp->colorDepth()); *m_process << (m_host + ":" + TQString::number(m_port)); - connect(m_process, TQT_SIGNAL(processExited(KProcess *)), TQT_SLOT(processDied(KProcess *))); - connect(m_process, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), TQT_SLOT(receivedStderr(KProcess *, char *, int))); + connect(m_process, TQT_SIGNAL(processExited(TDEProcess *)), TQT_SLOT(processDied(TDEProcess *))); + connect(m_process, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), TQT_SLOT(receivedStderr(TDEProcess *, char *, int))); connect(m_container, TQT_SIGNAL(embeddedWindowDestroyed()), TQT_SLOT(connectionClosed())); connect(m_container, TQT_SIGNAL(newEmbeddedWindow(WId)), TQT_SLOT(connectionOpened(WId))); tqDebug("Color depth: %d", hp->colorDepth()); - if(!m_process->start(KProcess::NotifyOnExit, KProcess::Stderr)) + if(!m_process->start(TDEProcess::NotifyOnExit, TDEProcess::Stderr)) { KMessageBox::error(0, i18n("Could not start rdesktop; make sure rdesktop is properly installed."), i18n("rdesktop Failure")); @@ -357,7 +357,7 @@ void KRdpView::connectionClosed() m_quitFlag = true; } -void KRdpView::processDied(KProcess */*proc*/) +void KRdpView::processDied(TDEProcess */*proc*/) { if(m_status == REMOTE_VIEW_CONNECTING) { @@ -371,7 +371,7 @@ void KRdpView::processDied(KProcess */*proc*/) } } -void KRdpView::receivedStderr(KProcess */*proc*/, char *buffer, int /*buflen*/) +void KRdpView::receivedStderr(TDEProcess */*proc*/, char *buffer, int /*buflen*/) { TQString output(buffer); TQString line; diff --git a/krdc/rdp/krdpview.h b/krdc/rdp/krdpview.h index edab5870..46a2cbf9 100644 --- a/krdc/rdp/krdpview.h +++ b/krdc/rdp/krdpview.h @@ -28,7 +28,7 @@ #define TCP_PORT_RDP 3389 #define RDP_LOGON_NORMAL 0x33 -class KProcess; +class TDEProcess; class KRdpView; class RdpContainer : public QXEmbed @@ -103,13 +103,13 @@ class KRdpView : public KRemoteView bool m_quitFlag; // if set: die TQString m_clientVersion; // version number returned by rdesktop RdpContainer *m_container; // container for the rdesktop window - KProcess *m_process; // rdesktop process + TDEProcess *m_process; // rdesktop process private slots: void connectionOpened(WId window); // called if rdesktop started void connectionClosed(); // called if rdesktop quits - void processDied(KProcess *); // called if rdesktop dies - void receivedStderr(KProcess *proc, char *buffer, int buflen); + void processDied(TDEProcess *); // called if rdesktop dies + void receivedStderr(TDEProcess *proc, char *buffer, int buflen); // catches rdesktop debug output }; diff --git a/krdc/vnc/kvncview.cpp b/krdc/vnc/kvncview.cpp index 9763b351..6ad50e93 100644 --- a/krdc/vnc/kvncview.cpp +++ b/krdc/vnc/kvncview.cpp @@ -96,7 +96,7 @@ KVncView::KVncView(TQWidget *parent, connect(m_cb, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(selectionChanged())); connect(m_cb, TQT_SIGNAL(dataChanged()), this, TQT_SLOT(clipboardChanged())); - KStandardDirs *dirs = KGlobal::dirs(); + KStandardDirs *dirs = TDEGlobal::dirs(); TQBitmap cursorBitmap(dirs->findResource("appdata", "pics/pointcursor.png")); TQBitmap cursorMask(dirs->findResource("appdata", diff --git a/krfb/kcm_krfb/kcm_krfb.cpp b/krfb/kcm_krfb/kcm_krfb.cpp index 38fb5ad3..ade2fe95 100644 --- a/krfb/kcm_krfb/kcm_krfb.cpp +++ b/krfb/kcm_krfb/kcm_krfb.cpp @@ -47,7 +47,7 @@ typedef KGenericFactory<KcmKRfb, TQWidget> KcmKRfbFactory; // Can't use K_EXPORT_COMPONENT_FACTORY, since insertCatalogue necessary extern "C" { KDE_EXPORT void *init_kcm_krfb() { - KGlobal::locale()->insertCatalogue("krfb"); // For invitation translations + TDEGlobal::locale()->insertCatalogue("krfb"); // For invitation translations return new KcmKRfbFactory("kcm_krfb"); } } diff --git a/krfb/kinetd/kinetd.cpp b/krfb/kinetd/kinetd.cpp index c05f1830..42a7f053 100644 --- a/krfb/kinetd/kinetd.cpp +++ b/krfb/kinetd/kinetd.cpp @@ -224,7 +224,7 @@ void PortListener::accepted(KSocket *sock) { m_process.clearArguments(); m_process << m_execPath << m_argument << TQString::number(sock->socket()); - if (!m_process.start(KProcess::DontCare)) { + if (!m_process.start(TDEProcess::DontCare)) { KNotifyClient::event("ProcessFailed", i18n("Call \"%1 %2 %3\" failed").arg(m_execPath) .arg(m_argument) @@ -652,7 +652,7 @@ KInetD::~KInetD() { extern "C" { KDE_EXPORT KDEDModule *create_kinetd(TQCString &name) { - KGlobal::locale()->insertCatalogue("kinetd"); + TDEGlobal::locale()->insertCatalogue("kinetd"); return new KInetD(name); } } diff --git a/krfb/kinetd/kinetd.h b/krfb/kinetd/kinetd.h index eee64e59..cb29889d 100644 --- a/krfb/kinetd/kinetd.h +++ b/krfb/kinetd/kinetd.h @@ -57,7 +57,7 @@ private: TQString m_uuid; KServerSocket *m_socket; - KProcess m_process; + TDEProcess m_process; KConfig *m_config; KServiceRegistry *m_srvreg; diff --git a/krfb/krfb/configuration.cc b/krfb/krfb/configuration.cc index d78f7f92..a5c78c42 100644 --- a/krfb/krfb/configuration.cc +++ b/krfb/krfb/configuration.cc @@ -461,7 +461,7 @@ void Configuration::inviteEmail() { .arg(inv.password()) .arg(hostname()) .arg(5800) // determine with dcop ... later ... - .arg(KGlobal::locale()->formatDateTime(inv.expirationTime()))); + .arg(TDEGlobal::locale()->formatDateTime(inv.expirationTime()))); } ////////////// invoke kcontrol module ////////////////////////// diff --git a/krfb/krfb/trayicon.cpp b/krfb/krfb/trayicon.cpp index 14c94bc2..c0cc9aa3 100644 --- a/krfb/krfb/trayicon.cpp +++ b/krfb/krfb/trayicon.cpp @@ -54,7 +54,7 @@ TrayIcon::TrayIcon(KDialog *d, Configuration *c) : actionCollection(this), quitting(false) { - KIconLoader *loader = KGlobal::iconLoader(); + KIconLoader *loader = TDEGlobal::iconLoader(); trayIconOpen = loader->loadIcon("eyes-open24", KIcon::User); trayIconClosed = loader->loadIcon("eyes-closed24", KIcon::User); setPixmap(trayIconClosed); diff --git a/ksirc/KSOpenkSirc/serverFileParser.cpp b/ksirc/KSOpenkSirc/serverFileParser.cpp index 0b62b0dc..59288d00 100644 --- a/ksirc/KSOpenkSirc/serverFileParser.cpp +++ b/ksirc/KSOpenkSirc/serverFileParser.cpp @@ -109,6 +109,6 @@ int serverFileParser::readDatafile( const char *fileName ) int writeDataFile() { - TQString filename(KGlobal::dirs()->saveLocation("appdata")+"servers.txt"); + TQString filename(TDEGlobal::dirs()->saveLocation("appdata")+"servers.txt"); return 1; } diff --git a/ksirc/KSPrefs/page_general.cpp b/ksirc/KSPrefs/page_general.cpp index 51a78ec3..6bf8d476 100644 --- a/ksirc/KSPrefs/page_general.cpp +++ b/ksirc/KSPrefs/page_general.cpp @@ -82,7 +82,7 @@ void PageGeneral::readConfig( const KSOGeneral *opts ) encodingsCB->clear(); - TQStringList encodings = KGlobal::charsets()->descriptiveEncodingNames(); + TQStringList encodings = TDEGlobal::charsets()->descriptiveEncodingNames(); // remove utf16/ucs2 as it just doesn't work for IRC TQStringList::Iterator encodingIt = encodings.begin(); diff --git a/ksirc/chanparser.cpp b/ksirc/chanparser.cpp index aafaf395..d5215485 100644 --- a/ksirc/chanparser.cpp +++ b/ksirc/chanparser.cpp @@ -742,7 +742,7 @@ parseResult * ChannelParser::parseINFOMode(TQString string) /* - * 1k is pretty safe since KProcess returns 1 k blocks, and lines don't get split between reads. This is emprical + * 1k is pretty safe since TDEProcess returns 1 k blocks, and lines don't get split between reads. This is emprical */ TQString modes, args, channel; int found = 0; diff --git a/ksirc/iocontroller.cpp b/ksirc/iocontroller.cpp index 9835a960..0545b189 100644 --- a/ksirc/iocontroller.cpp +++ b/ksirc/iocontroller.cpp @@ -34,23 +34,23 @@ Functions: public: - KSircIOController(KProcess*, KSircProcess*): - - Object constructor takes two arguements the KProcess + KSircIOController(TDEProcess*, KSircProcess*): + - Object constructor takes two arguements the TDEProcess that holds a running copy of sirc. - KSircProcess is saved for access latter to TopList. - - The receivedStdout signal from KProcess is connected to + - The receivedStdout signal from TDEProcess is connected to stdout_read and the processExited is connected to the sircDied slot. ~KSircIOController: does nothing at this time. public slots: - stdout_read(KProcess *, _buffer, buflen): + stdout_read(TDEProcess *, _buffer, buflen): - Called by kprocess when data arrives. - This function does all the parsing and sending of messages to each window. - stderr_read(KProcess*, _buffer, buflen): + stderr_read(TDEProcess*, _buffer, buflen): - Should be called for stderr data, not connected, does nothing. @@ -88,7 +88,7 @@ int KSircIOController::counter = 0; -KSircIOController::KSircIOController(KProcess *_proc, KSircProcess *_ksircproc) +KSircIOController::KSircIOController(TDEProcess *_proc, KSircProcess *_ksircproc) : TQObject() { @@ -103,20 +103,20 @@ KSircIOController::KSircIOController(KProcess *_proc, KSircProcess *_ksircproc) // Connect the data arrived // to sirc receive for adding // the main text window - connect(proc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), - this, TQT_SLOT(stdout_read(KProcess*, char*, int))); + connect(proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + this, TQT_SLOT(stdout_read(TDEProcess*, char*, int))); // Connect the stderr data // to sirc receive for adding // the main text window - connect(proc, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), - this, TQT_SLOT(stderr_read(KProcess*, char*, int))); + connect(proc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + this, TQT_SLOT(stderr_read(TDEProcess*, char*, int))); - connect(proc, TQT_SIGNAL(processExited(KProcess *)), - this, TQT_SLOT(sircDied(KProcess *))); + connect(proc, TQT_SIGNAL(processExited(TDEProcess *)), + this, TQT_SLOT(sircDied(TDEProcess *))); // Notify on sirc dying - connect(proc, TQT_SIGNAL(wroteStdin(KProcess*)), - this, TQT_SLOT(procCTS(KProcess*))); + connect(proc, TQT_SIGNAL(wroteStdin(TDEProcess*)), + this, TQT_SLOT(procCTS(TDEProcess*))); proc_CTS = TRUE; #if 0 showDebugTraffic(true); @@ -134,7 +134,7 @@ void my_print(const char *c){ fprintf(stderr, "\n"); } -void KSircIOController::stdout_read(KProcess *, char *_buffer, int buflen) +void KSircIOController::stdout_read(TDEProcess *, char *_buffer, int buflen) { /* @@ -243,8 +243,8 @@ void KSircIOController::stdout_read(KProcess *, char *_buffer, int buflen) line.remove(0, pos3+1); } } - TQString enc = KGlobal::charsets()->encodingForName( ksopts->channel["global"]["global"].encoding ); - TQTextCodec *qtc = KGlobal::charsets()->codecForName( enc ); + TQString enc = TDEGlobal::charsets()->encodingForName( ksopts->channel["global"]["global"].encoding ); + TQTextCodec *qtc = TDEGlobal::charsets()->codecForName( enc ); TQString qsname = qtc->toUnicode(name); /* char *b = tqstrdup(line); @@ -297,7 +297,7 @@ KSircIOController::~KSircIOController() delete m_debugLB; } -void KSircIOController::stderr_read(KProcess *p, char *b, int l) +void KSircIOController::stderr_read(TDEProcess *p, char *b, int l) { stdout_read(p, b, l); } @@ -318,7 +318,7 @@ void KSircIOController::stdin_write(TQCString s) if(proc_CTS == TRUE){ int len = buffer.length(); if(send_buf != 0x0){ - tqWarning("KProcess barfed in all clear signal again"); + tqWarning("TDEProcess barfed in all clear signal again"); delete[] send_buf; } send_buf = new char[len]; @@ -338,24 +338,24 @@ void KSircIOController::stdin_write(TQCString s) } if(buffer.length() > 5000){ - kdDebug(5008) << "IOController: KProcess barfing again!\n"; + kdDebug(5008) << "IOController: TDEProcess barfing again!\n"; } // write(sirc_stdin, s, s.length()); } -void KSircIOController::sircDied(KProcess *process) +void KSircIOController::sircDied(TDEProcess *process) { if ( process->exitStatus() == 0 ) return; - kdDebug(5008) << "IOController: KProcess died!\n"; + kdDebug(5008) << "IOController: TDEProcess died!\n"; ksircproc->TopList["!all"]->sirc_receive("*E* DSIRC IS DEAD"); ksircproc->TopList["!all"]->sirc_receive("*E* KSIRC WINDOW HALTED"); - ksircproc->TopList["!all"]->sirc_receive( TQCString( "*E* Tried to run: " ) + KGlobal::dirs()->findExe("dsirc").ascii() + TQCString( "\n" ) ); + ksircproc->TopList["!all"]->sirc_receive( TQCString( "*E* Tried to run: " ) + TDEGlobal::dirs()->findExe("dsirc").ascii() + TQCString( "\n" ) ); ksircproc->TopList["!all"]->sirc_receive("*E* DID YOU READ THE INSTALL INTRUCTIONS?"); } -void KSircIOController::procCTS ( KProcess *) +void KSircIOController::procCTS ( TDEProcess *) { proc_CTS = true; delete[] send_buf; diff --git a/ksirc/iocontroller.h b/ksirc/iocontroller.h index e9587ab6..67360219 100644 --- a/ksirc/iocontroller.h +++ b/ksirc/iocontroller.h @@ -3,7 +3,7 @@ #include <tqobject.h> -class KProcess; +class TDEProcess; class KSircProcess; class TQListBox; class TQListBoxItem; @@ -15,25 +15,25 @@ class KSircIOController : public TQObject friend class KSircProcess; public: - KSircIOController(KProcess *, KSircProcess *); + KSircIOController(TDEProcess *, KSircProcess *); virtual ~KSircIOController(); void showDebugTraffic(bool show); bool isDebugTraffic(); public slots: - virtual void stdout_read(KProcess *proc, char *_buffer, int buflen); - virtual void stderr_read(KProcess *proc, char *_buffer, int buflen); + virtual void stdout_read(TDEProcess *proc, char *_buffer, int buflen); + virtual void stderr_read(TDEProcess *proc, char *_buffer, int buflen); virtual void stdin_write(TQCString); - virtual void sircDied(KProcess *); + virtual void sircDied(TDEProcess *); virtual void appendDebug(TQString); protected slots: - virtual void procCTS(KProcess *); + virtual void procCTS(TDEProcess *); private slots: void showContextMenuOnDebugWindow( TQListBoxItem *, const TQPoint &pos ); @@ -41,7 +41,7 @@ private slots: private: TQCString holder; bool proc_CTS; - KProcess *proc; + TDEProcess *proc; KSircProcess *ksircproc; char *send_buf; diff --git a/ksirc/ksircprocess.cpp b/ksirc/ksircprocess.cpp index 8d2a0f0c..6d46bdba 100644 --- a/ksirc/ksircprocess.cpp +++ b/ksirc/ksircprocess.cpp @@ -67,7 +67,7 @@ KSircReceivers under control of this server, and includes such items as "!all" and "!default". All !name are control windows. - 2. Forks off a KProcess for sirc and passes it over to IOController + 2. Forks off a TDEProcess for sirc and passes it over to IOController which grabs and control's it's IO. 3. It then opens a "!default" window. This will receive all @@ -121,7 +121,7 @@ KSircProcess::KSircProcess( TQString &server_id, KSircServer &kss, TQObject * pa : TQObject(parent, name), m_kss(kss), m_serverid(server_id) { - proc = new KProcess(); + proc = new TDEProcess(); #ifndef NDEBUG if(getuid() != 0) @@ -165,7 +165,7 @@ KSircProcess::KSircProcess( TQString &server_id, KSircServer &kss, TQObject * pa kdDebug(5008) << "Set SIRCUSER to: " << qsUserID << endl; } - proc->setEnvironment("SIRCLIB", KGlobal::dirs()->findResourceDir("appdata", "ksirc.pl")); + proc->setEnvironment("SIRCLIB", TDEGlobal::dirs()->findResourceDir("appdata", "ksirc.pl")); proc->setEnvironment("SIRCWAIT", "1"); TQString env = locate("appdata", "ksircrc"); @@ -190,7 +190,7 @@ KSircProcess::KSircProcess( TQString &server_id, KSircServer &kss, TQObject * pa TQString sslopt; if(kss.usessl()) sslopt = "-S"; - *proc << "perl" << KGlobal::dirs()->findExe("dsirc") << "-8" << "-r" << sslopt; + *proc << "perl" << TDEGlobal::dirs()->findExe("dsirc") << "-8" << "-r" << sslopt; // Finally start the iocontroller. @@ -236,7 +236,7 @@ KSircProcess::KSircProcess( TQString &server_id, KSircServer &kss, TQObject * pa // Now that all windows are up, start sirc. - proc->start(KProcess::NotifyOnExit, KProcess::All); + proc->start(TDEProcess::NotifyOnExit, TDEProcess::All); // Intial commands to load ASAP. // turn on sirc ssfe mode TQCString command = "/eval $ssfe=1\n"; diff --git a/ksirc/ksircprocess.h b/ksirc/ksircprocess.h index 6c34485d..163dc903 100644 --- a/ksirc/ksircprocess.h +++ b/ksirc/ksircprocess.h @@ -11,7 +11,7 @@ class KSircTopLevel; #include "ksircserver.h" #include "ksircchannel.h" -class KProcess; +class TDEProcess; class KSircIOController; class KSircMessageReceiver; class KSircIOController; @@ -71,7 +71,7 @@ private: void cleanup(); KSircIOController *iocontrol; - KProcess *proc; + TDEProcess *proc; TQDict<KSircMessageReceiver> TopList; diff --git a/ksirc/kstextview.cpp b/ksirc/kstextview.cpp index ae6fb8c3..2879ce10 100644 --- a/ksirc/kstextview.cpp +++ b/ksirc/kstextview.cpp @@ -584,7 +584,7 @@ TQString Tokenizer::convertToRichText( const PString &ptext ) * KCharSet's fromEntity breaks) if ( ch == '<' || ch == '>' || ch == '&' ) { - TQString entity = KGlobal::charsets()->toEntity( ch ); + TQString entity = TDEGlobal::charsets()->toEntity( ch ); indexAdjustment = entity.length() - 1; result.replace( i, 1, entity ); } diff --git a/ksirc/messageReceiver.cpp b/ksirc/messageReceiver.cpp index e60d82e3..becfa79a 100644 --- a/ksirc/messageReceiver.cpp +++ b/ksirc/messageReceiver.cpp @@ -64,7 +64,7 @@ TQTextCodec *UnicodeMessageReceiver::encoder() const } if ( !m_encoder ) { - const_cast<UnicodeMessageReceiver *>( this )->m_encoder = KGlobal::charsets()->codecForName( m_encoding ); + const_cast<UnicodeMessageReceiver *>( this )->m_encoder = TDEGlobal::charsets()->codecForName( m_encoding ); assert( m_encoder ); } diff --git a/ksirc/servercontroller.cpp b/ksirc/servercontroller.cpp index bb558b3e..9f979369 100644 --- a/ksirc/servercontroller.cpp +++ b/ksirc/servercontroller.cpp @@ -182,7 +182,7 @@ servercontroller::servercontroller( TQWidget*, const char* name ) KHelpMenu *help = new KHelpMenu( this, kapp->aboutData() ); MenuBar->insertItem( KStdGuiItem::help().text(), help->menu() ); - m_kga = new KGlobalAccel(TQT_TQOBJECT(this), "globalAccess"); + m_kga = new TDEGlobalAccel(TQT_TQOBJECT(this), "globalAccess"); m_kga->insert("New Server", i18n("New Server"), i18n("This action allows you to open a new server more easily " "when in docked mode, since you don't need to click on the " diff --git a/ksirc/servercontroller.h b/ksirc/servercontroller.h index 585583b4..f6d8024d 100644 --- a/ksirc/servercontroller.h +++ b/ksirc/servercontroller.h @@ -34,7 +34,7 @@ class ProcCommand; class TQLabel; class KMenuBar; class KSircServer; -class KGlobalAccel; +class TDEGlobalAccel; class nickColourMaker; class dockServerController; @@ -116,7 +116,7 @@ public: void checkDocking(); - KGlobalAccel *getGlobalAccel(){ return m_kga; } + TDEGlobalAccel *getGlobalAccel(){ return m_kga; } signals: /** @@ -229,7 +229,7 @@ private: TQPopupMenu *options, *connections; int join_id, server_id; - KGlobalAccel *m_kga; + TDEGlobalAccel *m_kga; int open_toplevels; diff --git a/ksirc/toplevel.cpp b/ksirc/toplevel.cpp index 34e63182..264eecf3 100644 --- a/ksirc/toplevel.cpp +++ b/ksirc/toplevel.cpp @@ -174,7 +174,7 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf encodingAction = new KSelectAction( i18n( "&Encoding" ), 0, TQT_TQOBJECT(this) ); connect( encodingAction, TQT_SIGNAL( activated() ), this, TQT_SLOT( setEncoding() ) ); - TQStringList encodings = KGlobal::charsets()->descriptiveEncodingNames(); + TQStringList encodings = TDEGlobal::charsets()->descriptiveEncodingNames(); topicitem = file->insertItem(i18n("S&how Topic"), this, TQT_SLOT(toggleTopic()), CTRL + Key_O); if (isPrivateChat() || m_channelInfo.channel().startsWith("!no_channel")) { @@ -238,7 +238,7 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf pan = new TQSplitter(Qt::Horizontal, top, kstn + "splitter"); #if KDE_IS_VERSION(3,1,92) - pan->setOpaqueResize( KGlobalSettings::opaqueResize() ); + pan->setOpaqueResize( TDEGlobalSettings::opaqueResize() ); #else pan->setOpaqueResize( true ); #endif @@ -603,7 +603,7 @@ void KSircTopLevel::setEncoding() } else { ksopts->chan(m_channelInfo).encoding = encodingAction->currentText(); - UnicodeMessageReceiver::setEncoding( KGlobal::charsets()->encodingForName( encodingAction->currentText() ) ); + UnicodeMessageReceiver::setEncoding( TDEGlobal::charsets()->encodingForName( encodingAction->currentText() ) ); } ksopts->save(KSOptions::Channels); } diff --git a/ktalkd/kcmktalkd/soundpage.cpp b/ktalkd/kcmktalkd/soundpage.cpp index 01351030..b52051d6 100644 --- a/ktalkd/kcmktalkd/soundpage.cpp +++ b/ktalkd/kcmktalkd/soundpage.cpp @@ -112,7 +112,7 @@ KSoundPageConfig::KSoundPageConfig( TQWidget *parent, const char* name, lay->addWidget(sound_tip); - TQStringList strlist( KGlobal::dirs()->findAllResources( "sound" ) ); + TQStringList strlist( TDEGlobal::dirs()->findAllResources( "sound" ) ); sound_list->insertStringList( strlist ); load(); diff --git a/lanbrowsing/kcmlisa/kcmlisa.cpp b/lanbrowsing/kcmlisa/kcmlisa.cpp index d977c597..c5892395 100644 --- a/lanbrowsing/kcmlisa/kcmlisa.cpp +++ b/lanbrowsing/kcmlisa/kcmlisa.cpp @@ -289,8 +289,8 @@ void LisaSettings::save() confStream<<"PingNames = "<<writeStuff.latin1()<<"\n"; tmp.close(); TQString suCommand=TQString("cp '%1' '%2'; chmod 644 '%3'; rm -f '%4'").arg(m_tmpFilename).arg(m_configFilename).arg(m_configFilename).arg(m_tmpFilename); - KProcess *proc = new KProcess(); - connect(proc, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(saveDone(KProcess *))); + TDEProcess *proc = new TDEProcess(); + connect(proc, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(saveDone(TDEProcess *))); *proc<<"tdesu"<<"-c"<<suCommand; TDEApplication::setOverrideCursor(TQt::waitCursor); setEnabled(false); @@ -373,7 +373,7 @@ void LisaSettings::autoSetup() return; } -void LisaSettings::saveDone(KProcess *proc) +void LisaSettings::saveDone(TDEProcess *proc) { unlink(TQFile::encodeName(m_tmpFilename)); TDEApplication::restoreOverrideCursor(); diff --git a/lanbrowsing/kcmlisa/kcmlisa.h b/lanbrowsing/kcmlisa/kcmlisa.h index 5ee12b1c..51815906 100644 --- a/lanbrowsing/kcmlisa/kcmlisa.h +++ b/lanbrowsing/kcmlisa/kcmlisa.h @@ -28,7 +28,7 @@ class TQPushButton; class TQCheckBox; class TQSpinBox; class TQPushButton; -class KProcess; +class TDEProcess; class KDialogBase; class KRestrictedLine; class KEditListBox; @@ -48,7 +48,7 @@ class LisaSettings:public KCModule protected slots: void slotChanged(); void autoSetup(); - void saveDone(KProcess *); // called after the tdesud returns (on save) + void saveDone(TDEProcess *); // called after the tdesud returns (on save) void suggestSettings(); protected: KConfig m_config; diff --git a/lanbrowsing/kio_lan/kio_lan.cpp b/lanbrowsing/kio_lan/kio_lan.cpp index 442957ad..7e296694 100644 --- a/lanbrowsing/kio_lan/kio_lan.cpp +++ b/lanbrowsing/kio_lan/kio_lan.cpp @@ -76,9 +76,9 @@ int kdemain( int argc, char **argv ) int isLanIoslave=(strcmp("lan",argv[1])==0); // Trigger creation to make sure we pick up KIOSK settings correctly. - (void)KGlobal::dirs(); - (void)KGlobal::locale(); - (void)KGlobal::config(); + (void)TDEGlobal::dirs(); + (void)TDEGlobal::locale(); + (void)TDEGlobal::config(); kdDebug(7101) << "LAN: kdemain: starting" << endl; @@ -94,7 +94,7 @@ LANProtocol::LANProtocol(int isLanIoslave, const TQCString &pool, const TQCStrin ,m_maxAge(15*60) ,m_isLanIoslave(isLanIoslave?true:false) { - KConfig *config=KGlobal::config(); + KConfig *config=TDEGlobal::config(); m_protocolInfo[KIOLAN_FTP].enabled=config->readNumEntry("Support_FTP",PORTSETTINGS_CHECK); m_protocolInfo[KIOLAN_HTTP].enabled=config->readNumEntry("Support_HTTP",PORTSETTINGS_CHECK); @@ -292,10 +292,10 @@ int LANProtocol::rlanReadDataFromServer() if (result!=0) { ::close(sockFD); - KProcess proc; + TDEProcess proc; proc<<"reslisa"; - bool ok=proc.start(KProcess::DontCare); + bool ok=proc.start(TDEProcess::DontCare); if (!ok) { error( ERR_CANNOT_LAUNCH_PROCESS, "reslisa" ); diff --git a/librss/loader.cpp b/librss/loader.cpp index 0ca68389..b34799da 100644 --- a/librss/loader.cpp +++ b/librss/loader.cpp @@ -138,12 +138,12 @@ void OutputRetriever::retrieveData(const KURL &url) d->buffer->open(IO_WriteOnly); d->process = new KShellProcess(); - connect(d->process, TQT_SIGNAL(processExited(KProcess *)), - TQT_SLOT(slotExited(KProcess *))); - connect(d->process, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), - TQT_SLOT(slotOutput(KProcess *, char *, int))); + connect(d->process, TQT_SIGNAL(processExited(TDEProcess *)), + TQT_SLOT(slotExited(TDEProcess *))); + connect(d->process, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + TQT_SLOT(slotOutput(TDEProcess *, char *, int))); *d->process << url.path(); - d->process->start(KProcess::NotifyOnExit, KProcess::Stdout); + d->process->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout); } int OutputRetriever::errorCode() const @@ -151,12 +151,12 @@ int OutputRetriever::errorCode() const return d->lastError; } -void OutputRetriever::slotOutput(KProcess *, char *data, int length) +void OutputRetriever::slotOutput(TDEProcess *, char *data, int length) { d->buffer->writeBlock(data, length); } -void OutputRetriever::slotExited(KProcess *p) +void OutputRetriever::slotExited(TDEProcess *p) { if (!p->normalExit()) d->lastError = p->exitStatus(); diff --git a/librss/loader.h b/librss/loader.h index 1dedebae..e541b020 100644 --- a/librss/loader.h +++ b/librss/loader.h @@ -21,7 +21,7 @@ namespace KIO { class Job; } -class KProcess; +class TDEProcess; namespace RSS { @@ -180,8 +180,8 @@ namespace RSS virtual int errorCode() const; private slots: - void slotOutput(KProcess *process, char *data, int length); - void slotExited(KProcess *process); + void slotOutput(TDEProcess *process, char *data, int length); + void slotExited(TDEProcess *process); private: OutputRetriever(const OutputRetriever &other); diff --git a/wifi/interface_wireless_wirelessextensions.cpp b/wifi/interface_wireless_wirelessextensions.cpp index aad56fa6..7521391e 100644 --- a/wifi/interface_wireless_wirelessextensions.cpp +++ b/wifi/interface_wireless_wirelessextensions.cpp @@ -541,7 +541,7 @@ TQTable* Interface_wireless_wirelessextensions::get_available_networks () // connect ( iwlist, TQT_SIGNAL ( readReady ( KProcIO * ) ), this, TQT_SLOT ( parseScanData ( KProcIO * ) ) ); - if ( !iwlist->start ( KProcess::Block ) ) + if ( !iwlist->start ( TDEProcess::Block ) ) KMessageBox::sorry ( 0, i18n ( "Unable to perform the scan. Please make sure the executable \"iwlist\" is in your $PATH." ), i18n ( "Scanning not possible" ) ); diff --git a/wifi/kcmwifi/kcmwifi.cpp b/wifi/kcmwifi/kcmwifi.cpp index 743f3d2e..79802e32 100644 --- a/wifi/kcmwifi/kcmwifi.cpp +++ b/wifi/kcmwifi/kcmwifi.cpp @@ -75,9 +75,9 @@ KCMWifi::KCMWifi(TQWidget * parent, const char *name, const TQStringList &) } else { - KProcess iwconfigtest; + TDEProcess iwconfigtest; iwconfigtest << "iwconfig"; - if (!iwconfigtest.start(KProcess::DontCare)) + if (!iwconfigtest.start(TDEProcess::DontCare)) { KMessageBox::sorry(0, i18n("Error executing iwconfig. WLAN " "configurations can only be altered if the wireless tools are " @@ -201,7 +201,7 @@ void KCMWifi::delConfigTab( int count ) void KCMWifi::activate() { - KProcess proc; + TDEProcess proc; TQStringList failedParts; @@ -233,7 +233,7 @@ void KCMWifi::activate() << tempInterface << "down"; kdDebug() << "Command: " << proc.args() << endl; - proc.start (KProcess::Block); + proc.start (TDEProcess::Block); if ( (!proc.normalExit()) || (proc.exitStatus() != 0) ) failedParts << i18n("Interface could not be shut down. It is likely that your settings have not been applied."); @@ -246,7 +246,7 @@ void KCMWifi::activate() << ifconfig.m_networkName; kdDebug() << "Command: " << proc.args() << endl; - proc.start (KProcess::Block); + proc.start (TDEProcess::Block); if ( (!proc.normalExit()) || (proc.exitStatus() != 0) ) failedParts << i18n("SSID could not be set."); @@ -259,7 +259,7 @@ void KCMWifi::activate() << ifconfig.wifimodeAsString(); kdDebug() << "Command: " << proc.args() << endl; - proc.start (KProcess::Block); + proc.start (TDEProcess::Block); if ( (!proc.normalExit()) || (proc.exitStatus() != 0) ) failedParts << i18n("Operation mode could not be set."); @@ -272,7 +272,7 @@ void KCMWifi::activate() << ifconfig.speedAsString(); kdDebug() << "Command: " << proc.args() << endl; - proc.start (KProcess::Block); + proc.start (TDEProcess::Block); if ( (!proc.normalExit()) || (proc.exitStatus() != 0) ) failedParts << i18n("Speed settings could not be modified."); @@ -315,7 +315,7 @@ void KCMWifi::activate() } kdDebug() << "Command: " << proc.args() << endl; - proc.start (KProcess::Block); + proc.start (TDEProcess::Block); if ( (ifconfig.m_useCrypto) && ((!proc.normalExit()) || (proc.exitStatus() != 0)) ) failedParts << i18n("Encryption settings could not be set."); @@ -342,7 +342,7 @@ void KCMWifi::activate() } kdDebug() << "Command: " << proc.args() << endl; - proc.start (KProcess::Block); + proc.start (TDEProcess::Block); if ( (ifconfig.m_pmEnabled) && ((!proc.normalExit()) || (proc.exitStatus() != 0)) ) failedParts << i18n("Power management settings could not be set."); @@ -353,7 +353,7 @@ void KCMWifi::activate() << "up"; kdDebug() << "Command: " << proc.args() << endl; - proc.start (KProcess::Block); + proc.start (TDEProcess::Block); if ( (!proc.normalExit()) || (proc.exitStatus() != 0) ) failedParts << i18n("Interface could not be re-enabled."); @@ -363,7 +363,7 @@ void KCMWifi::activate() proc.clearArguments(); proc << TQStringList::split( " ", ifconfig.m_connectScript ); - proc.start(KProcess::DontCare); + proc.start(TDEProcess::DontCare); } if (!failedParts.empty()) KMessageBox::informationList(0,i18n("The following settings could not be applied:"),failedParts); diff --git a/wifi/kcmwifi/wificonfig.cpp b/wifi/kcmwifi/wificonfig.cpp index 1cd6b3f2..6941b80e 100644 --- a/wifi/kcmwifi/wificonfig.cpp +++ b/wifi/kcmwifi/wificonfig.cpp @@ -186,7 +186,7 @@ WifiConfig *WifiConfig::instance() WifiConfig::WifiConfig() { - //m_config = KGlobal::config(); + //m_config = TDEGlobal::config(); m_config = new KSimpleConfig( "kcmwifirc" ); load(); @@ -270,7 +270,7 @@ TQString WifiConfig::autoDetectInterface() test << *it; connect( &test, TQT_SIGNAL( readReady( KProcIO * ) ), this, TQT_SLOT( slotTestInterface( KProcIO * ) ) ); - test.start ( KProcess::Block ); + test.start ( TDEProcess::Block ); } } diff --git a/wifi/kwifimanager.cpp b/wifi/kwifimanager.cpp index 1d6bcbe3..8c2f976a 100644 --- a/wifi/kwifimanager.cpp +++ b/wifi/kwifimanager.cpp @@ -452,7 +452,7 @@ KWiFiManagerApp::slotDisableRadio () onOrOff = "off"; } - disablePower = new KProcess; + disablePower = new TDEProcess; // FIXME my Cisco Aironet 350 has two interfaces eth1 and wifi1, // kwifimanager works on wifi 1 where txpower does not work -- jriddell @@ -460,8 +460,8 @@ KWiFiManagerApp::slotDisableRadio () //*disablePower << "tdesu" << "iwconfig" << "eth1" << "txpower" << onOrOff; *disablePower << "tdesu" << "iwconfig" << interface << "txpower" << onOrOff; - connect( disablePower, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotDisablePowerProcessExited()) ); - disablePower->start(KProcess::NotifyOnExit); + connect( disablePower, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotDisablePowerProcessExited()) ); + disablePower->start(TDEProcess::NotifyOnExit); } void @@ -557,9 +557,9 @@ KWiFiManagerApp::slotFileQuit () void KWiFiManagerApp::slotStartConfigEditor () { - KProcess startConf; + TDEProcess startConf; startConf << "tdesu" << locate("exe", "kcmshell") << "kcmwifi"; - startConf.start (KProcess::DontCare); + startConf.start (TDEProcess::DontCare); } void KWiFiManagerApp::saveProperties( KConfig* conf) diff --git a/wifi/kwifimanager.h b/wifi/kwifimanager.h index 00fe62a3..90234772 100644 --- a/wifi/kwifimanager.h +++ b/wifi/kwifimanager.h @@ -33,7 +33,7 @@ class TQStringList; #include <kmainwindow.h> class KSystemTray; class KToggleAction; -class KProcess; +class TDEProcess; // application specific includes #include "interface_wireless.h" @@ -135,7 +135,7 @@ private: Interface_wireless *device; TQPushButton * scan; Led *led; - KProcess* disablePower; + TDEProcess* disablePower; bool showStrength; bool showStatsNoise; bool m_startDocked; diff --git a/wifi/kwireless/kwireless.cpp b/wifi/kwireless/kwireless.cpp index 39b66a76..8e4944d6 100644 --- a/wifi/kwireless/kwireless.cpp +++ b/wifi/kwireless/kwireless.cpp @@ -78,7 +78,7 @@ extern "C" { KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString configFile) { - KGlobal::locale()->insertCatalogue("kwireless"); + TDEGlobal::locale()->insertCatalogue("kwireless"); return new KWireLess(configFile, KPanelApplet::Normal, KPanelApplet::About, // | KPanelApplet::Help | KPanelApplet::Preferences, diff --git a/wifi/kwireless/kwirelesswidget.cpp b/wifi/kwireless/kwirelesswidget.cpp index 77e20128..362740e1 100644 --- a/wifi/kwireless/kwirelesswidget.cpp +++ b/wifi/kwireless/kwirelesswidget.cpp @@ -217,7 +217,7 @@ void KWireLessWidget::paintEvent(TQPaintEvent*) } painter.setPen(TQPen(TQt::black, frameWidth)); - painter.setBrush(KGlobalSettings::baseColor()); + painter.setBrush(TDEGlobalSettings::baseColor()); painter.drawRect(0, 0, w, h); int x = qualityBarWidth + frameWidth; diff --git a/wifi/networkscanning.cpp b/wifi/networkscanning.cpp index 509e1f9f..d7f07db7 100644 --- a/wifi/networkscanning.cpp +++ b/wifi/networkscanning.cpp @@ -124,14 +124,14 @@ NetworkScanning::switchToNetwork() cmdline = (TQString)"iwconfig %1 essid %2 mode %3 enc %4\n"; cmdline = cmdline.arg( device->get_interface_name() ); - cmdline = cmdline.arg( KProcess::quote( networks->text( networks->currentRow(), 0 ) ) ); + cmdline = cmdline.arg( TDEProcess::quote( networks->text( networks->currentRow(), 0 ) ) ); TQString modetemp; if (networks->text( networks->currentRow(), 1 ) == i18n("Managed") ) modetemp = "Managed"; else modetemp = "Ad-Hoc"; cmdline = cmdline.arg( modetemp ); if ( encryption != NONE ) { - cmdline = cmdline.arg( (encryption == VALID_STRING ? "s:" : "" ) + KProcess::quote( networks->text( networks->currentRow(), 3 ) ) ); + cmdline = cmdline.arg( (encryption == VALID_STRING ? "s:" : "" ) + TDEProcess::quote( networks->text( networks->currentRow(), 3 ) ) ); } else { cmdline = cmdline.arg("off"); } @@ -143,9 +143,9 @@ NetworkScanning::switchToNetwork() delete tempfile; // autoDeletion off, so the file remains on disk - KProcess switchProc; + TDEProcess switchProc; switchProc << "tdesu" << tempfilename; - switchProc.start( KProcess::Block ); + switchProc.start( TDEProcess::Block ); remove(tempfilename.ascii()); |