summaryrefslogtreecommitdiffstats
path: root/kmail/kmcomposewin.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kmail/kmcomposewin.cpp')
-rw-r--r--kmail/kmcomposewin.cpp58
1 files changed, 29 insertions, 29 deletions
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 );
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-15 09:42:16 +0000