diff options
Diffstat (limited to 'kmail/configuredialog.cpp')
| -rw-r--r-- | kmail/configuredialog.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
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; |