summaryrefslogtreecommitdiffstats
path: root/kmail/kmcomposewin.h
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-25 00:37:21 -0600
committerTimothy Pearson <[email protected]>2013-01-25 00:37:21 -0600
commit86d8364ac704bdc8ad2dfcf52307d9626cfac567 (patch)
tree97d3ac2c2f60780d9a1de4f82caac7cb27534501 /kmail/kmcomposewin.h
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.h')
-rw-r--r--kmail/kmcomposewin.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/kmail/kmcomposewin.h b/kmail/kmcomposewin.h
index 02f92154c..840d34347 100644
--- a/kmail/kmcomposewin.h
+++ b/kmail/kmcomposewin.h
@@ -488,8 +488,8 @@ private slots:
/**
* KIO slots for attachment insertion
*/
- void slotAttachFileData(KIO::Job *, const TQByteArray &);
- void slotAttachFileResult(KIO::Job *);
+ void slotAttachFileData(TDEIO::Job *, const TQByteArray &);
+ void slotAttachFileResult(TDEIO::Job *);
void slotListAction(const TQString &);
void slotFontAction(const TQString &);
@@ -829,7 +829,7 @@ private:
TQStringList mFolderNames;
TQValueList<TQGuardedPtr<KMFolder> > mFolderList;
- TQMap<KIO::Job*, KURL> mAttachJobs;
+ TQMap<TDEIO::Job*, KURL> mAttachJobs;
KURL::List mAttachFilesPending;
int mAttachFilesSend;
@@ -893,7 +893,7 @@ private:
bool insert;
TQCString encoding;
};
- TQMap<KIO::Job *, atmLoadData> mMapAtmLoadData;
+ TQMap<TDEIO::Job *, atmLoadData> mMapAtmLoadData;
// These are for passing on methods over the applyChanges calls
KMail::MessageSender::SendMethod mSendMethod;