summaryrefslogtreecommitdiffstats
path: root/kpresenter
diff options
context:
space:
mode:
Diffstat (limited to 'kpresenter')
-rw-r--r--kpresenter/KPrAboutData.h2
-rw-r--r--kpresenter/KPrBackDia.cpp2
-rw-r--r--kpresenter/KPrBackground.cpp2
-rw-r--r--kpresenter/KPrBgSpellCheck.cpp2
-rw-r--r--kpresenter/KPrBrushProperty.cpp2
-rw-r--r--kpresenter/KPrCanvas.cpp10
-rw-r--r--kpresenter/KPrConfig.cpp4
-rw-r--r--kpresenter/KPrCustomSlideShowDia.cpp4
-rw-r--r--kpresenter/KPrDocument.cpp10
-rw-r--r--kpresenter/KPrDuplicateObjDia.cpp2
-rw-r--r--kpresenter/KPrEffectDia.cpp4
-rw-r--r--kpresenter/KPrGeneralProperty.cpp2
-rw-r--r--kpresenter/KPrGotoPage.cpp2
-rw-r--r--kpresenter/KPrImageEffectDia.cpp2
-rw-r--r--kpresenter/KPrImportStyleDia.cpp4
-rw-r--r--kpresenter/KPrMSPresentationSetup.cpp10
-rw-r--r--kpresenter/KPrMarginWidget.cpp2
-rw-r--r--kpresenter/KPrMoveHelpLineDia.cpp2
-rw-r--r--kpresenter/KPrNoteBar.cpp4
-rw-r--r--kpresenter/KPrObject.h2
-rw-r--r--kpresenter/KPrPage.cpp2
-rw-r--r--kpresenter/KPrPenStyleWidget.cpp2
-rw-r--r--kpresenter/KPrPgConfDia.cpp4
-rw-r--r--kpresenter/KPrPieProperty.cpp2
-rw-r--r--kpresenter/KPrPolygonProperty.cpp2
-rw-r--r--kpresenter/KPrPresDurationDia.cpp2
-rw-r--r--kpresenter/KPrPrinterDlg.cpp2
-rw-r--r--kpresenter/KPrPropertyEditor.cpp2
-rw-r--r--kpresenter/KPrRotationDialogImpl.cpp2
-rw-r--r--kpresenter/KPrShadowDialogImpl.cpp2
-rw-r--r--kpresenter/KPrSideBar.cpp4
-rw-r--r--kpresenter/KPrSlideTransitionDia.cpp2
-rw-r--r--kpresenter/KPrTextObject.cpp4
-rw-r--r--kpresenter/KPrTextProperty.cpp2
-rw-r--r--kpresenter/KPrTransEffectDia.cpp2
-rw-r--r--kpresenter/KPrVariableCollection.cpp2
-rw-r--r--kpresenter/KPrView.cpp10
-rw-r--r--kpresenter/KPrWebPresentation.cpp10
-rw-r--r--kpresenter/autoformEdit/AFChoose.cpp2
-rw-r--r--kpresenter/main.cpp2
40 files changed, 68 insertions, 68 deletions
diff --git a/kpresenter/KPrAboutData.h b/kpresenter/KPrAboutData.h
index 53e8365e..f85a74c6 100644
--- a/kpresenter/KPrAboutData.h
+++ b/kpresenter/KPrAboutData.h
@@ -21,7 +21,7 @@
#define KPRESENTER_ABOUTDATA
#include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kofficeversion.h>
static const char* description=I18N_NOOP("KOffice Presentation Tool");
diff --git a/kpresenter/KPrBackDia.cpp b/kpresenter/KPrBackDia.cpp
index a6985239..dd4078e6 100644
--- a/kpresenter/KPrBackDia.cpp
+++ b/kpresenter/KPrBackDia.cpp
@@ -35,7 +35,7 @@
#include <tqdatetime.h>
#include <kcolorbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdefiledialog.h>
#include <kimageio.h>
#include <kbuttonbox.h>
diff --git a/kpresenter/KPrBackground.cpp b/kpresenter/KPrBackground.cpp
index 4b09382a..177553d1 100644
--- a/kpresenter/KPrBackground.cpp
+++ b/kpresenter/KPrBackground.cpp
@@ -38,7 +38,7 @@
#include <stdlib.h>
using namespace std;
#include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <KoStore.h>
#include <KoStoreDevice.h>
#include <KoGenStyles.h>
diff --git a/kpresenter/KPrBgSpellCheck.cpp b/kpresenter/KPrBgSpellCheck.cpp
index 0493c64d..11358ba5 100644
--- a/kpresenter/KPrBgSpellCheck.cpp
+++ b/kpresenter/KPrBgSpellCheck.cpp
@@ -32,7 +32,7 @@ using namespace KSpell2;
#include <kdebug.h>
#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
KPrBgSpellCheck::KPrBgSpellCheck(KPrDocument *_doc)
: KoBgSpellCheck(Broker::openBroker( TDESharedConfig::openConfig( "kpresenterrc" ) ), _doc )
diff --git a/kpresenter/KPrBrushProperty.cpp b/kpresenter/KPrBrushProperty.cpp
index 7734835a..7b7312d0 100644
--- a/kpresenter/KPrBrushProperty.cpp
+++ b/kpresenter/KPrBrushProperty.cpp
@@ -29,7 +29,7 @@
#include <tqwhatsthis.h>
#include <tqwidgetstack.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcolorbutton.h>
#include <kcombobox.h>
diff --git a/kpresenter/KPrCanvas.cpp b/kpresenter/KPrCanvas.cpp
index f98ddb0f..0c119b80 100644
--- a/kpresenter/KPrCanvas.cpp
+++ b/kpresenter/KPrCanvas.cpp
@@ -40,15 +40,15 @@
#include <tdeapplication.h>
#include <kmimemagic.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kprinter.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
-#include <ktempfile.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
+#include <tdetempfile.h>
#include <kdebug.h>
#include <kcursor.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdemultipledrag.h>
#include <tdeconfig.h>
#include <kurl.h>
diff --git a/kpresenter/KPrConfig.cpp b/kpresenter/KPrConfig.cpp
index 23b121a2..fde8efbf 100644
--- a/kpresenter/KPrConfig.cpp
+++ b/kpresenter/KPrConfig.cpp
@@ -25,7 +25,7 @@
#include <tdeapplication.h>
#include <KoUnitWidgets.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <kdialogbase.h>
#include <kiconloader.h>
@@ -67,7 +67,7 @@
#include <tdefontdialog.h>
#include <klineedit.h>
#include <KoRect.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeversion.h>
#include <kurlrequesterdlg.h>
#include <tdelistview.h>
diff --git a/kpresenter/KPrCustomSlideShowDia.cpp b/kpresenter/KPrCustomSlideShowDia.cpp
index 61eebe23..175dfc93 100644
--- a/kpresenter/KPrCustomSlideShowDia.cpp
+++ b/kpresenter/KPrCustomSlideShowDia.cpp
@@ -26,8 +26,8 @@
#include <tqapplication.h>
#include <tqlayout.h>
#include <kdebug.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include "KPrPage.h"
#include "KPrDocument.h"
diff --git a/kpresenter/KPrDocument.cpp b/kpresenter/KPrDocument.cpp
index 098c7eb0..c914b094 100644
--- a/kpresenter/KPrDocument.cpp
+++ b/kpresenter/KPrDocument.cpp
@@ -57,12 +57,12 @@
#include <KoGlobal.h>
#include <tdeapplication.h>
#include <kurldrag.h>
-#include <ktempfile.h>
-#include <klocale.h>
+#include <tdetempfile.h>
+#include <tdelocale.h>
#include <tdefiledialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kprocess.h>
#include <tdeio/netaccess.h>
@@ -99,7 +99,7 @@
#include "KPrBackground.h"
#include "KPrNoteBar.h"
#include "KPrBgSpellCheck.h"
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <KoCommandHistory.h>
#include "KoApplication.h"
#include <KoOasisStyles.h>
diff --git a/kpresenter/KPrDuplicateObjDia.cpp b/kpresenter/KPrDuplicateObjDia.cpp
index 0b0c7646..fe2283b2 100644
--- a/kpresenter/KPrDuplicateObjDia.cpp
+++ b/kpresenter/KPrDuplicateObjDia.cpp
@@ -18,7 +18,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqvbox.h>
#include <tqlayout.h>
#include <tqlabel.h>
diff --git a/kpresenter/KPrEffectDia.cpp b/kpresenter/KPrEffectDia.cpp
index b65b724b..955d249b 100644
--- a/kpresenter/KPrEffectDia.cpp
+++ b/kpresenter/KPrEffectDia.cpp
@@ -39,8 +39,8 @@
#include <tqtooltip.h>
#include <tqwhatsthis.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <kbuttonbox.h>
#include <knuminput.h>
#include <kurlrequester.h>
diff --git a/kpresenter/KPrGeneralProperty.cpp b/kpresenter/KPrGeneralProperty.cpp
index 75671e28..a0e9965a 100644
--- a/kpresenter/KPrGeneralProperty.cpp
+++ b/kpresenter/KPrGeneralProperty.cpp
@@ -26,7 +26,7 @@
#include <tqlineedit.h>
#include <knuminput.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <KoUnitWidgets.h>
#include <KoGeneralPropertyUi.h>
diff --git a/kpresenter/KPrGotoPage.cpp b/kpresenter/KPrGotoPage.cpp
index c170f159..0caacc28 100644
--- a/kpresenter/KPrGotoPage.cpp
+++ b/kpresenter/KPrGotoPage.cpp
@@ -25,7 +25,7 @@
#include <tqlayout.h>
#include <tqpushbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdialog.h>
#include "KPrDocument.h"
diff --git a/kpresenter/KPrImageEffectDia.cpp b/kpresenter/KPrImageEffectDia.cpp
index 078a3918..9f6985e7 100644
--- a/kpresenter/KPrImageEffectDia.cpp
+++ b/kpresenter/KPrImageEffectDia.cpp
@@ -26,7 +26,7 @@
#include <tqimage.h>
#include <kimageeffect.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include <kcolorbutton.h>
diff --git a/kpresenter/KPrImportStyleDia.cpp b/kpresenter/KPrImportStyleDia.cpp
index 1cd4d9ff..fec85967 100644
--- a/kpresenter/KPrImportStyleDia.cpp
+++ b/kpresenter/KPrImportStyleDia.cpp
@@ -18,14 +18,14 @@
* Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include "KPrDocument.h"
#include <tqvbox.h>
#include <tqlayout.h>
#include <tqlineedit.h>
#include <tqpushbutton.h>
#include <tqlistbox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include "KPrImportStyleDia.h"
#include <KoStore.h>
#include <tqfile.h>
diff --git a/kpresenter/KPrMSPresentationSetup.cpp b/kpresenter/KPrMSPresentationSetup.cpp
index f362f03d..3f968768 100644
--- a/kpresenter/KPrMSPresentationSetup.cpp
+++ b/kpresenter/KPrMSPresentationSetup.cpp
@@ -31,7 +31,7 @@
#include "KPrPage.h"
#include <tdeio/netaccess.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <tqdir.h>
#include <tqframe.h>
@@ -48,11 +48,11 @@
#include <tdeapplication.h>
#include <kbuttonbox.h>
#include <kcolorbutton.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
#include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kprogress.h>
#include <kstandarddirs.h>
#include <kurlrequester.h>
diff --git a/kpresenter/KPrMarginWidget.cpp b/kpresenter/KPrMarginWidget.cpp
index 532fbb6e..e4fe30e2 100644
--- a/kpresenter/KPrMarginWidget.cpp
+++ b/kpresenter/KPrMarginWidget.cpp
@@ -26,7 +26,7 @@
#include <tqcheckbox.h>
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include "marginui.h"
diff --git a/kpresenter/KPrMoveHelpLineDia.cpp b/kpresenter/KPrMoveHelpLineDia.cpp
index ba07c8b6..35d8bcd0 100644
--- a/kpresenter/KPrMoveHelpLineDia.cpp
+++ b/kpresenter/KPrMoveHelpLineDia.cpp
@@ -18,7 +18,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqvbox.h>
#include <tqlayout.h>
#include <tqlabel.h>
diff --git a/kpresenter/KPrNoteBar.cpp b/kpresenter/KPrNoteBar.cpp
index 80b93552..9548d259 100644
--- a/kpresenter/KPrNoteBar.cpp
+++ b/kpresenter/KPrNoteBar.cpp
@@ -25,11 +25,11 @@
#include <tqsimplerichtext.h>
#include <tqlabel.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <kprinter.h>
#include <kdebug.h>
#include <ktextedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "KPrNoteBar.h"
#include "KPrView.h"
diff --git a/kpresenter/KPrObject.h b/kpresenter/KPrObject.h
index 7b39be50..99d45009 100644
--- a/kpresenter/KPrObject.h
+++ b/kpresenter/KPrObject.h
@@ -29,7 +29,7 @@
#include "KPrGradient.h"
#include "KoPointArray.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <KoPoint.h>
#include <KoSize.h>
#include <KoRect.h>
diff --git a/kpresenter/KPrPage.cpp b/kpresenter/KPrPage.cpp
index 81c5a412..fc57515d 100644
--- a/kpresenter/KPrPage.cpp
+++ b/kpresenter/KPrPage.cpp
@@ -60,7 +60,7 @@
#include <KoVariable.h>
#include <KoGenStyles.h>
#include <KoXmlWriter.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <tqbuffer.h>
#include <tqregexp.h>
#include <tqfile.h>
diff --git a/kpresenter/KPrPenStyleWidget.cpp b/kpresenter/KPrPenStyleWidget.cpp
index 753b184a..37f4cab7 100644
--- a/kpresenter/KPrPenStyleWidget.cpp
+++ b/kpresenter/KPrPenStyleWidget.cpp
@@ -29,7 +29,7 @@
#include <kcolorbutton.h>
#include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
diff --git a/kpresenter/KPrPgConfDia.cpp b/kpresenter/KPrPgConfDia.cpp
index fa51abf4..1a7b3079 100644
--- a/kpresenter/KPrPgConfDia.cpp
+++ b/kpresenter/KPrPgConfDia.cpp
@@ -42,8 +42,8 @@
#include <tqwhatsthis.h>
#include <kcolorbutton.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include <tqslider.h>
diff --git a/kpresenter/KPrPieProperty.cpp b/kpresenter/KPrPieProperty.cpp
index 7c7e788a..dbb30557 100644
--- a/kpresenter/KPrPieProperty.cpp
+++ b/kpresenter/KPrPieProperty.cpp
@@ -23,7 +23,7 @@
#include <tqlayout.h>
#include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include "global.h"
diff --git a/kpresenter/KPrPolygonProperty.cpp b/kpresenter/KPrPolygonProperty.cpp
index 4d8cf155..40cc785a 100644
--- a/kpresenter/KPrPolygonProperty.cpp
+++ b/kpresenter/KPrPolygonProperty.cpp
@@ -23,7 +23,7 @@
#include <tqlayout.h>
#include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include "polygonpropertyui.h"
diff --git a/kpresenter/KPrPresDurationDia.cpp b/kpresenter/KPrPresDurationDia.cpp
index aae5659e..67936266 100644
--- a/kpresenter/KPrPresDurationDia.cpp
+++ b/kpresenter/KPrPresDurationDia.cpp
@@ -28,7 +28,7 @@
#include <tqlayout.h>
#include <tdelistview.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
KPrPresDurationDia::KPrPresDurationDia( TQWidget *parent, const char *name,
KPrDocument *_doc, TQStringList _durationListString,
diff --git a/kpresenter/KPrPrinterDlg.cpp b/kpresenter/KPrPrinterDlg.cpp
index cf496a15..284b2eed 100644
--- a/kpresenter/KPrPrinterDlg.cpp
+++ b/kpresenter/KPrPrinterDlg.cpp
@@ -26,7 +26,7 @@
// KDE includes
#include <kdebug.h>
#include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqtooltip.h>
// local includes
diff --git a/kpresenter/KPrPropertyEditor.cpp b/kpresenter/KPrPropertyEditor.cpp
index 80681763..841b6841 100644
--- a/kpresenter/KPrPropertyEditor.cpp
+++ b/kpresenter/KPrPropertyEditor.cpp
@@ -33,7 +33,7 @@
#include "KPrTextProperty.h"
#include "KPrObjectProperties.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstdguiitem.h>
KPrPropertyEditor::KPrPropertyEditor( TQWidget *parent, const char *name, KPrPage *page, KPrDocument *doc )
diff --git a/kpresenter/KPrRotationDialogImpl.cpp b/kpresenter/KPrRotationDialogImpl.cpp
index 3e28c748..e6521ed7 100644
--- a/kpresenter/KPrRotationDialogImpl.cpp
+++ b/kpresenter/KPrRotationDialogImpl.cpp
@@ -26,7 +26,7 @@
#include <kiconloader.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include "KPrRotationDialogImpl.h"
diff --git a/kpresenter/KPrShadowDialogImpl.cpp b/kpresenter/KPrShadowDialogImpl.cpp
index e46e80fd..d2730665 100644
--- a/kpresenter/KPrShadowDialogImpl.cpp
+++ b/kpresenter/KPrShadowDialogImpl.cpp
@@ -5,7 +5,7 @@
#include <tqbuttongroup.h>
#include <kcolorbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "KPrShadowDialogImpl.h"
#include "KPrTextPreview.h"
diff --git a/kpresenter/KPrSideBar.cpp b/kpresenter/KPrSideBar.cpp
index 00ee8139..96783d8d 100644
--- a/kpresenter/KPrSideBar.cpp
+++ b/kpresenter/KPrSideBar.cpp
@@ -30,8 +30,8 @@
#include <tqtooltip.h>
#include <kwordwrap.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <kinputdialog.h>
#include <knotifyclient.h>
#include <kiconview.h>
diff --git a/kpresenter/KPrSlideTransitionDia.cpp b/kpresenter/KPrSlideTransitionDia.cpp
index 88d1c9ac..8dd46db5 100644
--- a/kpresenter/KPrSlideTransitionDia.cpp
+++ b/kpresenter/KPrSlideTransitionDia.cpp
@@ -22,7 +22,7 @@
#include "KPrSlideTransitionDia.h"
#include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include <kstandarddirs.h>
#include <kurlrequester.h>
diff --git a/kpresenter/KPrTextObject.cpp b/kpresenter/KPrTextObject.cpp
index 35961bab..2d02f6cc 100644
--- a/kpresenter/KPrTextObject.cpp
+++ b/kpresenter/KPrTextObject.cpp
@@ -42,8 +42,8 @@
#include "KPrTextObjectIface.h"
#include <KoOasisContext.h>
#include <KoStyleStack.h>
-#include <ktempfile.h>
-#include <klocale.h>
+#include <tdetempfile.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tdeversion.h>
#include <tdemultipledrag.h>
diff --git a/kpresenter/KPrTextProperty.cpp b/kpresenter/KPrTextProperty.cpp
index a0610cec..c69c39a1 100644
--- a/kpresenter/KPrTextProperty.cpp
+++ b/kpresenter/KPrTextProperty.cpp
@@ -25,7 +25,7 @@
#include <tqcheckbox.h>
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include "KPrMarginWidget.h"
diff --git a/kpresenter/KPrTransEffectDia.cpp b/kpresenter/KPrTransEffectDia.cpp
index b4f9d144..aeee98bc 100644
--- a/kpresenter/KPrTransEffectDia.cpp
+++ b/kpresenter/KPrTransEffectDia.cpp
@@ -47,7 +47,7 @@
#include <kdebug.h>
#include <kurlrequester.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include <kiconloader.h>
#include <kurl.h>
diff --git a/kpresenter/KPrVariableCollection.cpp b/kpresenter/KPrVariableCollection.cpp
index d7312e75..50be1efa 100644
--- a/kpresenter/KPrVariableCollection.cpp
+++ b/kpresenter/KPrVariableCollection.cpp
@@ -22,7 +22,7 @@
#include <KoVariable.h>
#include "KPrDocument.h"
#include "KPrCommand.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <KoXmlNS.h>
#include <KoDom.h>
diff --git a/kpresenter/KPrView.cpp b/kpresenter/KPrView.cpp
index 6f2e2358..583b7af7 100644
--- a/kpresenter/KPrView.cpp
+++ b/kpresenter/KPrView.cpp
@@ -20,7 +20,7 @@
#include <kprinter.h>
#include <tdeaccel.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <tqpainter.h>
#include <tqscrollbar.h>
#include <tqpopupmenu.h>
@@ -65,7 +65,7 @@
#include <dcopclient.h>
#include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstdaction.h>
#include <tdeapplication.h>
#include <tdeio/netaccess.h>
@@ -76,15 +76,15 @@
#include "KPrMSPresentationSetup.h"
#include "KPrTextObject.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcolordialog.h>
#include <tdeconfig.h>
#include <tdefontdialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kimageio.h>
#include <tdeparts/event.h>
#include <kdebug.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kcolorbutton.h>
#include <kprocess.h>
diff --git a/kpresenter/KPrWebPresentation.cpp b/kpresenter/KPrWebPresentation.cpp
index 6f93acba..90053b31 100644
--- a/kpresenter/KPrWebPresentation.cpp
+++ b/kpresenter/KPrWebPresentation.cpp
@@ -30,7 +30,7 @@
#include <kstandarddirs.h>
#include <unistd.h>
#include <sys/types.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <tqfile.h>
#include <tqtextstream.h>
@@ -54,16 +54,16 @@
#include <tqcheckbox.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcolorbutton.h>
#include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kbuttonbox.h>
#include <ksimpleconfig.h>
#include <tdeapplication.h>
#include <kprogress.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
#include <kcharsets.h>
#include <kurlrequester.h>
#include <klineedit.h>
diff --git a/kpresenter/autoformEdit/AFChoose.cpp b/kpresenter/autoformEdit/AFChoose.cpp
index 9c4e2e5e..3e8543c9 100644
--- a/kpresenter/autoformEdit/AFChoose.cpp
+++ b/kpresenter/autoformEdit/AFChoose.cpp
@@ -26,7 +26,7 @@
#include <tqdir.h>
#include <tqwhatsthis.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <ksimpleconfig.h>
#include <kdebug.h>
#include <kstandarddirs.h>
diff --git a/kpresenter/main.cpp b/kpresenter/main.cpp
index 4113d341..b3ab9ec8 100644
--- a/kpresenter/main.cpp
+++ b/kpresenter/main.cpp
@@ -23,7 +23,7 @@
#include <dcopclient.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
static const TDECmdLineOptions options[]=