From a9bde819f2b421dcc44741156e75eca4bb5fb4f4 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:49:30 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- kmail/accountdialog.cpp | 10 +++---- kmail/antispamwizard.cpp | 4 +-- kmail/archivefolderdialog.cpp | 2 +- kmail/backupjob.h | 2 +- kmail/configuredialog.cpp | 24 ++++++++-------- kmail/configuredialog_p.cpp | 4 +-- kmail/customtemplates.cpp | 2 +- kmail/editorwatcher.cpp | 4 +-- kmail/editorwatcher.h | 4 +-- kmail/encodingdetector.cpp | 2 +- kmail/favoritefolderview.cpp | 2 +- kmail/folderrequester.cpp | 2 +- kmail/headeritem.cpp | 2 +- kmail/headerstyle.cpp | 10 +++---- kmail/imapaccountbase.cpp | 2 +- kmail/kmaccount.cpp | 8 +++--- kmail/kmaccount.h | 4 +-- kmail/kmail.kcfg | 6 ++-- kmail/kmail_part.cpp | 6 ++-- kmail/kmcommands.cpp | 6 ++-- kmail/kmcommands.h | 2 +- kmail/kmcomposewin.cpp | 58 +++++++++++++++++++------------------- kmail/kmcomposewin.h | 4 +-- kmail/kmedit.cpp | 8 +++--- kmail/kmedit.h | 6 ++-- kmail/kmfawidgets.cpp | 2 +- kmail/kmfilteraction.cpp | 10 +++---- kmail/kmfilteraction.h | 2 +- kmail/kmfoldermbox.cpp | 28 +++++++++--------- kmail/kmfolderseldlg.cpp | 4 +-- kmail/kmfoldertree.cpp | 8 +++--- kmail/kmheaders.cpp | 10 +++---- kmail/kmkernel.cpp | 2 +- kmail/kmkernel.h | 2 +- kmail/kmmainwidget.cpp | 14 ++++----- kmail/kmmessage.cpp | 2 +- kmail/kmmsgbase.cpp | 10 +++---- kmail/kmmsgpart.cpp | 2 +- kmail/kmreaderwin.cpp | 10 +++---- kmail/kmsearchpattern.cpp | 12 ++++---- kmail/kmsender.cpp | 24 ++++++++-------- kmail/kmsender.h | 2 +- kmail/kmsender_p.h | 10 +++---- kmail/kmstartup.cpp | 4 +-- kmail/kmsystemtray.cpp | 2 +- kmail/managesievescriptsdialog.cpp | 2 +- kmail/objecttreeparser.cpp | 16 +++++------ kmail/recipientseditor.cpp | 14 ++++----- kmail/recipientseditor.h | 10 +++---- kmail/recipientspicker.cpp | 12 ++++---- kmail/signatureconfigurator.cpp | 2 +- kmail/templateparser.cpp | 44 ++++++++++++++--------------- kmail/templateparser.h | 10 +++---- kmail/templatesconfiguration.cpp | 2 +- kmail/urlhandlermanager.cpp | 4 +-- kmail/vacation.cpp | 2 +- kmail/xfaceconfigurator.cpp | 2 +- 57 files changed, 232 insertions(+), 232 deletions(-) (limited to 'kmail') diff --git a/kmail/accountdialog.cpp b/kmail/accountdialog.cpp index b25a1a2aa..8937fb480 100644 --- a/kmail/accountdialog.cpp +++ b/kmail/accountdialog.cpp @@ -908,7 +908,7 @@ void AccountDialog::makeImapAccountPage( bool connected ) button->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); button->setFixedSize( 22, 22 ); button->setIconSet( - KGlobal::iconLoader()->loadIconSet( "reload", KIcon::Small, 0 ) ); + TDEGlobal::iconLoader()->loadIconSet( "reload", KIcon::Small, 0 ) ); connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotReloadNamespaces()) ); TQWhatsThis::add( button, i18n("Reload the namespaces from the server. This overwrites any changes.") ); @@ -922,7 +922,7 @@ void AccountDialog::makeImapAccountPage( bool connected ) mImap.personalNS->setReadOnly( true ); mImap.editPNS = new TQToolButton( listbox ); mImap.editPNS->setIconSet( - KGlobal::iconLoader()->loadIconSet( "edit", KIcon::Small, 0 ) ); + TDEGlobal::iconLoader()->loadIconSet( "edit", KIcon::Small, 0 ) ); mImap.editPNS->setAutoRaise( true ); mImap.editPNS->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); mImap.editPNS->setFixedSize( 22, 22 ); @@ -934,7 +934,7 @@ void AccountDialog::makeImapAccountPage( bool connected ) mImap.otherUsersNS->setReadOnly( true ); mImap.editONS = new TQToolButton( listbox ); mImap.editONS->setIconSet( - KGlobal::iconLoader()->loadIconSet( "edit", KIcon::Small, 0 ) ); + TDEGlobal::iconLoader()->loadIconSet( "edit", KIcon::Small, 0 ) ); mImap.editONS->setAutoRaise( true ); mImap.editONS->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); mImap.editONS->setFixedSize( 22, 22 ); @@ -946,7 +946,7 @@ void AccountDialog::makeImapAccountPage( bool connected ) mImap.sharedNS->setReadOnly( true ); mImap.editSNS = new TQToolButton( listbox ); mImap.editSNS->setIconSet( - KGlobal::iconLoader()->loadIconSet( "edit", KIcon::Small, 0 ) ); + TDEGlobal::iconLoader()->loadIconSet( "edit", KIcon::Small, 0 ) ); mImap.editSNS->setAutoRaise( true ); mImap.editSNS->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); mImap.editSNS->setFixedSize( 22, 22 ); @@ -2305,7 +2305,7 @@ NamespaceEditDialog::NamespaceEditDialog( TQWidget *parent, edit->setText( it.key() ); TQToolButton* button = new TQToolButton( grid ); button->setIconSet( - KGlobal::iconLoader()->loadIconSet( "editdelete", KIcon::Small, 0 ) ); + TDEGlobal::iconLoader()->loadIconSet( "editdelete", KIcon::Small, 0 ) ); button->setAutoRaise( true ); button->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); button->setFixedSize( 22, 22 ); diff --git a/kmail/antispamwizard.cpp b/kmail/antispamwizard.cpp index 951a33798..2f6750f2c 100644 --- a/kmail/antispamwizard.cpp +++ b/kmail/antispamwizard.cpp @@ -616,10 +616,10 @@ void AntiSpamWizard::slotBuildSummary() int AntiSpamWizard::checkForProgram( const TQString &executable ) { kdDebug(5006) << "Testing for executable:" << executable << endl; - KProcess process; + TDEProcess process; process << executable; process.setUseShell( true ); - process.start( KProcess::Block ); + process.start( TDEProcess::Block ); return process.exitStatus(); } diff --git a/kmail/archivefolderdialog.cpp b/kmail/archivefolderdialog.cpp index c8068ec4d..4f58f56c3 100644 --- a/kmail/archivefolderdialog.cpp +++ b/kmail/archivefolderdialog.cpp @@ -39,7 +39,7 @@ using namespace KMail; static TQString standardArchivePath( const TQString &folderName ) { - TQString currentPath = KGlobalSettings::documentPath(); + TQString currentPath = TDEGlobalSettings::documentPath(); TQDir dir( currentPath ); if( !dir.exists() ) { currentPath = TQDir::homeDirPath() + '/'; diff --git a/kmail/backupjob.h b/kmail/backupjob.h index 41aa429bd..4ca6728f1 100644 --- a/kmail/backupjob.h +++ b/kmail/backupjob.h @@ -27,7 +27,7 @@ class KMFolder; class KMMessage; class KArchive; -class KProcess; +class TDEProcess; class TQWidget; namespace KPIM { diff --git a/kmail/configuredialog.cpp b/kmail/configuredialog.cpp index e569eff3a..4bad5bc5d 100644 --- a/kmail/configuredialog.cpp +++ b/kmail/configuredialog.cpp @@ -1019,7 +1019,7 @@ void AccountsPage::SendingTab::doLoadOther() { { //### FIXME: Use the global convenience function instead of the homebrewed // solution once we can rely on HEAD tdelibs. - //str = KGlobal::hostname(); ??????? + //str = TDEGlobal::hostname(); ??????? char buffer[256]; if ( !gethostname( buffer, 255 ) ) // buffer need not be NUL-terminated if it has full length @@ -1646,8 +1646,8 @@ void AppearancePage::FontsTab::slotFontSelectorChanged( int index ) void AppearancePage::FontsTab::doLoadOther() { KConfigGroup fonts( KMKernel::config(), "Fonts" ); - mFont[0] = KGlobalSettings::generalFont(); - TQFont fixedFont = KGlobalSettings::fixedFont(); + mFont[0] = TDEGlobalSettings::generalFont(); + TQFont fixedFont = TDEGlobalSettings::fixedFont(); for ( int i = 0 ; i < numFontNames ; i++ ) mFont[i] = fonts.readFontEntry( fontNames[i].configName, (fontNames[i].onlyFixed) ? &fixedFont : &mFont[0] ); @@ -1794,13 +1794,13 @@ void AppearancePage::ColorsTab::doLoadOther() { static const TQColor defaultColor[ numColorNames ] = { kapp->palette().active().base(), // bg - KGlobalSettings::alternateBackgroundColor(), // alt bg + TDEGlobalSettings::alternateBackgroundColor(), // alt bg kapp->palette().active().text(), // fg TQColor( 0x00, 0x80, 0x00 ), // quoted l1 TQColor( 0x00, 0x70, 0x00 ), // quoted l2 TQColor( 0x00, 0x60, 0x00 ), // quoted l3 - KGlobalSettings::linkColor(), // link - KGlobalSettings::visitedLinkColor(), // visited link + TDEGlobalSettings::linkColor(), // link + TDEGlobalSettings::visitedLinkColor(), // visited link TQt::red, // misspelled words TQt::red, // new msg TQt::blue, // unread mgs @@ -2374,7 +2374,7 @@ void AppearancePage::ReaderTab::readCurrentFallbackCodec() bool found = false; for( ; it != end; ++it) { - const TQString encoding = KGlobal::charsets()->encodingForName(*it); + const TQString encoding = TDEGlobal::charsets()->encodingForName(*it); if ( encoding == "iso-8859-15" ) indexOfLatin9 = i; if( encoding == currentEncoding ) @@ -2403,7 +2403,7 @@ void AppearancePage::ReaderTab::readCurrentOverrideCodec() uint i = 0; for( ; it != end; ++it) { - if( KGlobal::charsets()->encodingForName(*it) == currentOverrideEncoding ) + if( TDEGlobal::charsets()->encodingForName(*it) == currentOverrideEncoding ) { mOverrideCharsetCombo->setCurrentItem( i ); break; @@ -2450,11 +2450,11 @@ void AppearancePage::ReaderTab::save() { GlobalSettings::self()->setCollapseQuoteLevelSpin( mCollapseQuoteLevelSpin->value() ); GlobalSettings::self()->setFallbackCharacterEncoding( - KGlobal::charsets()->encodingForName( mCharsetCombo->currentText() ) ); + TDEGlobal::charsets()->encodingForName( mCharsetCombo->currentText() ) ); GlobalSettings::self()->setOverrideCharacterEncoding( mOverrideCharsetCombo->currentItem() == 0 ? TQString() : - KGlobal::charsets()->encodingForName( mOverrideCharsetCombo->currentText() ) ); + TDEGlobal::charsets()->encodingForName( mOverrideCharsetCombo->currentText() ) ); GlobalSettings::self()->setShowCurrentTime( mShowCurrentTimeCheck->isChecked() ); } @@ -3095,7 +3095,7 @@ void ComposerPage::PhrasesTab::doLoadFromGlobalSettings() { currentNr = 0; if ( numLang == 0 ) { - slotAddNewLanguage( KGlobal::locale()->language() ); + slotAddNewLanguage( TDEGlobal::locale()->language() ); } mPhraseLanguageCombo->setCurrentItem( currentNr ); @@ -3309,7 +3309,7 @@ void ComposerPage::CharsetTab::slotVerifyCharset( TQString & charset ) { } bool ok = false; - TQTextCodec *codec = KGlobal::charsets()->codecForName( charset, ok ); + TQTextCodec *codec = TDEGlobal::charsets()->codecForName( charset, ok ); if ( ok && codec ) { charset = TQString::fromLatin1( codec->mimeName() ).lower(); return; diff --git a/kmail/configuredialog_p.cpp b/kmail/configuredialog_p.cpp index 9f668ca31..daa326d2e 100644 --- a/kmail/configuredialog_p.cpp +++ b/kmail/configuredialog_p.cpp @@ -202,7 +202,7 @@ NewLanguageDialog::NewLanguageDialog( LanguageItemList & suppressedLangs, hlay->addWidget( new TQLabel( mComboBox, i18n("Choose &language:"), page ) ); hlay->addWidget( mComboBox, 1 ); - TQStringList pathList = KGlobal::dirs()->findAllResources( "locale", + TQStringList pathList = TDEGlobal::dirs()->findAllResources( "locale", TQString::fromLatin1("*/entry.desktop") ); // extract a list of language tags that should not be included: TQStringList suppressedAcronyms; @@ -324,7 +324,7 @@ void ProfileDialog::setup() { mListView->clear(); // find all profiles (config files named "profile-xyz-rc"): const TQString profileFilenameFilter = TQString::fromLatin1("kmail/profile-*-rc"); - mProfileList = KGlobal::dirs()->findAllResources( "data", profileFilenameFilter ); + mProfileList = TDEGlobal::dirs()->findAllResources( "data", profileFilenameFilter ); kdDebug(5006) << "Profile manager: found " << mProfileList.count() << " profiles:" << endl; diff --git a/kmail/customtemplates.cpp b/kmail/customtemplates.cpp index 6a0a7f4cf..14bed9cfe 100644 --- a/kmail/customtemplates.cpp +++ b/kmail/customtemplates.cpp @@ -57,7 +57,7 @@ CustomTemplates::CustomTemplates( TQWidget *parent, const char *name ) mCurrentItem( 0 ), mBlockChangeSignal( false ) { - TQFont f = KGlobalSettings::fixedFont(); + TQFont f = TDEGlobalSettings::fixedFont(); mEdit->setFont( f ); mAdd->setIconSet( BarIconSet( "add", KIcon::SizeSmall ) ); diff --git a/kmail/editorwatcher.cpp b/kmail/editorwatcher.cpp index 56282fed2..06368967e 100644 --- a/kmail/editorwatcher.cpp +++ b/kmail/editorwatcher.cpp @@ -99,9 +99,9 @@ bool EditorWatcher::start() // start the editor TQStringList params = KRun::processDesktopExec( *offer, list, false ); - mEditor = new KProcess( this ); + mEditor = new TDEProcess( this ); *mEditor << params; - connect( mEditor, TQT_SIGNAL(processExited(KProcess*)), TQT_SLOT(editorExited()) ); + connect( mEditor, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(editorExited()) ); if ( !mEditor->start() ) return false; mEditorRunning = true; diff --git a/kmail/editorwatcher.h b/kmail/editorwatcher.h index fc08c4dbf..9a408d69b 100644 --- a/kmail/editorwatcher.h +++ b/kmail/editorwatcher.h @@ -25,7 +25,7 @@ #include #include -class KProcess; +class TDEProcess; namespace KMail { @@ -63,7 +63,7 @@ class EditorWatcher : public TQObject KURL mUrl; TQString mMimeType; bool mOpenWith; - KProcess *mEditor; + TDEProcess *mEditor; TQWidget *mParentWidget; int mInotifyFd; diff --git a/kmail/encodingdetector.cpp b/kmail/encodingdetector.cpp index 06537981b..d5ffd5dce 100644 --- a/kmail/encodingdetector.cpp +++ b/kmail/encodingdetector.cpp @@ -863,7 +863,7 @@ bool EncodingDetector::setEncoding(const char *_encoding, EncodingChoiceSource t if(enc=="visual") enc="iso8859-8"; bool b; - codec = KGlobal::charsets()->codecForName(enc, b); + codec = TDEGlobal::charsets()->codecForName(enc, b); if (!b) return false; } diff --git a/kmail/favoritefolderview.cpp b/kmail/favoritefolderview.cpp index 6715f4865..e1c7d6b80 100644 --- a/kmail/favoritefolderview.cpp +++ b/kmail/favoritefolderview.cpp @@ -438,7 +438,7 @@ void FavoriteFolderView::readColorConfig() KConfig* conf = KMKernel::config(); // Custom/System color support KConfigGroupSaver saver(conf, "Reader"); - TQColor c = KGlobalSettings::alternateBackgroundColor(); + TQColor c = TDEGlobalSettings::alternateBackgroundColor(); if ( !conf->readBoolEntry("defaultColors", true) ) mPaintInfo.colBack = conf->readColorEntry( "AltBackgroundColor",&c ); else diff --git a/kmail/folderrequester.cpp b/kmail/folderrequester.cpp index ca6271c8e..177e8caf1 100644 --- a/kmail/folderrequester.cpp +++ b/kmail/folderrequester.cpp @@ -52,7 +52,7 @@ FolderRequester::FolderRequester( TQWidget *parent, KMFolderTree *tree ) edit->setReadOnly( true ); TQToolButton* button = new TQToolButton( this ); - button->setIconSet( KGlobal::iconLoader()->loadIconSet( "folder", KIcon::Small, 0 ) ); + button->setIconSet( TDEGlobal::iconLoader()->loadIconSet( "folder", KIcon::Small, 0 ) ); connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotOpenDialog()) ); setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, diff --git a/kmail/headeritem.cpp b/kmail/headeritem.cpp index 7decd39f2..c63a1ba1d 100644 --- a/kmail/headeritem.cpp +++ b/kmail/headeritem.cpp @@ -424,7 +424,7 @@ void HeaderItem::paintCell( TQPainter * p, const TQColorGroup & cg, font = headers->dateFont(); } - TQColor cdisabled = KGlobalSettings::inactiveTextColor(); + TQColor cdisabled = TDEGlobalSettings::inactiveTextColor(); if ( headers->isMessageCut( msgSerNum() ) ) { font.setItalic( true ); color = &cdisabled; diff --git a/kmail/headerstyle.cpp b/kmail/headerstyle.cpp index 019c20b28..c3a5b8b26 100644 --- a/kmail/headerstyle.cpp +++ b/kmail/headerstyle.cpp @@ -144,7 +144,7 @@ namespace KMail { TQString dateString; if( printing ) { TQDateTime dateTime; - KLocale * locale = KGlobal::locale(); + KLocale * locale = TDEGlobal::locale(); dateTime.setTime_t( message->date() ); dateString = locale->formatDateTime( dateTime ); } else { @@ -243,7 +243,7 @@ namespace KMail { TQString dateString; if( printing ) { TQDateTime dateTime; - KLocale* locale = KGlobal::locale(); + KLocale* locale = TDEGlobal::locale(); dateTime.setTime_t( message->date() ); dateString = locale->formatDateTime( dateTime ); } @@ -448,7 +448,7 @@ namespace KMail { TQString dateString; if( printing ) { TQDateTime dateTime; - KLocale* locale = KGlobal::locale(); + KLocale* locale = TDEGlobal::locale(); dateTime.setTime_t( message->date() ); dateString = locale->formatDateTime( dateTime ); } @@ -695,7 +695,7 @@ namespace KMail { } TQString tformat; - if ( KGlobal::locale()->use12Clock() ) { + if ( TDEGlobal::locale()->use12Clock() ) { tformat = "h:mm AP"; } else { @@ -914,7 +914,7 @@ namespace KMail { TQString dateString; if( printing ) { TQDateTime dateTime; - KLocale * locale = KGlobal::locale(); + KLocale * locale = TDEGlobal::locale(); dateTime.setTime_t( message->date() ); dateString = locale->formatDateTime( dateTime ); } else { diff --git a/kmail/imapaccountbase.cpp b/kmail/imapaccountbase.cpp index 25e5eb782..6380251e4 100644 --- a/kmail/imapaccountbase.cpp +++ b/kmail/imapaccountbase.cpp @@ -288,7 +288,7 @@ namespace KMail { // "keep password" checkbox. Then, we set [Passwords]Keep to // storePasswd(), so that the checkbox in the dialog will be // init'ed correctly: - KConfigGroup passwords( KGlobal::config(), "Passwords" ); + KConfigGroup passwords( TDEGlobal::config(), "Passwords" ); passwords.writeEntry( "Keep", storePasswd() ); TQString msg = i18n("You need to supply a username and a password to " "access this mailbox."); diff --git a/kmail/kmaccount.cpp b/kmail/kmaccount.cpp index 1ece4c510..e7d884101 100644 --- a/kmail/kmaccount.cpp +++ b/kmail/kmaccount.cpp @@ -51,8 +51,8 @@ KMPrecommand::KMPrecommand(const TQString &precommand, TQObject *parent) mPrecommandProcess.setUseShell(true); mPrecommandProcess << precommand; - connect(&mPrecommandProcess, TQT_SIGNAL(processExited(KProcess *)), - TQT_SLOT(precommandExited(KProcess *))); + connect(&mPrecommandProcess, TQT_SIGNAL(processExited(TDEProcess *)), + TQT_SLOT(precommandExited(TDEProcess *))); } //----------------------------------------------------------------------------- @@ -64,7 +64,7 @@ KMPrecommand::~KMPrecommand() //----------------------------------------------------------------------------- bool KMPrecommand::start() { - bool ok = mPrecommandProcess.start( KProcess::NotifyOnExit ); + bool ok = mPrecommandProcess.start( TDEProcess::NotifyOnExit ); if (!ok) KMessageBox::error(0, i18n("Could not execute precommand '%1'.") .arg(mPrecommand)); return ok; @@ -72,7 +72,7 @@ bool KMPrecommand::start() //----------------------------------------------------------------------------- -void KMPrecommand::precommandExited(KProcess *p) +void KMPrecommand::precommandExited(TDEProcess *p) { int exitCode = p->normalExit() ? p->exitStatus() : -1; if (exitCode) diff --git a/kmail/kmaccount.h b/kmail/kmaccount.h index 618fa130a..258fe9c02 100644 --- a/kmail/kmaccount.h +++ b/kmail/kmaccount.h @@ -60,13 +60,13 @@ public: bool start(); protected slots: - void precommandExited(KProcess *); + void precommandExited(TDEProcess *); signals: void finished(bool); protected: - KProcess mPrecommandProcess; + TDEProcess mPrecommandProcess; TQString mPrecommand; }; diff --git a/kmail/kmail.kcfg b/kmail/kmail.kcfg index 9ca8a5e5d..91d2e51ef 100644 --- a/kmail/kmail.kcfg +++ b/kmail/kmail.kcfg @@ -426,7 +426,7 @@ HDR_STANDARD - KGlobalSettings::completionMode() + TDEGlobalSettings::completionMode() true @@ -537,10 +537,10 @@ true - KGlobalSettings::generalFont() + TDEGlobalSettings::generalFont() - KGlobalSettings::fixedFont() + TDEGlobalSettings::fixedFont() diff --git a/kmail/kmail_part.cpp b/kmail/kmail_part.cpp index 45da1cd7f..1f42a82ab 100644 --- a/kmail/kmail_part.cpp +++ b/kmail/kmail_part.cpp @@ -102,7 +102,7 @@ KMailPart::KMailPart(TQWidget *parentWidget, const char *widgetName, TQWidget *canvas = new TQWidget(parentWidget, widgetName); canvas->setFocusPolicy(TQ_ClickFocus); setWidget(canvas); - KGlobal::iconLoader()->addAppDir("kmail"); + TDEGlobal::iconLoader()->addAppDir("kmail"); #if 0 //It's also possible to make a part out of a readerWin KMReaderWin *mReaderWin = new KMReaderWin( canvas, canvas, actionCollection() ); @@ -117,7 +117,7 @@ KMailPart::KMailPart(TQWidget *parentWidget, const char *widgetName, mReaderWin->setFocusPolicy(TQWidget::ClickFocus); mStatusBar = new KMailStatusBarExtension(this); //new KParts::SideBarExtension( kmkernel->mainWin()-mainKMWidget()->leftFrame(), this ); - KGlobal::iconLoader()->addAppDir("kmail"); + TDEGlobal::iconLoader()->addAppDir("kmail"); setXMLFile( "kmail_part.rc" ); kmkernel->inboxFolder()->close(); #else @@ -143,7 +143,7 @@ KMailPart::KMailPart(TQWidget *parentWidget, const char *widgetName, connect( this, TQT_SIGNAL(textChanged(const TQString&)), ie, TQT_SIGNAL(textChanged(const TQString&)) ); connect( this, TQT_SIGNAL(iconChanged(const TQPixmap&)), ie, TQT_SIGNAL(iconChanged(const TQPixmap&)) ); - KGlobal::iconLoader()->addAppDir( "kmail" ); + TDEGlobal::iconLoader()->addAppDir( "kmail" ); setXMLFile( "kmail_part.rc" ); #endif diff --git a/kmail/kmcommands.cpp b/kmail/kmcommands.cpp index d2d9ca374..7108fff65 100644 --- a/kmail/kmcommands.cpp +++ b/kmail/kmcommands.cpp @@ -743,7 +743,7 @@ KMCommand::Result KMShowMsgSrcCommand::execute() viewer->setCaption( i18n("Message as Plain Text") ); viewer->setText(str); if( mFixedFont ) - viewer->setFont(KGlobalSettings::fixedFont()); + viewer->setFont(TDEGlobalSettings::fixedFont()); // Well, there is no widget to be seen here, so we have to use TQCursor::pos() // Update: (GS) I'm not going to make this code behave according to Xinerama @@ -1605,10 +1605,10 @@ KMPrintCommand::KMPrintCommand( TQWidget *parent, KMMessage *msg, mUseFixedFont( useFixedFont ), mEncoding( encoding ) { if ( GlobalSettings::useDefaultFonts() ) - mOverrideFont = KGlobalSettings::generalFont(); + mOverrideFont = TDEGlobalSettings::generalFont(); else { KConfigGroup fonts( KMKernel::config(), "Fonts" ); - TQString tmp = fonts.readEntry( "print-font", KGlobalSettings::generalFont().toString() ); + TQString tmp = fonts.readEntry( "print-font", TDEGlobalSettings::generalFont().toString() ); mOverrideFont.fromString( tmp ); } } diff --git a/kmail/kmcommands.h b/kmail/kmcommands.h index 17c5512e2..698ae64b9 100644 --- a/kmail/kmcommands.h +++ b/kmail/kmcommands.h @@ -21,7 +21,7 @@ class TQPopupMenu; class KMainWindow; class KAction; class KProgressDialog; -class KProcess; +class TDEProcess; class KMFilter; class KMFolder; class KMFolderImap; diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp index cb9db7068..31d36b4d3 100644 --- a/kmail/kmcomposewin.cpp +++ b/kmail/kmcomposewin.cpp @@ -226,8 +226,8 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id ) mEdtReplyTo = new KMLineEdit(true,mHeadersArea, "replyToLine"); TQToolTip::add( mEdtReplyTo, i18n( "Set the \"Reply-To:\" email address for this message" ) ); - connect(mEdtReplyTo,TQT_SIGNAL(completionModeChanged(KGlobalSettings::Completion)), - TQT_SLOT(slotCompletionModeChanged(KGlobalSettings::Completion))); + connect(mEdtReplyTo,TQT_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)), + TQT_SLOT(slotCompletionModeChanged(TDEGlobalSettings::Completion))); if ( mClassicalRecipients ) { mRecipientsEditor = 0; @@ -260,12 +260,12 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id ) connect(mBtnBcc,TQT_SIGNAL(clicked()),TQT_SLOT(slotAddrBookTo())); //connect(mBtnFrom,TQT_SIGNAL(clicked()),TQT_SLOT(slotAddrBookFrom())); - connect(mEdtTo,TQT_SIGNAL(completionModeChanged(KGlobalSettings::Completion)), - TQT_SLOT(slotCompletionModeChanged(KGlobalSettings::Completion))); - connect(mEdtCc,TQT_SIGNAL(completionModeChanged(KGlobalSettings::Completion)), - TQT_SLOT(slotCompletionModeChanged(KGlobalSettings::Completion))); - connect(mEdtBcc,TQT_SIGNAL(completionModeChanged(KGlobalSettings::Completion)), - TQT_SLOT(slotCompletionModeChanged(KGlobalSettings::Completion))); + connect(mEdtTo,TQT_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)), + TQT_SLOT(slotCompletionModeChanged(TDEGlobalSettings::Completion))); + connect(mEdtCc,TQT_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)), + TQT_SLOT(slotCompletionModeChanged(TDEGlobalSettings::Completion))); + connect(mEdtBcc,TQT_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)), + TQT_SLOT(slotCompletionModeChanged(TDEGlobalSettings::Completion))); mEdtTo->setFocus(); } else { @@ -284,8 +284,8 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id ) mRecipientsEditor = new RecipientsEditor( mHeadersArea ); connect( mRecipientsEditor, - TQT_SIGNAL( completionModeChanged( KGlobalSettings::Completion ) ), - TQT_SLOT( slotCompletionModeChanged( KGlobalSettings::Completion ) ) ); + TQT_SIGNAL( completionModeChanged( TDEGlobalSettings::Completion ) ), + TQT_SLOT( slotCompletionModeChanged( TDEGlobalSettings::Completion ) ) ); connect( mRecipientsEditor, TQT_SIGNAL(sizeHintChanged()), TQT_SLOT(recipientEditorSizeHintChanged()) ); mRecipientsEditor->setFocus(); @@ -447,8 +447,8 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id ) connect( kmkernel->identityManager(), TQT_SIGNAL(changed(uint)), TQT_SLOT(slotIdentityChanged(uint))); - connect(mEdtFrom,TQT_SIGNAL(completionModeChanged(KGlobalSettings::Completion)), - TQT_SLOT(slotCompletionModeChanged(KGlobalSettings::Completion))); + connect(mEdtFrom,TQT_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)), + TQT_SLOT(slotCompletionModeChanged(TDEGlobalSettings::Completion))); connect(kmkernel->folderMgr(),TQT_SIGNAL(folderRemoved(KMFolder*)), TQT_SLOT(slotFolderRemoved(KMFolder*))); connect(kmkernel->imapFolderMgr(),TQT_SIGNAL(folderRemoved(KMFolder*)), @@ -692,21 +692,21 @@ void KMComposeWin::readConfig( bool reload /* = false */ ) TQStringList transportHistory = GlobalSettings::self()->transportHistory(); TQString currentTransport = GlobalSettings::self()->currentTransport(); - mEdtFrom->setCompletionMode( (KGlobalSettings::Completion)GlobalSettings::self()->completionMode() ); - mEdtReplyTo->setCompletionMode( (KGlobalSettings::Completion)GlobalSettings::self()->completionMode() ); + mEdtFrom->setCompletionMode( (TDEGlobalSettings::Completion)GlobalSettings::self()->completionMode() ); + mEdtReplyTo->setCompletionMode( (TDEGlobalSettings::Completion)GlobalSettings::self()->completionMode() ); if ( mClassicalRecipients ) { - mEdtTo->setCompletionMode( (KGlobalSettings::Completion)GlobalSettings::self()->completionMode() ); - mEdtCc->setCompletionMode( (KGlobalSettings::Completion)GlobalSettings::self()->completionMode() ); - mEdtBcc->setCompletionMode( (KGlobalSettings::Completion)GlobalSettings::self()->completionMode() ); + mEdtTo->setCompletionMode( (TDEGlobalSettings::Completion)GlobalSettings::self()->completionMode() ); + mEdtCc->setCompletionMode( (TDEGlobalSettings::Completion)GlobalSettings::self()->completionMode() ); + mEdtBcc->setCompletionMode( (TDEGlobalSettings::Completion)GlobalSettings::self()->completionMode() ); } else - mRecipientsEditor->setCompletionMode( (KGlobalSettings::Completion)GlobalSettings::self()->completionMode() ); + mRecipientsEditor->setCompletionMode( (TDEGlobalSettings::Completion)GlobalSettings::self()->completionMode() ); readColorConfig(); if ( GlobalSettings::self()->useDefaultFonts() ) { - mBodyFont = KGlobalSettings::generalFont(); - mFixedFont = KGlobalSettings::fixedFont(); + mBodyFont = TDEGlobalSettings::generalFont(); + mFixedFont = TDEGlobalSettings::fixedFont(); } else { mBodyFont = GlobalSettings::self()->composerFont(); mFixedFont = GlobalSettings::self()->fixedFont(); @@ -2701,9 +2701,9 @@ void KMComposeWin::setCharset(const TQCString& aCharset, bool forceDefault) ++it, i++ ) { if (i > 0 && ((mCharset == "us-ascii" && i == 1) || - (i != 1 && KGlobal::charsets()->codecForName( - KGlobal::charsets()->encodingForName(*it)) - == KGlobal::charsets()->codecForName(mCharset)))) + (i != 1 && TDEGlobal::charsets()->codecForName( + TDEGlobal::charsets()->encodingForName(*it)) + == TDEGlobal::charsets()->codecForName(mCharset)))) { mEncodingAction->setCurrentItem( i ); slotSetCharset(); @@ -2807,7 +2807,7 @@ void KMComposeWin::slotAttachFileResult(KIO::Job *job) { (*it).data.resize((*it).data.size() + 1); (*it).data[(*it).data.size() - 1] = '\0'; - if ( const TQTextCodec * codec = KGlobal::charsets()->codecForName((*it).encoding) ) + if ( const TQTextCodec * codec = TDEGlobal::charsets()->codecForName((*it).encoding) ) mEditor->insert( codec->toUnicode( (*it).data ) ); else mEditor->insert( TQString::fromLocal8Bit( (*it).data ) ); @@ -2821,7 +2821,7 @@ void KMComposeWin::slotAttachFileResult(KIO::Job *job) partCharset = TQCString( ( *it ).url.fileEncoding().latin1() ); } else { EncodingDetector ed; - KLocale *loc = KGlobal::locale(); + KLocale *loc = TDEGlobal::locale(); ed.setAutoDetectLanguage( EncodingDetector::scriptForLanguageCode ( loc->language() ) ); ed.analyze( (*it).data ); partCharset = ed.encoding(); @@ -2946,7 +2946,7 @@ void KMComposeWin::slotInsertFile() false, 0, 0, 0); KComboBox *combo = fdlg.toolBar()->getCombo(4711); for (int i = 0; i < combo->count(); i++) - if (KGlobal::charsets()->codecForName(KGlobal::charsets()-> + if (TDEGlobal::charsets()->codecForName(TDEGlobal::charsets()-> encodingForName(combo->text(i))) == TQTextCodec::codecForLocale()) combo->setCurrentItem(i); if (!fdlg.exec()) return; @@ -2957,7 +2957,7 @@ void KMComposeWin::slotInsertFile() { KConfig *config = KMKernel::config(); KConfigGroupSaver saver( config, "Composer" ); - TQString encoding = KGlobal::charsets()->encodingForName(combo->currentText()).latin1(); + TQString encoding = TDEGlobal::charsets()->encodingForName(combo->currentText()).latin1(); TQStringList urls = config->readListEntry( "recent-urls" ); TQStringList encodings = config->readListEntry( "recent-encodings" ); // Prevent config file from growing without bound @@ -3022,7 +3022,7 @@ void KMComposeWin::slotSetCharset() } mAutoCharset = false; - mCharset = KGlobal::charsets()->encodingForName( mEncodingAction-> + mCharset = TDEGlobal::charsets()->encodingForName( mEncodingAction-> currentText() ).latin1(); } @@ -5089,7 +5089,7 @@ void KMComposeWin::cleanupAutoSave() } } -void KMComposeWin::slotCompletionModeChanged( KGlobalSettings::Completion mode) +void KMComposeWin::slotCompletionModeChanged( TDEGlobalSettings::Completion mode) { GlobalSettings::self()->setCompletionMode( (int) mode ); diff --git a/kmail/kmcomposewin.h b/kmail/kmcomposewin.h index 9918c5c0a..02f92154c 100644 --- a/kmail/kmcomposewin.h +++ b/kmail/kmcomposewin.h @@ -57,7 +57,7 @@ class KMFolderComboBox; class KMFolder; class KMMessage; class KMMessagePart; -class KProcess; +class TDEProcess; class KDirWatch; class KSelectAction; class KFontAction; @@ -848,7 +848,7 @@ private: int calcColumnWidth(int which, long allShowing, int width); private slots: - void slotCompletionModeChanged( KGlobalSettings::Completion ); + void slotCompletionModeChanged( TDEGlobalSettings::Completion ); void slotConfigChanged(); void slotComposerDone( bool ); diff --git a/kmail/kmedit.cpp b/kmail/kmedit.cpp index 99382915d..e4fb46896 100644 --- a/kmail/kmedit.cpp +++ b/kmail/kmedit.cpp @@ -442,7 +442,7 @@ bool KMEdit::eventFilter(TQObject*o, TQEvent* e) mExtEditorTempFile->close(); // replace %f in the system line sysLine.replace( "%f", mExtEditorTempFile->name() ); - mExtEditorProcess = new KProcess(); + mExtEditorProcess = new TDEProcess(); mExtEditorProcess->setUseShell( true ); sysLine += " "; while (!sysLine.isEmpty()) @@ -450,8 +450,8 @@ bool KMEdit::eventFilter(TQObject*o, TQEvent* e) *mExtEditorProcess << sysLine.left(sysLine.find(" ")).local8Bit(); sysLine.remove(0, sysLine.find(" ") + 1); } - connect(mExtEditorProcess, TQT_SIGNAL(processExited(KProcess*)), - TQT_SLOT(slotExternalEditorDone(KProcess*))); + connect(mExtEditorProcess, TQT_SIGNAL(processExited(TDEProcess*)), + TQT_SLOT(slotExternalEditorDone(TDEProcess*))); if (!mExtEditorProcess->start()) { KMessageBox::error( topLevelWidget(), @@ -610,7 +610,7 @@ void KMEdit::slotExternalEditorTempFileChanged( const TQString & fileName ) { repaint(); } -void KMEdit::slotExternalEditorDone( KProcess * proc ) { +void KMEdit::slotExternalEditorDone( TDEProcess * proc ) { assert(proc == mExtEditorProcess); // make sure, we update even when KDirWatcher is too slow: slotExternalEditorTempFileChanged( mExtEditorTempFile->name() ); diff --git a/kmail/kmedit.h b/kmail/kmedit.h index 2f51f435a..24458cd3b 100644 --- a/kmail/kmedit.h +++ b/kmail/kmedit.h @@ -18,7 +18,7 @@ class KSpellConfig; class SpellingFilter; class KTempFile; class KDirWatch; -class KProcess; +class TDEProcess; class TQPopupMenu; /** @@ -131,7 +131,7 @@ public slots: void slotSpellcheck2(KSpell*); void slotSpellResult(const TQString&); void slotSpellDone(); - void slotExternalEditorDone(KProcess*); + void slotExternalEditorDone(TDEProcess*); void slotMisspelling(const TQString &, const TQStringList &, unsigned int); void slotCorrected (const TQString &, const TQString &, unsigned int); void addSuggestion(const TQString& text, const TQStringList& lst, unsigned int ); @@ -188,7 +188,7 @@ private: SpellingFilter* mSpellingFilter; KTempFile *mExtEditorTempFile; KDirWatch *mExtEditorTempFileWatcher; - KProcess *mExtEditorProcess; + TDEProcess *mExtEditorProcess; bool mUseExtEditor; TQString mExtEditor; bool mWasModifiedBeforeSpellCheck; diff --git a/kmail/kmfawidgets.cpp b/kmail/kmfawidgets.cpp index ae3634270..0183cf884 100644 --- a/kmail/kmfawidgets.cpp +++ b/kmail/kmfawidgets.cpp @@ -110,7 +110,7 @@ void KMSoundTestWidget::openSoundDialog( KURLRequester * ) << "audio/x-adpcm"; fileDialog->setMimeFilter( filters ); - TQStringList soundDirs = KGlobal::dirs()->resourceDirs( "sound" ); + TQStringList soundDirs = TDEGlobal::dirs()->resourceDirs( "sound" ); if ( !soundDirs.isEmpty() ) { KURL soundURL; diff --git a/kmail/kmfilteraction.cpp b/kmail/kmfilteraction.cpp index 037fbb0dd..06dbb56ef 100644 --- a/kmail/kmfilteraction.cpp +++ b/kmail/kmfilteraction.cpp @@ -495,7 +495,7 @@ TQString KMFilterActionWithCommand::substituteCommandLineArgsFor( KMMessage *aMs TQRegExp header_rx( "%\\{([a-z0-9-]+)\\}", false ); int idx = 0; while ( ( idx = header_rx.search( result, idx ) ) != -1 ) { - TQString replacement = KProcess::quote( aMsg->headerField( TQString(header_rx.cap(1)).latin1() ) ); + TQString replacement = TDEProcess::quote( aMsg->headerField( TQString(header_rx.cap(1)).latin1() ) ); result.replace( idx, header_rx.matchedLength(), replacement ); idx += replacement.length(); } @@ -511,7 +511,7 @@ KMFilterAction::ReturnCode KMFilterActionWithCommand::genericProcess(KMMessage* if ( mParameter.isEmpty() ) return ErrorButGoOn; - // KProcess doesn't support a TQProcess::launch() equivalent, so + // TDEProcess doesn't support a TQProcess::launch() equivalent, so // we must use a temp file :-( KTempFile * inFile = new KTempFile; inFile->setAutoDelete(true); @@ -544,9 +544,9 @@ KMFilterAction::ReturnCode KMFilterActionWithCommand::genericProcess(KMMessage* shProc << commandLine; // run process: - if ( !shProc.start( KProcess::Block, - withOutput ? KProcess::Stdout - : KProcess::NoCommunication ) ) + if ( !shProc.start( TDEProcess::Block, + withOutput ? TDEProcess::Stdout + : TDEProcess::NoCommunication ) ) return ErrorButGoOn; if ( !shProc.normalExit() || shProc.exitStatus() != 0 ) { diff --git a/kmail/kmfilteraction.h b/kmail/kmfilteraction.h index 0f635bad5..f0705b58a 100644 --- a/kmail/kmfilteraction.h +++ b/kmail/kmfilteraction.h @@ -508,7 +508,7 @@ public: @short Abstract base class for filter actions with a command line as parameter. @author Marc Mutz , based upon work by Stefan Taferner - @see KMFilterActionWithString KMFilterAction KMFilter KProcess + @see KMFilterActionWithString KMFilterAction KMFilter TDEProcess */ class KMFilterActionWithUrl : public KMFilterAction diff --git a/kmail/kmfoldermbox.cpp b/kmail/kmfoldermbox.cpp index b82c3a29d..7e033523d 100644 --- a/kmail/kmfoldermbox.cpp +++ b/kmail/kmfoldermbox.cpp @@ -349,9 +349,9 @@ int KMFolderMbox::lock() case procmail_lockfile: cmd_str = "lockfile -l20 -r5 "; if (!mProcmailLockFileName.isEmpty()) - cmd_str += TQFile::encodeName(KProcess::quote(mProcmailLockFileName)); + cmd_str += TQFile::encodeName(TDEProcess::quote(mProcmailLockFileName)); else - cmd_str += TQFile::encodeName(KProcess::quote(location() + ".lock")); + cmd_str += TQFile::encodeName(TDEProcess::quote(location() + ".lock")); rc = system( cmd_str.data() ); if( rc != 0 ) @@ -363,7 +363,7 @@ int KMFolderMbox::lock() } if( mIndexStream ) { - cmd_str = "lockfile -l20 -r5 " + TQFile::encodeName(KProcess::quote(indexLocation() + ".lock")); + cmd_str = "lockfile -l20 -r5 " + TQFile::encodeName(TDEProcess::quote(indexLocation() + ".lock")); rc = system( cmd_str.data() ); if( rc != 0 ) { @@ -376,7 +376,7 @@ int KMFolderMbox::lock() break; case mutt_dotlock: - cmd_str = "mutt_dotlock " + TQFile::encodeName(KProcess::quote(location())); + cmd_str = "mutt_dotlock " + TQFile::encodeName(TDEProcess::quote(location())); rc = system( cmd_str.data() ); if( rc != 0 ) { @@ -387,7 +387,7 @@ int KMFolderMbox::lock() } if( mIndexStream ) { - cmd_str = "mutt_dotlock " + TQFile::encodeName(KProcess::quote(indexLocation())); + cmd_str = "mutt_dotlock " + TQFile::encodeName(TDEProcess::quote(indexLocation())); rc = system( cmd_str.data() ); if( rc != 0 ) { @@ -400,7 +400,7 @@ int KMFolderMbox::lock() break; case mutt_dotlock_privileged: - cmd_str = "mutt_dotlock -p " + TQFile::encodeName(KProcess::quote(location())); + cmd_str = "mutt_dotlock -p " + TQFile::encodeName(TDEProcess::quote(location())); rc = system( cmd_str.data() ); if( rc != 0 ) { @@ -411,7 +411,7 @@ int KMFolderMbox::lock() } if( mIndexStream ) { - cmd_str = "mutt_dotlock -p " + TQFile::encodeName(KProcess::quote(indexLocation())); + cmd_str = "mutt_dotlock -p " + TQFile::encodeName(TDEProcess::quote(indexLocation())); rc = system( cmd_str.data() ); if( rc != 0 ) { @@ -478,34 +478,34 @@ int KMFolderMbox::unlock() case procmail_lockfile: cmd_str = "rm -f "; if (!mProcmailLockFileName.isEmpty()) - cmd_str += TQFile::encodeName(KProcess::quote(mProcmailLockFileName)); + cmd_str += TQFile::encodeName(TDEProcess::quote(mProcmailLockFileName)); else - cmd_str += TQFile::encodeName(KProcess::quote(location() + ".lock")); + cmd_str += TQFile::encodeName(TDEProcess::quote(location() + ".lock")); rc = system( cmd_str.data() ); if( mIndexStream ) { - cmd_str = "rm -f " + TQFile::encodeName(KProcess::quote(indexLocation() + ".lock")); + cmd_str = "rm -f " + TQFile::encodeName(TDEProcess::quote(indexLocation() + ".lock")); rc = system( cmd_str.data() ); } break; case mutt_dotlock: - cmd_str = "mutt_dotlock -u " + TQFile::encodeName(KProcess::quote(location())); + cmd_str = "mutt_dotlock -u " + TQFile::encodeName(TDEProcess::quote(location())); rc = system( cmd_str.data() ); if( mIndexStream ) { - cmd_str = "mutt_dotlock -u " + TQFile::encodeName(KProcess::quote(indexLocation())); + cmd_str = "mutt_dotlock -u " + TQFile::encodeName(TDEProcess::quote(indexLocation())); rc = system( cmd_str.data() ); } break; case mutt_dotlock_privileged: - cmd_str = "mutt_dotlock -p -u " + TQFile::encodeName(KProcess::quote(location())); + cmd_str = "mutt_dotlock -p -u " + TQFile::encodeName(TDEProcess::quote(location())); rc = system( cmd_str.data() ); if( mIndexStream ) { - cmd_str = "mutt_dotlock -p -u " + TQFile::encodeName(KProcess::quote(indexLocation())); + cmd_str = "mutt_dotlock -p -u " + TQFile::encodeName(TDEProcess::quote(indexLocation())); rc = system( cmd_str.data() ); } break; diff --git a/kmail/kmfolderseldlg.cpp b/kmail/kmfolderseldlg.cpp index 79df5bc1c..719dce4e0 100644 --- a/kmail/kmfolderseldlg.cpp +++ b/kmail/kmfolderseldlg.cpp @@ -122,7 +122,7 @@ void KMFolderSelDlg::setFlags( bool mustBeReadWrite, bool showOutbox, void KMFolderSelDlg::readConfig() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "FolderSelectionDialog" ); TQSize size = config->readSizeEntry( "Size" ); @@ -143,7 +143,7 @@ void KMFolderSelDlg::readConfig() void KMFolderSelDlg::writeConfig() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "FolderSelectionDialog" ); config->writeEntry( "Size", size() ); diff --git a/kmail/kmfoldertree.cpp b/kmail/kmfoldertree.cpp index 63010f9b5..7bec817b6 100644 --- a/kmail/kmfoldertree.cpp +++ b/kmail/kmfoldertree.cpp @@ -149,7 +149,7 @@ TQPixmap KMFolderTreeItem::normalIcon(int size) const if (mFolder && mFolder->useCustomIcons() ) { icon = mFolder->normalIconPath(); } - KIconLoader * il = KGlobal::instance()->iconLoader(); + KIconLoader * il = TDEGlobal::instance()->iconLoader(); TQPixmap pm = il->loadIcon( icon, KIcon::Small, size, KIcon::DefaultState, 0, true ); if ( mFolder && pm.isNull() ) { @@ -170,7 +170,7 @@ TQPixmap KMFolderTreeItem::unreadIcon(int size) const kmkernel->folderIsDraftOrOutbox( mFolder ) ) pm = normalIcon( size ); - KIconLoader * il = KGlobal::instance()->iconLoader(); + KIconLoader * il = TDEGlobal::instance()->iconLoader(); if ( mFolder && mFolder->useCustomIcons() ) { pm = il->loadIcon( mFolder->unreadIconPath(), KIcon::Small, size, KIcon::DefaultState, 0, true ); @@ -488,11 +488,11 @@ void KMFolderTree::readConfig (void) { KConfigGroupSaver saver(conf, "Fonts"); if (!conf->readBoolEntry("defaultFonts",true)) { - TQFont folderFont( KGlobalSettings::generalFont() ); + TQFont folderFont( TDEGlobalSettings::generalFont() ); setFont(conf->readFontEntry("folder-font", &folderFont)); } else - setFont(KGlobalSettings::generalFont()); + setFont(TDEGlobalSettings::generalFont()); } // restore the layout diff --git a/kmail/kmheaders.cpp b/kmail/kmheaders.cpp index aaa4669f7..bfe871945 100644 --- a/kmail/kmheaders.cpp +++ b/kmail/kmheaders.cpp @@ -435,7 +435,7 @@ void KMHeaders::readColorConfig (void) TQColor c4=TQColor(kapp->palette().active().base()); TQColor c5=TQColor(0,0x7F,0); TQColor c6=TQColor(0,0x98,0); - TQColor c7=KGlobalSettings::alternateBackgroundColor(); + TQColor c7=TDEGlobalSettings::alternateBackgroundColor(); if (!config->readBoolEntry("defaultColors",true)) { mPaintInfo.colFore = config->readColorEntry("ForegroundColor",&c1); @@ -533,18 +533,18 @@ void KMHeaders::readConfig (void) KConfigGroupSaver saver(config, "Fonts"); if (!(config->readBoolEntry("defaultFonts",true))) { - TQFont listFont( KGlobalSettings::generalFont() ); + TQFont listFont( TDEGlobalSettings::generalFont() ); listFont = config->readFontEntry( "list-font", &listFont ); setFont( listFont ); mNewFont = config->readFontEntry( "list-new-font", &listFont ); mUnreadFont = config->readFontEntry( "list-unread-font", &listFont ); mImportantFont = config->readFontEntry( "list-important-font", &listFont ); mTodoFont = config->readFontEntry( "list-todo-font", &listFont ); - mDateFont = KGlobalSettings::fixedFont(); + mDateFont = TDEGlobalSettings::fixedFont(); mDateFont = config->readFontEntry( "list-date-font", &mDateFont ); } else { mNewFont= mUnreadFont = mImportantFont = mDateFont = mTodoFont = - KGlobalSettings::generalFont(); + TDEGlobalSettings::generalFont(); setFont( mDateFont ); } } @@ -2376,7 +2376,7 @@ void KMHeaders::contentsMouseReleaseEvent(TQMouseEvent* e) void KMHeaders::contentsMouseMoveEvent( TQMouseEvent* e ) { if (mMousePressed && - (e->pos() - mPressPos).manhattanLength() > KGlobalSettings::dndEventDelay()) { + (e->pos() - mPressPos).manhattanLength() > TDEGlobalSettings::dndEventDelay()) { mMousePressed = false; TQListViewItem *item = itemAt( contentsToViewport(mPressPos) ); if ( item ) { diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp index 2bcf6c2ab..11e291ef2 100644 --- a/kmail/kmkernel.cpp +++ b/kmail/kmkernel.cpp @@ -161,7 +161,7 @@ KMKernel::KMKernel (TQObject *parent, const char *name) : netCodec = TQTextCodec::codecForName("jis7"); // TQTextCodec *cdc = TQTextCodec::codecForName("jis7"); // TQTextCodec::setCodecForLocale(cdc); - // KGlobal::locale()->setEncoding(cdc->mibEnum()); + // TDEGlobal::locale()->setEncoding(cdc->mibEnum()); } else { netCodec = TQTextCodec::codecForLocale(); } diff --git a/kmail/kmkernel.h b/kmail/kmkernel.h index 0b9aa51eb..471a77400 100644 --- a/kmail/kmkernel.h +++ b/kmail/kmkernel.h @@ -57,7 +57,7 @@ namespace KPIM { class IdentityManager; } class KMKernel; -class KProcess; +class TDEProcess; class KProgressDialog; class TDEInstance; class TQTimer; diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp index 333806868..622e70ad7 100644 --- a/kmail/kmmainwidget.cpp +++ b/kmail/kmmainwidget.cpp @@ -555,7 +555,7 @@ void KMMainWidget::createWidgets(void) TQWidget *headerParent = 0, *mimeParent = 0, *messageParent = 0; - const bool opaqueResize = KGlobalSettings::opaqueResize(); + const bool opaqueResize = TDEGlobalSettings::opaqueResize(); if ( mLongFolderList ) { // superior splitter: folder tree vs. rest // inferior splitter: headers vs. message vs. mime tree @@ -678,7 +678,7 @@ void KMMainWidget::createWidgets(void) // create list of folders mFolderViewSplitter = new TQSplitter( Qt::Vertical, mFolderViewParent ); - mFolderViewSplitter->setOpaqueResize( KGlobalSettings::opaqueResize() ); + mFolderViewSplitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() ); mFavoriteFolderView = new KMail::FavoriteFolderView( this, mFolderViewSplitter ); if ( mFavoritesCheckMailAction ) connect( mFavoritesCheckMailAction, TQT_SIGNAL(activated()), mFavoriteFolderView, TQT_SLOT(checkMail()) ); @@ -1762,17 +1762,17 @@ void KMMainWidget::slotDebugSieve() //----------------------------------------------------------------------------- void KMMainWidget::slotStartCertManager() { - KProcess certManagerProc; // save to create on the heap, since + TDEProcess certManagerProc; // save to create on the heap, since // there is no parent certManagerProc << "kleopatra"; - if( !certManagerProc.start( KProcess::DontCare ) ) + if( !certManagerProc.start( TDEProcess::DontCare ) ) KMessageBox::error( this, i18n( "Could not start certificate manager; " "please check your installation." ), i18n( "KMail Error" ) ); else kdDebug(5006) << "\nslotStartCertManager(): certificate manager started.\n" << endl; - // process continues to run even after the KProcess object goes + // process continues to run even after the TDEProcess object goes // out of scope here, since it is started in DontCare run mode. } @@ -1780,10 +1780,10 @@ void KMMainWidget::slotStartCertManager() //----------------------------------------------------------------------------- void KMMainWidget::slotStartWatchGnuPG() { - KProcess certManagerProc; + TDEProcess certManagerProc; certManagerProc << "kwatchgnupg"; - if( !certManagerProc.start( KProcess::DontCare ) ) + if( !certManagerProc.start( TDEProcess::DontCare ) ) KMessageBox::error( this, i18n( "Could not start GnuPG LogViewer (kwatchgnupg); " "please check your installation." ), i18n( "KMail Error" ) ); diff --git a/kmail/kmmessage.cpp b/kmail/kmmessage.cpp index 9ad91070d..6f7d2b12a 100644 --- a/kmail/kmmessage.cpp +++ b/kmail/kmmessage.cpp @@ -4038,7 +4038,7 @@ void KMMessage::readConfig() { // area for config group "KMMessage #n" KConfigGroupSaver saver(config, TQString("KMMessage #%1").arg(languageNr)); - sReplyLanguage = config->readEntry("language",KGlobal::locale()->language()); + sReplyLanguage = config->readEntry("language",TDEGlobal::locale()->language()); sReplyStr = config->readEntry("phrase-reply", i18n("On %D, you wrote:")); sReplyAllStr = config->readEntry("phrase-reply-all", diff --git a/kmail/kmmsgbase.cpp b/kmail/kmmsgbase.cpp index 6a5a1057f..3cd4f658f 100644 --- a/kmail/kmmsgbase.cpp +++ b/kmail/kmmsgbase.cpp @@ -576,7 +576,7 @@ const TQTextCodec* KMMsgBase::codecForName(const TQCString& _str) if (_str.isEmpty()) return 0; TQCString codec = _str; KPIM::kAsciiToLower(codec.data()); - return KGlobal::charsets()->codecForName(codec); + return TDEGlobal::charsets()->codecForName(codec); } @@ -600,23 +600,23 @@ TQCString KMMsgBase::toUsAscii(const TQString& _str, bool *ok) //----------------------------------------------------------------------------- TQStringList KMMsgBase::supportedEncodings(bool usAscii) { - TQStringList encodingNames = KGlobal::charsets()->availableEncodingNames(); + TQStringList encodingNames = TDEGlobal::charsets()->availableEncodingNames(); TQStringList encodings; TQMap mimeNames; for (TQStringList::Iterator 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/kmail/kmmsgpart.cpp b/kmail/kmmsgpart.cpp index 447993db8..596828e28 100644 --- a/kmail/kmmsgpart.cpp +++ b/kmail/kmmsgpart.cpp @@ -450,7 +450,7 @@ TQString KMMessagePart::iconName( int size ) const } fileName = - KGlobal::instance()->iconLoader()->iconPath( fileName, size ); + TDEGlobal::instance()->iconLoader()->iconPath( fileName, size ); return fileName; } diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp index beb7c249f..80d461205 100644 --- a/kmail/kmreaderwin.cpp +++ b/kmail/kmreaderwin.cpp @@ -394,7 +394,7 @@ void KMReaderWin::createWidgets() { mBox->setFrameStyle( mMimePartTree->frameStyle() ); mColorBar = new HtmlStatusBar( mBox, "mColorBar" ); mViewer = new KHTMLPart( mBox, "mViewer" ); - mSplitter->setOpaqueResize( KGlobalSettings::opaqueResize() ); + mSplitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() ); mSplitter->setResizeMode( mMimePartTree, TQSplitter::KeepSize ); } @@ -1078,7 +1078,7 @@ void KMReaderWin::setOverrideEncoding( const TQString & encoding ) TQStringList encodings = mSelectEncodingAction->items(); uint i = 0; for ( TQStringList::const_iterator it = encodings.begin(), end = encodings.end(); it != end; ++it, ++i ) { - if ( KGlobal::charsets()->encodingForName( *it ) == encoding ) { + if ( TDEGlobal::charsets()->encodingForName( *it ) == encoding ) { mSelectEncodingAction->setCurrentItem( i ); break; } @@ -1117,7 +1117,7 @@ void KMReaderWin::slotSetEncoding() if ( mSelectEncodingAction->currentItem() == 0 ) // Auto mOverrideEncoding = TQString(); else - mOverrideEncoding = KGlobal::charsets()->encodingForName( mSelectEncodingAction->currentText() ); + mOverrideEncoding = TDEGlobal::charsets()->encodingForName( mSelectEncodingAction->currentText() ); update( true ); } @@ -2153,7 +2153,7 @@ void KMReaderWin::setMsgPart( KMMessagePart* aMsgPart, bool aHTML, iio->setFileName(aFileName); if( iio->read() ) { TQImage img = iio->image(); - TQRect desk = KGlobalSettings::desktopGeometry(mMainWindow); + TQRect desk = TDEGlobalSettings::desktopGeometry(mMainWindow); // determine a reasonable window size int width, height; if( img.width() < 50 ) @@ -2689,7 +2689,7 @@ bool KMReaderWin::eventFilter( TQObject *, TQEvent *e ) // notifications in case we started a drag ourselves slotUrlOn( linkForNode( mViewer->nodeUnderMouse() ) ); - if ( ( mLastClickPosition - me->pos() ).manhattanLength() > KGlobalSettings::dndEventDelay() ) { + if ( ( mLastClickPosition - me->pos() ).manhattanLength() > TDEGlobalSettings::dndEventDelay() ) { if ( mCanStartDrag && ( !( mHoveredUrl.isEmpty() && mLastClickImagePath.isEmpty() ) ) ) { if ( URLHandlerManager::instance()->handleDrag( mHoveredUrl, mLastClickImagePath, this ) ) { mCanStartDrag = false; diff --git a/kmail/kmsearchpattern.cpp b/kmail/kmsearchpattern.cpp index 630c6f13b..2c003e49e 100644 --- a/kmail/kmsearchpattern.cpp +++ b/kmail/kmsearchpattern.cpp @@ -129,9 +129,9 @@ KMSearchRule * KMSearchRule::createInstanceFromConfig( const KConfig * config, i { const char cIdx = char( int('A') + aIdx ); - static const TQString & field = KGlobal::staticQString( "field" ); - static const TQString & func = KGlobal::staticQString( "func" ); - static const TQString & contents = KGlobal::staticQString( "contents" ); + static const TQString & field = TDEGlobal::staticQString( "field" ); + static const TQString & func = TDEGlobal::staticQString( "func" ); + static const TQString & contents = TDEGlobal::staticQString( "contents" ); const TQCString &field2 = config->readEntry( field + cIdx ).latin1(); Function func2 = configValueToFunc( config->readEntry( func + cIdx ).latin1() ); @@ -163,9 +163,9 @@ TQString KMSearchRule::functionToString( Function function ) void KMSearchRule::writeConfig( KConfig * config, int aIdx ) const { const char cIdx = char('A' + aIdx); - static const TQString & field = KGlobal::staticQString( "field" ); - static const TQString & func = KGlobal::staticQString( "func" ); - static const TQString & contents = KGlobal::staticQString( "contents" ); + static const TQString & field = TDEGlobal::staticQString( "field" ); + static const TQString & func = TDEGlobal::staticQString( "func" ); + static const TQString & contents = TDEGlobal::staticQString( "contents" ); config->writeEntry( field + cIdx, TQString(mField) ); config->writeEntry( func + cIdx, functionToString( mFunction ) ); diff --git a/kmail/kmsender.cpp b/kmail/kmsender.cpp index 500cb7e79..a8953b6e4 100644 --- a/kmail/kmsender.cpp +++ b/kmail/kmsender.cpp @@ -942,14 +942,14 @@ bool KMSendSendmail::doStart() { if (!mMailerProc) { - mMailerProc = new KProcess; + mMailerProc = new TDEProcess; assert(mMailerProc != 0); - connect(mMailerProc,TQT_SIGNAL(processExited(KProcess*)), - this, TQT_SLOT(sendmailExited(KProcess*))); - connect(mMailerProc,TQT_SIGNAL(wroteStdin(KProcess*)), - this, TQT_SLOT(wroteStdin(KProcess*))); - connect(mMailerProc,TQT_SIGNAL(receivedStderr(KProcess*,char*,int)), - this, TQT_SLOT(receivedStderr(KProcess*, char*, int))); + connect(mMailerProc,TQT_SIGNAL(processExited(TDEProcess*)), + this, TQT_SLOT(sendmailExited(TDEProcess*))); + connect(mMailerProc,TQT_SIGNAL(wroteStdin(TDEProcess*)), + this, TQT_SLOT(wroteStdin(TDEProcess*))); + connect(mMailerProc,TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), + this, TQT_SLOT(receivedStderr(TDEProcess*, char*, int))); } return true; } @@ -976,7 +976,7 @@ bool KMSendSendmail::doSend( const TQString & sender, const TQStringList & to, c mMsgStr = message; - if ( !mMailerProc->start( KProcess::NotifyOnExit, KProcess::All ) ) { + if ( !mMailerProc->start( TDEProcess::NotifyOnExit, TDEProcess::All ) ) { KMessageBox::information( 0, i18n("Failed to execute mailer program %1") .arg( mSender->transportInfo()->host ) ); return false; @@ -989,7 +989,7 @@ bool KMSendSendmail::doSend( const TQString & sender, const TQStringList & to, c } -void KMSendSendmail::wroteStdin(KProcess *proc) +void KMSendSendmail::wroteStdin(TDEProcess *proc) { char* str; int len; @@ -1009,13 +1009,13 @@ void KMSendSendmail::wroteStdin(KProcess *proc) mMsgRest -= len; mMsgPos += len; mMailerProc->writeStdin(str,len); - // if code is added after writeStdin() KProcess probably initiates + // if code is added after writeStdin() TDEProcess probably initiates // a race condition. } } -void KMSendSendmail::receivedStderr(KProcess *proc, char *buffer, int buflen) +void KMSendSendmail::receivedStderr(TDEProcess *proc, char *buffer, int buflen) { assert(proc!=0); Q_UNUSED( proc ); @@ -1023,7 +1023,7 @@ void KMSendSendmail::receivedStderr(KProcess *proc, char *buffer, int buflen) } -void KMSendSendmail::sendmailExited(KProcess *proc) +void KMSendSendmail::sendmailExited(TDEProcess *proc) { assert(proc!=0); mSendOk = (proc->normalExit() && proc->exitStatus()==0); diff --git a/kmail/kmsender.h b/kmail/kmsender.h index e01cba089..478b941cd 100644 --- a/kmail/kmsender.h +++ b/kmail/kmsender.h @@ -38,7 +38,7 @@ class KMMessage; class KMFolder; class KMFolderMgr; class KConfig; -class KProcess; +class TDEProcess; class KMSendProc; class KMSendSendmail; class KMSendSMTP; diff --git a/kmail/kmsender_p.h b/kmail/kmsender_p.h index 745203896..811eb559b 100644 --- a/kmail/kmsender_p.h +++ b/kmail/kmsender_p.h @@ -12,7 +12,7 @@ #include #include -class KProcess; +class TDEProcess; namespace KIO { class Job; @@ -95,9 +95,9 @@ public: void abort(); protected slots: - void receivedStderr(KProcess*,char*,int); - void wroteStdin(KProcess*); - void sendmailExited(KProcess*); + void receivedStderr(TDEProcess*,char*,int); + void wroteStdin(TDEProcess*); + void sendmailExited(TDEProcess*); private: /** implemented from KMSendProc */ @@ -111,7 +111,7 @@ private: TQByteArray mMsgStr; char* mMsgPos; int mMsgRest; - KProcess* mMailerProc; + TDEProcess* mMailerProc; }; //----------------------------------------------------------------------------- diff --git a/kmail/kmstartup.cpp b/kmail/kmstartup.cpp index 4069aaa7b..6c041b0f1 100644 --- a/kmail/kmstartup.cpp +++ b/kmail/kmstartup.cpp @@ -250,8 +250,8 @@ void insertLibraryCataloguesAndIcons() { "libkmime" }; - KLocale * l = KGlobal::locale(); - KIconLoader * il = KGlobal::iconLoader(); + KLocale * l = TDEGlobal::locale(); + KIconLoader * il = TDEGlobal::iconLoader(); for ( unsigned int i = 0 ; i < sizeof catalogues / sizeof *catalogues ; ++i ) { l->insertCatalogue( catalogues[i] ); il->addAppDir( catalogues[i] ); diff --git a/kmail/kmsystemtray.cpp b/kmail/kmsystemtray.cpp index d36bd3e95..4c432a514 100644 --- a/kmail/kmsystemtray.cpp +++ b/kmail/kmsystemtray.cpp @@ -193,7 +193,7 @@ void KMSystemTray::updateCount() int oldPixmapHeight = pixmap()->size().height(); TQString countString = TQString::number( mCount ); - TQFont countFont = KGlobalSettings::generalFont(); + TQFont countFont = TDEGlobalSettings::generalFont(); countFont.setBold(true); // decrease the size of the font for the number of unread messages if the diff --git a/kmail/managesievescriptsdialog.cpp b/kmail/managesievescriptsdialog.cpp index 3af5d7426..0c972130c 100644 --- a/kmail/managesievescriptsdialog.cpp +++ b/kmail/managesievescriptsdialog.cpp @@ -320,7 +320,7 @@ KMail::SieveEditor::SieveEditor( TQWidget * parent, const char * name ) mTextEdit->setFocus(); mTextEdit->setTextFormat( TQTextEdit::PlainText ); mTextEdit->setWordWrap( TQTextEdit::NoWrap ); - mTextEdit->setFont( KGlobalSettings::fixedFont() ); + mTextEdit->setFont( TDEGlobalSettings::fixedFont() ); connect( mTextEdit, TQT_SIGNAL( textChanged () ), TQT_SLOT( slotTextChanged() ) ); resize( 3 * sizeHint() ); } diff --git a/kmail/objecttreeparser.cpp b/kmail/objecttreeparser.cpp index 0b974a531..fe0592d51 100644 --- a/kmail/objecttreeparser.cpp +++ b/kmail/objecttreeparser.cpp @@ -733,7 +733,7 @@ namespace KMail { void ObjectTreeParser::writeDecryptionInProgressBlock() { assert( mReader ); // PENDING(marc) find an animated icon here: - //const TQString iconName = KGlobal::instance()->iconLoader()->iconPath( "decrypted", KIcon::Small ); + //const TQString iconName = TDEGlobal::instance()->iconLoader()->iconPath( "decrypted", KIcon::Small ); const TQString decryptedData = i18n("Encrypted data not shown"); PartMetaData messagePart; messagePart.isDecryptable = true; @@ -749,7 +749,7 @@ void ObjectTreeParser::writeDecryptionInProgressBlock() { void ObjectTreeParser::writeDeferredDecryptionBlock() { assert( mReader ); - const TQString iconName = KGlobal::instance()->iconLoader()->iconPath( "decrypted", KIcon::Small ); + const TQString iconName = TDEGlobal::instance()->iconLoader()->iconPath( "decrypted", KIcon::Small ); const TQString decryptedData = "
" + i18n("This message is encrypted.") + @@ -2010,7 +2010,7 @@ bool ObjectTreeParser::processApplicationMsTnefSubtype( partNode *node, ProcessR TQString href = "file:" + KURL::encode_string( dir + TQDir::separator() + att->name() ); KMimeType::Ptr mimeType = KMimeType::mimeType( att->mimeTag() ); - TQString iconName = KGlobal::instance()->iconLoader()->iconPath( mimeType->icon( TQString(), false ), KIcon::Desktop ); + TQString iconName = TDEGlobal::instance()->iconLoader()->iconPath( mimeType->icon( TQString(), false ), KIcon::Desktop ); htmlWriter()->queue( "
" + label + @@ -2563,7 +2563,7 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block, .arg( keyWithWithoutURL ); else htmlStr += i18n( "Message was signed on %1 with key %2." ) - .arg( KGlobal::locale()->formatDateTime( created ), + .arg( TDEGlobal::locale()->formatDateTime( created ), keyWithWithoutURL ); } else { @@ -2572,7 +2572,7 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block, .arg( keyWithWithoutURL ); else htmlStr += i18n( "Message was signed by %3 on %1 with key %2" ) - .arg( KGlobal::locale()->formatDateTime( created ), + .arg( TDEGlobal::locale()->formatDateTime( created ), keyWithWithoutURL, signer ); } @@ -2621,7 +2621,7 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block, TQDateTime created = block.creationTime; if ( created.isValid() ) htmlStr += i18n( "Message was signed on %1 with unknown key %2." ) - .arg( KGlobal::locale()->formatDateTime( created ), + .arg( TDEGlobal::locale()->formatDateTime( created ), keyWithWithoutURL ); else htmlStr += i18n( "Message was signed with unknown key %1." ) @@ -2997,11 +2997,11 @@ TQString ObjectTreeParser::quotedHTML( const TQString& s, bool decorate ) // Cache Icons if ( mCollapseIcon.isEmpty() ) { mCollapseIcon= LinkLocator::pngToDataUrl( - KGlobal::instance()->iconLoader()->iconPath( "quotecollapse",0 )); + TDEGlobal::instance()->iconLoader()->iconPath( "quotecollapse",0 )); } if ( mExpandIcon.isEmpty() ) mExpandIcon= LinkLocator::pngToDataUrl( - KGlobal::instance()->iconLoader()->iconPath( "quoteexpand",0 )); + TDEGlobal::instance()->iconLoader()->iconPath( "quoteexpand",0 )); } for (unsigned int p=0; pmEdit, TQT_SIGNAL( completionModeChanged( KGlobalSettings::Completion ) ), - TQT_SLOT( setCompletionMode( KGlobalSettings::Completion ) ) ); + connect( line->mEdit, TQT_SIGNAL( completionModeChanged( TDEGlobalSettings::Completion ) ), + TQT_SLOT( setCompletionMode( TDEGlobalSettings::Completion ) ) ); if ( mLines.last() ) { if ( mLines.count() == 1 ) { @@ -586,7 +586,7 @@ Recipient::List RecipientsView::recipients() const return recipients; } -void RecipientsView::setCompletionMode ( KGlobalSettings::Completion mode ) +void RecipientsView::setCompletionMode ( TDEGlobalSettings::Completion mode ) { if ( mCompletionMode == mode ) return; @@ -847,8 +847,8 @@ RecipientsEditor::RecipientsEditor( TQWidget *parent ) topLayout->addWidget( mRecipientsView ); connect( mRecipientsView, TQT_SIGNAL( focusUp() ), TQT_SIGNAL( focusUp() ) ); connect( mRecipientsView, TQT_SIGNAL( focusDown() ), TQT_SIGNAL( focusDown() ) ); - connect( mRecipientsView, TQT_SIGNAL( completionModeChanged( KGlobalSettings::Completion ) ), - TQT_SIGNAL( completionModeChanged( KGlobalSettings::Completion ) ) ); + connect( mRecipientsView, TQT_SIGNAL( completionModeChanged( TDEGlobalSettings::Completion ) ), + TQT_SIGNAL( completionModeChanged( TDEGlobalSettings::Completion ) ) ); mSideWidget = new SideWidget( mRecipientsView, this ); topLayout->addWidget( mSideWidget ); @@ -993,7 +993,7 @@ void RecipientsEditor::selectRecipients() mSideWidget->pickRecipient(); } -void RecipientsEditor::setCompletionMode( KGlobalSettings::Completion mode ) +void RecipientsEditor::setCompletionMode( TDEGlobalSettings::Completion mode ) { mRecipientsView->setCompletionMode( mode ); } diff --git a/kmail/recipientseditor.h b/kmail/recipientseditor.h index aadf25bc3..d02a1be5d 100644 --- a/kmail/recipientseditor.h +++ b/kmail/recipientseditor.h @@ -212,7 +212,7 @@ class RecipientsView : public TQScrollView int setFirstColumnWidth( int ); public slots: - void setCompletionMode( KGlobalSettings::Completion ); + void setCompletionMode( TDEGlobalSettings::Completion ); RecipientLine *addLine(); void setFocus(); @@ -224,7 +224,7 @@ class RecipientsView : public TQScrollView void focusUp(); void focusDown(); void focusRight(); - void completionModeChanged( KGlobalSettings::Completion ); + void completionModeChanged( TDEGlobalSettings::Completion ); void sizeHintChanged(); protected: @@ -247,7 +247,7 @@ class RecipientsView : public TQScrollView int mLineHeight; int mFirstColumnWidth; bool mModified; - KGlobalSettings::Completion mCompletionMode; + TDEGlobalSettings::Completion mCompletionMode; }; class RecipientsToolTip : public TQToolTip @@ -344,7 +344,7 @@ class RecipientsEditor : public TQWidget /** * Set completion mode for all lines */ - void setCompletionMode( KGlobalSettings::Completion ); + void setCompletionMode( TDEGlobalSettings::Completion ); public slots: void setFocus(); @@ -357,7 +357,7 @@ class RecipientsEditor : public TQWidget signals: void focusUp(); void focusDown(); - void completionModeChanged( KGlobalSettings::Completion ); + void completionModeChanged( TDEGlobalSettings::Completion ); void sizeHintChanged(); protected slots: diff --git a/kmail/recipientspicker.cpp b/kmail/recipientspicker.cpp index d6181a083..de577a7cc 100644 --- a/kmail/recipientspicker.cpp +++ b/kmail/recipientspicker.cpp @@ -63,7 +63,7 @@ void RecipientItem::setDistributionList( KPIM::DistributionList &list ) { mDistributionList = list; - mIcon = KGlobal::iconLoader()->loadIcon( "tdmconfig", KIcon::Small ); + mIcon = TDEGlobal::iconLoader()->loadIcon( "tdmconfig", KIcon::Small ); mName = list.name(); mKey = list.name(); @@ -80,7 +80,7 @@ void RecipientItem::setDistributionList( KABC::DistributionList *list ) { mDistributionList = list; - mIcon = KGlobal::iconLoader()->loadIcon( "tdmconfig", KIcon::Small ); + mIcon = TDEGlobal::iconLoader()->loadIcon( "tdmconfig", KIcon::Small ); mName = list->name(); mKey = list->name(); @@ -105,7 +105,7 @@ void RecipientItem::setAddressee( const KABC::Addressee &a, if ( !img.isNull() ) mIcon = img.smoothScale( 20, 20, TQ_ScaleMin ); else - mIcon = KGlobal::iconLoader()->loadIcon( "personal", KIcon::Small ); + mIcon = TDEGlobal::iconLoader()->loadIcon( "personal", KIcon::Small ); mName = mAddressee.realName(); mKey = mAddressee.realName() + '|' + mEmail; @@ -372,7 +372,7 @@ RecipientsPicker::RecipientsPicker( TQWidget *parent ) TQBoxLayout *searchLayout = new TQHBoxLayout( topLayout ); TQToolButton *button = new TQToolButton( this ); - button->setIconSet( KGlobal::iconLoader()->loadIconSet( + button->setIconSet( TDEGlobal::iconLoader()->loadIconSet( TDEApplication::reverseLayout() ? "clear_left":"locationbar_erase", KIcon::Small, 0 ) ); searchLayout->addWidget( button ); connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( resetSearch() ) ); @@ -810,7 +810,7 @@ void RecipientsPicker::keyPressEvent( TQKeyEvent *ev ) void RecipientsPicker::readConfig() { - KConfig *cfg = KGlobal::config(); + KConfig *cfg = TDEGlobal::config(); cfg->setGroup( "RecipientsPicker" ); TQSize size = cfg->readSizeEntry( "Size" ); if ( !size.isEmpty() ) { @@ -825,7 +825,7 @@ void RecipientsPicker::readConfig() void RecipientsPicker::writeConfig() { - KConfig *cfg = KGlobal::config(); + KConfig *cfg = TDEGlobal::config(); cfg->setGroup( "RecipientsPicker" ); cfg->writeEntry( "Size", size() ); cfg->writeEntry( "CurrentCollection", mCollectionCombo->currentItem() ); diff --git a/kmail/signatureconfigurator.cpp b/kmail/signatureconfigurator.cpp index 1239e65d7..3451fb483 100644 --- a/kmail/signatureconfigurator.cpp +++ b/kmail/signatureconfigurator.cpp @@ -105,7 +105,7 @@ namespace KMail { TQWhatsThis::add(mTextEdit, i18n("Use this field to enter an arbitrary static signature.")); widgetStack->addWidget( mTextEdit, pageno ); - mTextEdit->setFont( KGlobalSettings::fixedFont() ); + mTextEdit->setFont( TDEGlobalSettings::fixedFont() ); mTextEdit->setWordWrap( TQTextEdit::NoWrap ); mTextEdit->setTextFormat( TQt::PlainText ); diff --git a/kmail/templateparser.cpp b/kmail/templateparser.cpp index 310460230..9f9a80cd2 100644 --- a/kmail/templateparser.cpp +++ b/kmail/templateparser.cpp @@ -702,21 +702,21 @@ void TemplateParser::processWithTemplate( const TQString &tmpl ) kdDebug() << "Command: DATESHORT" << endl; i += strlen( "DATESHORT" ); TQDateTime date = TQDateTime::currentDateTime(); - TQString str = KGlobal::locale()->formatDate( date.date(), true ); + TQString str = TDEGlobal::locale()->formatDate( date.date(), true ); body.append( str ); } else if ( cmd.startsWith( "DATE" ) ) { kdDebug() << "Command: DATE" << endl; i += strlen( "DATE" ); TQDateTime date = TQDateTime::currentDateTime(); - TQString str = KGlobal::locale()->formatDate( date.date(), false ); + TQString str = TDEGlobal::locale()->formatDate( date.date(), false ); body.append( str ); } else if ( cmd.startsWith( "DOW" ) ) { kdDebug() << "Command: DOW" << endl; i += strlen( "DOW" ); TQDateTime date = TQDateTime::currentDateTime(); - TQString str = KGlobal::locale()->calendar()->weekDayName( date.date(), false ); + TQString str = TDEGlobal::locale()->calendar()->weekDayName( date.date(), false ); body.append( str ); } else if ( cmd.startsWith( "TIMELONGEN" ) ) { @@ -731,14 +731,14 @@ void TemplateParser::processWithTemplate( const TQString &tmpl ) kdDebug() << "Command: TIMELONG" << endl; i += strlen( "TIMELONG" ); TQDateTime date = TQDateTime::currentDateTime(); - TQString str = KGlobal::locale()->formatTime( date.time(), true ); + TQString str = TDEGlobal::locale()->formatTime( date.time(), true ); body.append( str ); } else if ( cmd.startsWith( "TIME" ) ) { kdDebug() << "Command: TIME" << endl; i += strlen( "TIME" ); TQDateTime date = TQDateTime::currentDateTime(); - TQString str = KGlobal::locale()->formatTime( date.time(), false ); + TQString str = TDEGlobal::locale()->formatTime( date.time(), false ); body.append( str ); } else if ( cmd.startsWith( "ODATEEN" ) ) { @@ -758,7 +758,7 @@ void TemplateParser::processWithTemplate( const TQString &tmpl ) if ( mOrigMsg ) { TQDateTime date; date.setTime_t( mOrigMsg->date() ); - TQString str = KGlobal::locale()->formatDate( date.date(), true ); + TQString str = TDEGlobal::locale()->formatDate( date.date(), true ); body.append( str ); } @@ -768,7 +768,7 @@ void TemplateParser::processWithTemplate( const TQString &tmpl ) if ( mOrigMsg ) { TQDateTime date; date.setTime_t( mOrigMsg->date() ); - TQString str = KGlobal::locale()->formatDate( date.date(), false ); + TQString str = TDEGlobal::locale()->formatDate( date.date(), false ); body.append( str ); } @@ -778,7 +778,7 @@ void TemplateParser::processWithTemplate( const TQString &tmpl ) if ( mOrigMsg ) { TQDateTime date; date.setTime_t( mOrigMsg->date() ); - TQString str = KGlobal::locale()->calendar()->weekDayName( date.date(), false ); + TQString str = TDEGlobal::locale()->calendar()->weekDayName( date.date(), false ); body.append( str ); } @@ -799,7 +799,7 @@ void TemplateParser::processWithTemplate( const TQString &tmpl ) if ( mOrigMsg ) { TQDateTime date; date.setTime_t( mOrigMsg->date() ); - TQString str = KGlobal::locale()->formatTime( date.time(), true ); + TQString str = TDEGlobal::locale()->formatTime( date.time(), true ); body.append( str ); } @@ -809,7 +809,7 @@ void TemplateParser::processWithTemplate( const TQString &tmpl ) if ( mOrigMsg ) { TQDateTime date; date.setTime_t( mOrigMsg->date() ); - TQString str = KGlobal::locale()->formatTime( date.time(), false ); + TQString str = TDEGlobal::locale()->formatTime( date.time(), false ); body.append( str ); } @@ -1118,21 +1118,21 @@ TQString TemplateParser::pipe( const TQString &cmd, const TQString &buf ) mPipeErr = ""; mPipeRc = 0; - KProcess proc; + TDEProcess proc; TQCString data = buf.local8Bit(); // kdDebug() << "Command data: " << data << endl; proc << KShell::splitArgs( cmd, KShell::TildeExpand ); proc.setUseShell( true ); - connect( &proc, TQT_SIGNAL( receivedStdout( KProcess *, char *, int ) ), - this, TQT_SLOT( onReceivedStdout( KProcess *, char *, int ) ) ); - connect( &proc, TQT_SIGNAL( receivedStderr( KProcess *, char *, int ) ), - this, TQT_SLOT( onReceivedStderr( KProcess *, char *, int ) ) ); - connect( &proc, TQT_SIGNAL( wroteStdin( KProcess * ) ), - this, TQT_SLOT( onWroteStdin( KProcess * ) ) ); + connect( &proc, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), + this, TQT_SLOT( onReceivedStdout( TDEProcess *, char *, int ) ) ); + connect( &proc, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ), + this, TQT_SLOT( onReceivedStderr( TDEProcess *, char *, int ) ) ); + connect( &proc, TQT_SIGNAL( wroteStdin( TDEProcess * ) ), + this, TQT_SLOT( onWroteStdin( TDEProcess * ) ) ); - if ( proc.start( KProcess::NotifyOnExit, KProcess::All ) ) { + if ( proc.start( TDEProcess::NotifyOnExit, TDEProcess::All ) ) { bool pipe_filled = proc.writeStdin( data, data.length() ); if ( pipe_filled ) { @@ -1208,25 +1208,25 @@ TQString TemplateParser::pipe( const TQString &cmd, const TQString &buf ) return mPipeOut; } -void TemplateParser::onProcessExited( KProcess *proc ) +void TemplateParser::onProcessExited( TDEProcess *proc ) { Q_UNUSED( proc ); // do nothing for now } -void TemplateParser::onReceivedStdout( KProcess *proc, char *buffer, int buflen ) +void TemplateParser::onReceivedStdout( TDEProcess *proc, char *buffer, int buflen ) { Q_UNUSED( proc ); mPipeOut += TQString::fromLocal8Bit( buffer, buflen ); } -void TemplateParser::onReceivedStderr( KProcess *proc, char *buffer, int buflen ) +void TemplateParser::onReceivedStderr( TDEProcess *proc, char *buffer, int buflen ) { Q_UNUSED( proc ); mPipeErr += TQString::fromLocal8Bit( buffer, buflen ); } -void TemplateParser::onWroteStdin( KProcess *proc ) +void TemplateParser::onWroteStdin( TDEProcess *proc ) { proc->closeStdin(); } diff --git a/kmail/templateparser.h b/kmail/templateparser.h index da6a52345..c7551c0fa 100644 --- a/kmail/templateparser.h +++ b/kmail/templateparser.h @@ -27,7 +27,7 @@ class KMMessage; class TQString; class KMFolder; class TQObject; -class KProcess; +class TDEProcess; /** * The TemplateParser transforms a message with a given template. @@ -163,10 +163,10 @@ class TemplateParser : public TQObject TQString "e ) const; protected slots: - void onProcessExited( KProcess *proc ); - void onReceivedStdout( KProcess *proc, char *buffer, int buflen ); - void onReceivedStderr( KProcess *proc, char *buffer, int buflen ); - void onWroteStdin( KProcess *proc ); + void onProcessExited( TDEProcess *proc ); + void onReceivedStdout( TDEProcess *proc, char *buffer, int buflen ); + void onReceivedStderr( TDEProcess *proc, char *buffer, int buflen ); + void onWroteStdin( TDEProcess *proc ); }; #endif // __KMAIL_TEMPLATEPARSER_H__ diff --git a/kmail/templatesconfiguration.cpp b/kmail/templatesconfiguration.cpp index 8b4f37e8f..93e831fab 100644 --- a/kmail/templatesconfiguration.cpp +++ b/kmail/templatesconfiguration.cpp @@ -41,7 +41,7 @@ TemplatesConfiguration::TemplatesConfiguration( TQWidget *parent, const char *name ) :TemplatesConfigurationBase( parent, name ) { - TQFont f = KGlobalSettings::fixedFont(); + TQFont f = TDEGlobalSettings::fixedFont(); textEdit_new->setFont( f ); textEdit_reply->setFont( f ); textEdit_reply_all->setFont( f ); diff --git a/kmail/urlhandlermanager.cpp b/kmail/urlhandlermanager.cpp index ad9c22eb2..8e72b8abd 100644 --- a/kmail/urlhandlermanager.cpp +++ b/kmail/urlhandlermanager.cpp @@ -548,9 +548,9 @@ namespace { TQString displayName, libName, keyId; if ( !foundSMIMEData( url.path() + '#' + url.ref(), displayName, libName, keyId ) ) return false; - KProcess cmp; + TDEProcess cmp; cmp << "kleopatra" << "-query" << keyId; - if ( !cmp.start( KProcess::DontCare ) ) + if ( !cmp.start( TDEProcess::DontCare ) ) KMessageBox::error( w, i18n("Could not start certificate manager. " "Please check your installation."), i18n("KMail Error") ); diff --git a/kmail/vacation.cpp b/kmail/vacation.cpp index d3d374aea..a027c33bc 100644 --- a/kmail/vacation.cpp +++ b/kmail/vacation.cpp @@ -573,7 +573,7 @@ namespace KMail { "\n" "Yours sincerely,\n" "-- \n") - .arg( KGlobal::locale()->formatDate( TQDate::currentDate().addDays( 1 ) ) ); + .arg( TDEGlobal::locale()->formatDate( TQDate::currentDate().addDays( 1 ) ) ); } int Vacation::defaultNotificationInterval() { diff --git a/kmail/xfaceconfigurator.cpp b/kmail/xfaceconfigurator.cpp index 64b165ef2..5279b78b2 100644 --- a/kmail/xfaceconfigurator.cpp +++ b/kmail/xfaceconfigurator.cpp @@ -178,7 +178,7 @@ namespace KMail { mTextEdit = new TQTextEdit( page ); page_vlay->addWidget( mTextEdit ); TQWhatsThis::add( mTextEdit, i18n( "Use this field to enter an arbitrary X-Face string." ) ); - mTextEdit->setFont( KGlobalSettings::fixedFont() ); + mTextEdit->setFont( TDEGlobalSettings::fixedFont() ); mTextEdit->setWrapPolicy( TQTextEdit::Anywhere ); mTextEdit->setTextFormat( TQt::PlainText ); label2 = new KActiveLabel( i18n("Examples are available at http://www.xs4all.nl/~ace/X-Faces/."), page ); -- cgit v1.2.1