summaryrefslogtreecommitdiffstats
path: root/kmail
diff options
context:
space:
mode:
Diffstat (limited to 'kmail')
-rw-r--r--kmail/CMakeLists.txt2
-rw-r--r--kmail/Makefile.am2
-rw-r--r--kmail/configuredialog.cpp2
-rw-r--r--kmail/kmcomposewin.cpp6
-rw-r--r--kmail/kmfilterdlg.cpp2
-rw-r--r--kmail/kmkernel.cpp2
-rw-r--r--kmail/kmmainwidget.cpp2
-rw-r--r--kmail/kmmainwin.h2
-rw-r--r--kmail/kmreadermainwin.cpp2
-rw-r--r--kmail/kmsystemtray.cpp2
-rw-r--r--kmail/kwindowpositioner.cpp4
-rw-r--r--kmail/mailsourceviewer.cpp2
-rw-r--r--kmail/managesievescriptsdialog.cpp2
-rw-r--r--kmail/recipientseditor.cpp2
-rw-r--r--kmail/recipientspicker.cpp2
-rw-r--r--kmail/searchwindow.cpp2
-rw-r--r--kmail/vacationdialog.cpp2
17 files changed, 20 insertions, 20 deletions
diff --git a/kmail/CMakeLists.txt b/kmail/CMakeLists.txt
index 8f32abcbb..372a05233 100644
--- a/kmail/CMakeLists.txt
+++ b/kmail/CMakeLists.txt
@@ -168,7 +168,7 @@ set( ${target}_SRCS
warningconfiguration.ui smimeconfiguration.ui annotationjobs.cpp accountcombobox.cpp
redirectdialog.cpp foldershortcutdialog.cpp folderrequester.cpp spamheaderanalyzer.cpp
antispamconfig.cpp replyphrases.kcfgc custommimeheader.kcfgc recipientseditor.cpp
- recipientspicker.cpp kwindowpositioner.cpp textsource.cpp distributionlistdialog.cpp
+ recipientspicker.cpp twindowpositioner.cpp textsource.cpp distributionlistdialog.cpp
expirypropertiesdialog.cpp scalix.cpp mailinglistpropertiesdialog.cpp newfolderdialog.cpp
accountwizard.cpp managesievescriptsdialog.cpp chiasmuskeyselector.cpp
util.cpp templatesinsertcommand.cpp customtemplates_base.ui customtemplates.cpp
diff --git a/kmail/Makefile.am b/kmail/Makefile.am
index 62bad8340..0bcdbefac 100644
--- a/kmail/Makefile.am
+++ b/kmail/Makefile.am
@@ -124,7 +124,7 @@ libkmailprivate_la_SOURCES = kmmessage.cpp kmmainwin.cpp configuredialog.cpp \
spamheaderanalyzer.cpp antispamconfig.cpp \
replyphrases.kcfgc custommimeheader.kcfgc \
recipientseditor.cpp \
- recipientspicker.cpp kwindowpositioner.cpp \
+ recipientspicker.cpp twindowpositioner.cpp \
distributionlistdialog.cpp expirypropertiesdialog.cpp \
mailinglistpropertiesdialog.cpp newfolderdialog.cpp \
accountwizard.cpp textsource.cpp \
diff --git a/kmail/configuredialog.cpp b/kmail/configuredialog.cpp
index 549ef94de..03bd834d8 100644
--- a/kmail/configuredialog.cpp
+++ b/kmail/configuredialog.cpp
@@ -94,7 +94,7 @@ using KMime::DateFormatter;
#include <kseparator.h>
#include <kiconloader.h>
#include <kstandarddirs.h>
-#include <kwin.h>
+#include <twin.h>
#include <knotifydialog.h>
#include <kconfig.h>
#include <kactivelabel.h>
diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp
index 06010fb31..cc8059ccd 100644
--- a/kmail/kmcomposewin.cpp
+++ b/kmail/kmcomposewin.cpp
@@ -86,7 +86,7 @@ using KRecentAddress::RecentAddresses;
#include <kkeydialog.h>
#include <kdebug.h>
#include <kfiledialog.h>
-#include <kwin.h>
+#include <twin.h>
#include <kinputdialog.h>
#include <kmessagebox.h>
#include <kurldrag.h>
@@ -4979,7 +4979,7 @@ void KMComposeWin::slotSpellcheckConfig()
KDialogBase dlg(KDialogBase::Plain, i18n("Spellchecker"),
KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok,
TQT_TQWIDGET(this), 0, true, true );
- KWin kwin;
+ KWin twin;
TQTabDialog qtd (this, "tabdialog", true);
KSpellConfig mKSpellConfig (&qtd);
mKSpellConfig.tqlayout()->setMargin( KDialog::marginHint() );
@@ -4987,7 +4987,7 @@ void KMComposeWin::slotSpellcheckConfig()
qtd.addTab (&mKSpellConfig, i18n("Spellchecker"));
qtd.setCancelButton ();
- kwin.setIcons (qtd.winId(), kapp->icon(), kapp->miniIcon());
+ twin.setIcons (qtd.winId(), kapp->icon(), kapp->miniIcon());
qtd.setCancelButton(KStdGuiItem::cancel().text());
qtd.setOkButton(KStdGuiItem::ok().text());
diff --git a/kmail/kmfilterdlg.cpp b/kmail/kmfilterdlg.cpp
index c730375e4..b9d0e5060 100644
--- a/kmail/kmfilterdlg.cpp
+++ b/kmail/kmfilterdlg.cpp
@@ -25,7 +25,7 @@ using KMail::FilterImporterExporter;
#include <kinputdialog.h>
#include <kiconloader.h>
#include <kapplication.h>
-#include <kwin.h>
+#include <twin.h>
#include <kconfig.h>
#include <kicondialog.h>
#include <kkeybutton.h>
diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp
index 5bc83e7c9..54334d8ac 100644
--- a/kmail/kmkernel.cpp
+++ b/kmail/kmkernel.cpp
@@ -46,7 +46,7 @@ using KRecentAddress::RecentAddresses;
#include "transportmanager.h"
#include "importarchivedialog.h"
-#include <kwin.h>
+#include <twin.h>
#include "kmailicalifaceimpl.h"
#include "mailserviceimpl.h"
using KMail::MailServiceImpl;
diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp
index 6c46f14a6..fc782fbb2 100644
--- a/kmail/kmmainwidget.cpp
+++ b/kmail/kmmainwidget.cpp
@@ -6,7 +6,7 @@
#include <config.h>
#endif
-#include <kwin.h>
+#include <twin.h>
#ifdef MALLOC_DEBUG
#include <malloc.h>
diff --git a/kmail/kmmainwin.h b/kmail/kmmainwin.h
index 1cafbc3da..4e784e121 100644
--- a/kmail/kmmainwin.h
+++ b/kmail/kmmainwin.h
@@ -39,7 +39,7 @@ class KMMainWin : public KMainWindow
public:
// the main window needs to have a name since else restoring the window
- // settings by kwin doesn't work
+ // settings by twin doesn't work
KMMainWin(TQWidget *parent = 0);
virtual ~KMMainWin();
KMMainWidget *mainKMWidget() const { return mKMMainWidget; };
diff --git a/kmail/kmreadermainwin.cpp b/kmail/kmreadermainwin.cpp
index af62b411d..92ab049ca 100644
--- a/kmail/kmreadermainwin.cpp
+++ b/kmail/kmreadermainwin.cpp
@@ -31,7 +31,7 @@
#include <kedittoolbar.h>
#include <klocale.h>
#include <kstdaccel.h>
-#include <kwin.h>
+#include <twin.h>
#include <kaction.h>
#include <kiconloader.h>
#include <kdebug.h>
diff --git a/kmail/kmsystemtray.cpp b/kmail/kmsystemtray.cpp
index 6bd99f991..d7bba197b 100644
--- a/kmail/kmsystemtray.cpp
+++ b/kmail/kmsystemtray.cpp
@@ -33,7 +33,7 @@ using KMail::AccountManager;
#include <kglobalsettings.h>
#include <kiconloader.h>
#include <kiconeffect.h>
-#include <kwin.h>
+#include <twin.h>
#include <kdebug.h>
#include <kpopupmenu.h>
diff --git a/kmail/kwindowpositioner.cpp b/kmail/kwindowpositioner.cpp
index 4fb399479..fbcb97607 100644
--- a/kmail/kwindowpositioner.cpp
+++ b/kmail/kwindowpositioner.cpp
@@ -19,7 +19,7 @@
Boston, MA 02110-1301, USA.
*/
-#include "kwindowpositioner.h"
+#include "twindowpositioner.h"
#include <kdebug.h>
@@ -57,4 +57,4 @@ void KWindowPositioner::reposition()
mSlave->raise();
}
-#include "kwindowpositioner.moc"
+#include "twindowpositioner.moc"
diff --git a/kmail/mailsourceviewer.cpp b/kmail/mailsourceviewer.cpp
index 0f0d0536f..d2469348c 100644
--- a/kmail/mailsourceviewer.cpp
+++ b/kmail/mailsourceviewer.cpp
@@ -36,7 +36,7 @@
#include "mailsourceviewer.h"
#include <kapplication.h>
-#include <kwin.h>
+#include <twin.h>
#include <tqregexp.h>
#include <tqaccel.h>
diff --git a/kmail/managesievescriptsdialog.cpp b/kmail/managesievescriptsdialog.cpp
index 317429d52..b65acadf8 100644
--- a/kmail/managesievescriptsdialog.cpp
+++ b/kmail/managesievescriptsdialog.cpp
@@ -9,7 +9,7 @@
#include <klocale.h>
#include <kiconloader.h>
-#include <kwin.h>
+#include <twin.h>
#include <kapplication.h>
#include <kinputdialog.h>
#include <kglobalsettings.h>
diff --git a/kmail/recipientseditor.cpp b/kmail/recipientseditor.cpp
index 04a695a95..5b18e044b 100644
--- a/kmail/recipientseditor.cpp
+++ b/kmail/recipientseditor.cpp
@@ -25,7 +25,7 @@
#include "recipientseditor.h"
#include "recipientspicker.h"
-#include "kwindowpositioner.h"
+#include "twindowpositioner.h"
#include "distributionlistdialog.h"
#include "globalsettings.h"
diff --git a/kmail/recipientspicker.cpp b/kmail/recipientspicker.cpp
index 03a34d776..6d00e41c4 100644
--- a/kmail/recipientspicker.cpp
+++ b/kmail/recipientspicker.cpp
@@ -37,7 +37,7 @@
#include <kabc/resource.h>
#include <kiconloader.h>
#include <kdialog.h>
-#include <kwin.h>
+#include <twin.h>
#include <kmessagebox.h>
#include <tqlayout.h>
diff --git a/kmail/searchwindow.cpp b/kmail/searchwindow.cpp
index 8714109c3..ff2248832 100644
--- a/kmail/searchwindow.cpp
+++ b/kmail/searchwindow.cpp
@@ -38,7 +38,7 @@
#include <kapplication.h>
#include <kdebug.h>
#include <kstatusbar.h>
-#include <kwin.h>
+#include <twin.h>
#include <kconfig.h>
#include <kstdaction.h>
#include <kiconloader.h>
diff --git a/kmail/vacationdialog.cpp b/kmail/vacationdialog.cpp
index 87e1d8411..e214a46cd 100644
--- a/kmail/vacationdialog.cpp
+++ b/kmail/vacationdialog.cpp
@@ -27,7 +27,7 @@ using KMime::HeaderParsing::parseAddressList;
#include <knuminput.h>
#include <klocale.h>
#include <kdebug.h>
-#include <kwin.h>
+#include <twin.h>
#include <kapplication.h>
#include <tqlayout.h>