Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase

19 files changed, 36 insertions, 36 deletions

diff --git a/tdeprint/kjobviewer/kjobviewer.cpp b/tdeprint/kjobviewer/kjobviewer.cpp
index 73613dfe8..0d456b1ec 100644
--- a/tdeprint/kjobviewer/kjobviewer.cpp
+++ b/tdeprint/kjobviewer/kjobviewer.cpp
@@ -26,14 +26,14 @@
 #include <tqpixmap.h>
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <ksystemtray.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <tdepopupmenu.h>
 #include <twin.h>
-#include <kstartupinfo.h>
+#include <tdestartupinfo.h>
 
 class JobTray : public KSystemTray
 {
diff --git a/tdeprint/kjobviewer/main.cpp b/tdeprint/kjobviewer/main.cpp
index ed1b4f3bb..a7e43fe81 100644
--- a/tdeprint/kjobviewer/main.cpp
+++ b/tdeprint/kjobviewer/main.cpp
@@ -22,7 +22,7 @@
 #include <tdeaboutdata.h>
 
 #include "kjobviewer.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <stdlib.h>
 
 static TDECmdLineOptions options[] = {
diff --git a/tdeprint/kprinter/main.cpp b/tdeprint/kprinter/main.cpp
index 95ab3bac1..fd528b705 100644
--- a/tdeprint/kprinter/main.cpp
+++ b/tdeprint/kprinter/main.cpp
@@ -22,7 +22,7 @@
 #include <tqtimer.h>
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 static TDECmdLineOptions options[] =
 {
diff --git a/tdeprint/kprinter/printwrapper.cpp b/tdeprint/kprinter/printwrapper.cpp
index 78370ccc6..102951ffd 100644
--- a/tdeprint/kprinter/printwrapper.cpp
+++ b/tdeprint/kprinter/printwrapper.cpp
@@ -26,7 +26,7 @@
 #include <tqstring.h>
 #include <tqstringlist.h>
 #include <stdlib.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqfile.h>
 #include <tqtimer.h>
 #include <tqregexp.h>
@@ -34,12 +34,12 @@
 
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdeio/netaccess.h>
 #include <kurl.h>
 #include <kdebug.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include <kprinter.h>
 #include <tdeprint/kmmanager.h>
diff --git a/tdeprint/printmgr/kcmprintmgr.cpp b/tdeprint/printmgr/kcmprintmgr.cpp
index 02954e1bf..75fc42742 100644
--- a/tdeprint/printmgr/kcmprintmgr.cpp
+++ b/tdeprint/printmgr/kcmprintmgr.cpp
@@ -25,7 +25,7 @@
 #include <kgenericfactory.h>
 #include <tdeaboutdata.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 typedef KGenericFactory<KCMPrintMgr, TQWidget> KPrintMgrFactory;
 K_EXPORT_COMPONENT_FACTORY( kcm_printmgr, KPrintMgrFactory("kcmprintmgr") )
diff --git a/tdeprint/slave/tdeio_print.cpp b/tdeprint/slave/tdeio_print.cpp
index cfbd0570e..1106b8028 100644
--- a/tdeprint/slave/tdeio_print.cpp
+++ b/tdeprint/slave/tdeio_print.cpp
@@ -26,7 +26,7 @@
 
 #include <tqfile.h>
 #include <tqtextstream.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kinstance.h>
 #include <tdeio/global.h>
@@ -38,7 +38,7 @@
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
 #include <kprocess.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tqfile.h>
 #include <tqdom.h>
 
diff --git a/tdeprint/tdeprint_part/printpart.cpp b/tdeprint/tdeprint_part/printpart.cpp
index 2de7b3190..3ae57e7ab 100644
--- a/tdeprint/tdeprint_part/printpart.cpp
+++ b/tdeprint/tdeprint_part/printpart.cpp
@@ -22,7 +22,7 @@
 #include <tdeprint/kmmainview.h>
 #include <tdeprint/kiconselectaction.h>
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kinstance.h>
 #include <kiconloader.h>
 #include <tdeaboutdata.h>
diff --git a/tdeprint/tdeprintfax/CMakeLists.txt b/tdeprint/tdeprintfax/CMakeLists.txt
index 538719474..e2ca9a90a 100644
--- a/tdeprint/tdeprintfax/CMakeLists.txt
+++ b/tdeprint/tdeprintfax/CMakeLists.txt
@@ -37,6 +37,6 @@ tde_add_executable( tdeprintfax AUTOMOC
     confgeneral.cpp configdlg.cpp conffax.cpp
     confsystem.cpp conffilters.cpp filterdlg.cpp
     defcmds.cpp
-  LINK kabc-shared tdeprint-shared
+  LINK tdeabc-shared tdeprint-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/tdeprint/tdeprintfax/conffax.cpp b/tdeprint/tdeprintfax/conffax.cpp
index 26b6b77ab..6c0266f54 100644
--- a/tdeprint/tdeprintfax/conffax.cpp
+++ b/tdeprint/tdeprintfax/conffax.cpp
@@ -26,9 +26,9 @@
 #include <tqlayout.h>
 #include <tqprinter.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kseparator.h>
 
 #include <stdlib.h>
diff --git a/tdeprint/tdeprintfax/conffilters.cpp b/tdeprint/tdeprintfax/conffilters.cpp
index 4937b88ba..64ce6ee7d 100644
--- a/tdeprint/tdeprintfax/conffilters.cpp
+++ b/tdeprint/tdeprintfax/conffilters.cpp
@@ -29,11 +29,11 @@
 #include <tqregexp.h>
 #include <tqheader.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 #include <kiconloader.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 ConfFilters::ConfFilters(TQWidget *parent, const char *name)
 : TQWidget(parent, name)
diff --git a/tdeprint/tdeprintfax/confgeneral.cpp b/tdeprint/tdeprintfax/confgeneral.cpp
index d7471fc5d..ad7512d8d 100644
--- a/tdeprint/tdeprintfax/confgeneral.cpp
+++ b/tdeprint/tdeprintfax/confgeneral.cpp
@@ -25,9 +25,9 @@
 #include <tqlayout.h>
 #include <tqcheckbox.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kseparator.h>
 
 #include <stdlib.h>
diff --git a/tdeprint/tdeprintfax/configdlg.cpp b/tdeprint/tdeprintfax/configdlg.cpp
index 57f5ac64e..f2dae996a 100644
--- a/tdeprint/tdeprintfax/configdlg.cpp
+++ b/tdeprint/tdeprintfax/configdlg.cpp
@@ -25,7 +25,7 @@
 #include "conffilters.h"
 
 #include <tqvbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 
 ConfigDlg::ConfigDlg(TQWidget *parent, const char *name)
diff --git a/tdeprint/tdeprintfax/confsystem.cpp b/tdeprint/tdeprintfax/confsystem.cpp
index 167e8b6f7..fbb27aac9 100644
--- a/tdeprint/tdeprintfax/confsystem.cpp
+++ b/tdeprint/tdeprintfax/confsystem.cpp
@@ -26,9 +26,9 @@
 #include <tqlayout.h> 
 #include <tqcombobox.h>
  
-#include <kglobal.h> 
+#include <tdeglobal.h> 
 #include <tdeconfig.h> 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kseparator.h>
 
 #include <stdlib.h>
diff --git a/tdeprint/tdeprintfax/faxab.cpp b/tdeprint/tdeprintfax/faxab.cpp
index 4385827d4..14b87a447 100644
--- a/tdeprint/tdeprintfax/faxab.cpp
+++ b/tdeprint/tdeprintfax/faxab.cpp
@@ -25,13 +25,13 @@
 #include <kpushbutton.h>
 #include <tdelistview.h>
 #include <tqheader.h>
-#include <klocale.h>
-#include <kabc/stdaddressbook.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdeabc/stdaddressbook.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
 #include <krun.h>
 #include <kstdguiitem.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 
 FaxAB::FaxAB(TQWidget *parent, const char *name)
diff --git a/tdeprint/tdeprintfax/faxab.h b/tdeprint/tdeprintfax/faxab.h
index abf40de2f..8491fb96a 100644
--- a/tdeprint/tdeprintfax/faxab.h
+++ b/tdeprint/tdeprintfax/faxab.h
@@ -24,7 +24,7 @@
 #include <kdialog.h>
 #include <tqmap.h>
 #include <tqstringlist.h>
-#include <kabc/phonenumber.h>
+#include <tdeabc/phonenumber.h>
 
 class TDEListView;
 class AddressBook;
diff --git a/tdeprint/tdeprintfax/faxctrl.cpp b/tdeprint/tdeprintfax/faxctrl.cpp
index e8048d7c6..5ea6a65a2 100644
--- a/tdeprint/tdeprintfax/faxctrl.cpp
+++ b/tdeprint/tdeprintfax/faxctrl.cpp
@@ -36,19 +36,19 @@
 #include <tqstylesheet.h>
 
 #include <kprocess.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialogbase.h>
 #include <kmimetype.h>
 #include <kstandarddirs.h>
 #include <tdeapplication.h>
 #include <twin.h>
-#include <kemailsettings.h>
+#include <tdeemailsettings.h>
 #include <kdebug.h>
 #include <kstdguiitem.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <stdlib.h>
 #include <stdarg.h>
diff --git a/tdeprint/tdeprintfax/filterdlg.cpp b/tdeprint/tdeprintfax/filterdlg.cpp
index 0324863bc..141e7138a 100644
--- a/tdeprint/tdeprintfax/filterdlg.cpp
+++ b/tdeprint/tdeprintfax/filterdlg.cpp
@@ -25,7 +25,7 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 FilterDlg::FilterDlg(TQWidget *parent, const char *name)
 : KDialogBase(parent, name, true, i18n("Filter Parameters"), Ok|Cancel, Ok)
diff --git a/tdeprint/tdeprintfax/main.cpp b/tdeprint/tdeprintfax/main.cpp
index 5f69774d6..1e9f2662a 100644
--- a/tdeprint/tdeprintfax/main.cpp
+++ b/tdeprint/tdeprintfax/main.cpp
@@ -23,7 +23,7 @@
 #include <tqfile.h>
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 
 TQString debugFlag;
diff --git a/tdeprint/tdeprintfax/tdeprintfax.cpp b/tdeprint/tdeprintfax/tdeprintfax.cpp
index 181d0da12..4b4a58f17 100644
--- a/tdeprint/tdeprintfax/tdeprintfax.cpp
+++ b/tdeprint/tdeprintfax/tdeprintfax.cpp
@@ -35,16 +35,16 @@
 
 #include <tdeapplication.h>
 #include <kstdaction.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <tdetoolbar.h>
 #include <tdeaction.h>
 #include <tdelistbox.h>
 #include <tdelistview.h>
 #include <tqheader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdeio/netaccess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
 #include <kmimetype.h>
 #include <kseparator.h>