summaryrefslogtreecommitdiffstats
path: root/kmail/kmcomposewin.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:37:21 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:37:21 -0600
commit86d8364ac704bdc8ad2dfcf52307d9626cfac567 (patch)
tree97d3ac2c2f60780d9a1de4f82caac7cb27534501 /kmail/kmcomposewin.cpp
parenta9bde819f2b421dcc44741156e75eca4bb5fb4f4 (diff)
downloadtdepim-86d8364ac704bdc8ad2dfcf52307d9626cfac567.tar.gz
tdepim-86d8364ac704bdc8ad2dfcf52307d9626cfac567.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
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 31d36b4d3..0857ae2bd 100644
--- a/kmail/kmcomposewin.cpp
+++ b/kmail/kmcomposewin.cpp
@@ -344,7 +344,7 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id )
mSignatureStateIndicator->setAlignment( TQt::AlignHCenter );
hbox->addWidget( mSignatureStateIndicator );
- KConfigGroup reader( KMKernel::config(), "Reader" );
+ TDEConfigGroup reader( KMKernel::config(), "Reader" );
TQPalette p( mSignatureStateIndicator->palette() );
TQColor defaultSignedColor( 0x40, 0xFF, 0x40 ); // light green // pgp ok, trusted key
@@ -505,10 +505,10 @@ KMComposeWin::~KMComposeWin()
delete mMsg;
mMsg = 0;
}
- TQMap<KIO::Job*, atmLoadData>::Iterator it = mMapAtmLoadData.begin();
+ TQMap<TDEIO::Job*, atmLoadData>::Iterator it = mMapAtmLoadData.begin();
while ( it != mMapAtmLoadData.end() )
{
- KIO::Job *job = it.key();
+ TDEIO::Job *job = it.key();
mMapAtmLoadData.remove( it );
job->kill();
it = mMapAtmLoadData.begin();
@@ -797,7 +797,7 @@ void KMComposeWin::writeConfig(void)
GlobalSettings::self()->setComposerSize( size() );
GlobalSettings::self()->setShowSnippetManager( mSnippetAction->isChecked() );
- KConfigGroupSaver saver( KMKernel::config(), "Geometry" );
+ TDEConfigGroupSaver saver( KMKernel::config(), "Geometry" );
saveMainWindowSettings( KMKernel::config(), "Composer" );
GlobalSettings::setSnippetSplitterPosition( mSnippetSplitter->sizes() );
@@ -2384,7 +2384,7 @@ Kleo::CryptoMessageFormat KMComposeWin::cryptoMessageFormat() const {
bool KMComposeWin::encryptToSelf() const {
// return !Kpgp::Module::getKpgp() || Kpgp::Module::getKpgp()->encryptToSelf();
- KConfigGroup group( KMKernel::config(), "Composer" );
+ TDEConfigGroup group( KMKernel::config(), "Composer" );
return group.readBoolEntry( "crypto-encrypt-to-self", true );
}
@@ -2410,8 +2410,8 @@ bool KMComposeWin::addAttach(const KURL aUrl)
return false;
}
- KIO::TransferJob *job = KIO::get(aUrl);
- KIO::Scheduler::scheduleJob( job );
+ TDEIO::TransferJob *job = TDEIO::get(aUrl);
+ TDEIO::Scheduler::scheduleJob( job );
atmLoadData ld;
ld.url = aUrl;
ld.data = TQByteArray();
@@ -2421,10 +2421,10 @@ bool KMComposeWin::addAttach(const KURL aUrl)
mMapAtmLoadData.insert(job, ld);
mAttachJobs[job] = aUrl;
- connect(job, TQT_SIGNAL(result(KIO::Job *)),
- TQT_TQOBJECT(this), TQT_SLOT(slotAttachFileResult(KIO::Job *)));
- connect(job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
- TQT_TQOBJECT(this), TQT_SLOT(slotAttachFileData(KIO::Job *, const TQByteArray &)));
+ connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+ TQT_TQOBJECT(this), TQT_SLOT(slotAttachFileResult(TDEIO::Job *)));
+ connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+ TQT_TQOBJECT(this), TQT_SLOT(slotAttachFileData(TDEIO::Job *, const TQByteArray &)));
return true;
}
@@ -2496,7 +2496,7 @@ void KMComposeWin::msgPartToItem(const KMMessagePart* msgPart,
lvi->setText(0, msgPart->fileName());
else
lvi->setText(0, msgPart->name());
- lvi->setText(1, KIO::convertSize( msgPart->decodedSize()));
+ lvi->setText(1, TDEIO::convertSize( msgPart->decodedSize()));
lvi->setText(2, msgPart->contentTransferEncodingStr());
lvi->setText(3, prettyMimeType(msgPart->typeStr() + "/" + msgPart->subtypeStr()));
lvi->setAttachmentSize(msgPart->decodedSize());
@@ -2753,7 +2753,7 @@ void KMComposeWin::slotAttachFile()
TQString recent;
KURL recentURL = KFileDialog::getStartURL( TQString(), recent );
if ( !recentURL.url().isEmpty() &&
- !KIO::NetAccess::exists( recentURL, true, this ) ) {
+ !TDEIO::NetAccess::exists( recentURL, true, this ) ) {
recentURL = KURL( TQDir::homeDirPath() );
}
@@ -2771,9 +2771,9 @@ void KMComposeWin::slotAttachFile()
//-----------------------------------------------------------------------------
-void KMComposeWin::slotAttachFileData(KIO::Job *job, const TQByteArray &data)
+void KMComposeWin::slotAttachFileData(TDEIO::Job *job, const TQByteArray &data)
{
- TQMap<KIO::Job*, atmLoadData>::Iterator it = mMapAtmLoadData.find(job);
+ TQMap<TDEIO::Job*, atmLoadData>::Iterator it = mMapAtmLoadData.find(job);
assert(it != mMapAtmLoadData.end());
TQBuffer buff((*it).data);
buff.open(IO_WriteOnly | IO_Append);
@@ -2783,12 +2783,12 @@ void KMComposeWin::slotAttachFileData(KIO::Job *job, const TQByteArray &data)
//-----------------------------------------------------------------------------
-void KMComposeWin::slotAttachFileResult(KIO::Job *job)
+void KMComposeWin::slotAttachFileResult(TDEIO::Job *job)
{
- TQMap<KIO::Job*, atmLoadData>::Iterator it = mMapAtmLoadData.find(job);
+ TQMap<TDEIO::Job*, atmLoadData>::Iterator it = mMapAtmLoadData.find(job);
assert(it != mMapAtmLoadData.end());
KURL attachURL;
- TQMap<KIO::Job*, KURL>::iterator jit = mAttachJobs.find(job);
+ TQMap<TDEIO::Job*, KURL>::iterator jit = mAttachJobs.find(job);
bool attachURLfound = (jit != mAttachJobs.end());
if (attachURLfound)
{
@@ -2834,7 +2834,7 @@ void KMComposeWin::slotAttachFileResult(KIO::Job *job)
KCursorSaver busy(KBusyPtr::busy());
TQString name( (*it).url.fileName() );
// ask the job for the mime type of the file
- TQString mimeType = static_cast<KIO::MimetypeJob*>(job)->mimetype();
+ TQString mimeType = static_cast<TDEIO::MimetypeJob*>(job)->mimetype();
if ( name.isEmpty() ) {
// URL ends with '/' (e.g. http://www.kde.org/)
@@ -2901,7 +2901,7 @@ void KMComposeWin::slotAttachFileResult(KIO::Job *job)
}
// show message part dialog, if not configured away (default):
- KConfigGroup composer(KMKernel::config(), "Composer");
+ TDEConfigGroup composer(KMKernel::config(), "Composer");
if ( GlobalSettings::self()->showMessagePartDialogOnAttach() ) {
const KCursorSaver saver( TQCursor::ArrowCursor );
KMMsgPartDialogCompat dlg(mMainWidget);
@@ -2955,8 +2955,8 @@ void KMComposeWin::slotInsertFile()
mRecentAction->addURL(u);
// Prevent race condition updating list when multiple composers are open
{
- KConfig *config = KMKernel::config();
- KConfigGroupSaver saver( config, "Composer" );
+ TDEConfig *config = KMKernel::config();
+ TDEConfigGroupSaver saver( config, "Composer" );
TQString encoding = TDEGlobal::charsets()->encodingForName(combo->currentText()).latin1();
TQStringList urls = config->readListEntry( "recent-urls" );
TQStringList encodings = config->readListEntry( "recent-encodings" );
@@ -2987,15 +2987,15 @@ void KMComposeWin::slotInsertRecentFile(const KURL& u)
{
if (u.fileName().isEmpty()) return;
- KIO::Job *job = KIO::get(u);
+ TDEIO::Job *job = TDEIO::get(u);
atmLoadData ld;
ld.url = u;
ld.data = TQByteArray();
ld.insert = true;
// Get the encoding previously used when inserting this file
{
- KConfig *config = KMKernel::config();
- KConfigGroupSaver saver( config, "Composer" );
+ TDEConfig *config = KMKernel::config();
+ TDEConfigGroupSaver saver( config, "Composer" );
TQStringList urls = config->readListEntry( "recent-urls" );
TQStringList encodings = config->readListEntry( "recent-encodings" );
int index = urls.findIndex( u.prettyURL() );
@@ -3005,10 +3005,10 @@ void KMComposeWin::slotInsertRecentFile(const KURL& u)
}
}
mMapAtmLoadData.insert(job, ld);
- connect(job, TQT_SIGNAL(result(KIO::Job *)),
- TQT_TQOBJECT(this), TQT_SLOT(slotAttachFileResult(KIO::Job *)));
- connect(job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
- TQT_TQOBJECT(this), TQT_SLOT(slotAttachFileData(KIO::Job *, const TQByteArray &)));
+ connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+ TQT_TQOBJECT(this), TQT_SLOT(slotAttachFileResult(TDEIO::Job *)));
+ connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+ TQT_TQOBJECT(this), TQT_SLOT(slotAttachFileData(TDEIO::Job *, const TQByteArray &)));
}