Rename additional header files to avoid conflicts with KDE4

blinken/src/artsplayer.cpp

@@ -12,8 +12,8 @@
 #include <config.h>
 
 #ifdef WITHOUT_ARTS
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #endif
 #include <kstandarddirs.h>
 

blinken/src/blinken.cpp

@@ -17,8 +17,8 @@
 #include <tdeconfig.h>
 #include <khelpmenu.h>
 #include <kinputdialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 

blinken/src/highscoredialog.cpp

@@ -14,7 +14,7 @@
 
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "highscoredialog.h"
 #include "counter.h"

kalzium/src/detailedgraphicaloverview.cpp

@@ -18,9 +18,9 @@ email                : cniehaus@kde.org
 
 //KDE-Includes
 #include <kdebug.h>
-#include <klocale.h>
-#include <kglobalsettings.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobalsettings.h>
+#include <tdeglobal.h>
 
 //QT-Includes
 #include <tqpainter.h>

kalzium/src/detailinfodlg.cpp

@@ -19,7 +19,7 @@
 #include "kalziumdataobject.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdehtml_part.h>
 #include <tdehtmlview.h>

kalzium/src/element.cpp

@@ -33,7 +33,7 @@
 #include <tqfontmetrics.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <kstandarddirs.h>
 

kalzium/src/elementdataviewer.cpp

@@ -18,7 +18,7 @@
 #include "plotwidget.h"
 #include "kalziumdataobject.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 #include <kcombobox.h>
 #include <kdebug.h>

kalzium/src/eqchemview.cpp

@@ -23,11 +23,11 @@
 #include <tqstring.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <kpushbutton.h>
 #include <kiconloader.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeapplication.h>
 
 #include "config.h"

kalzium/src/isotope.cpp

@@ -21,7 +21,7 @@
 #include "kalziumutils.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 Isotope::Isotope( int neutrons, int protones,  double percentage, double weight, double halflife, TQString format, double alphadecay, double betaplusdecay, double betaminusdecay, double ecdecay, double alphapercentage, double betapluspercentage, double betaminuspercentage, double ecpercentage, TQString spin, TQString magmoment)
 {

kalzium/src/kalzium.cpp

@@ -41,7 +41,7 @@
 
 #include <tdeconfigdialog.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeaction.h>
 #include <tdeapplication.h>

kalzium/src/kalziumdataobject.cpp

@@ -26,9 +26,9 @@
 #include <tqdom.h>
 #include <tqfile.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <kstandarddirs.h>
 #include <tdeapplication.h>

kalzium/src/kalziumtip.cpp

@@ -33,9 +33,9 @@
 
 #include <kdialog.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 KalziumTip::KalziumTip( TQWidget * parent, const char * name, WFlags f ) : TQWidget( parent, name, f ) 

kalzium/src/kalziumutils.cpp

@@ -13,8 +13,8 @@
 #include "kalziumutils.h"
 
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tqfont.h>
 #include <tqrect.h>
 #include <tqpainter.h>

kalzium/src/molcalcwidget.cpp

@@ -31,7 +31,7 @@
 
 #include <tdeaction.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <klineedit.h>
 #include <tdetoolbar.h>

kalzium/src/periodictableview.cpp

@@ -24,7 +24,7 @@
 #include "kalziumutils.h"
 #include "kalziumdataobject.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kpixmapeffect.h>
 #include <kimageeffect.h>

kalzium/src/somwidget_impl.cpp

@@ -21,7 +21,7 @@
 
 #include <kdebug.h>
 #include <knuminput.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <math.h>
 

kalzium/src/spectrum.cpp

@@ -21,7 +21,7 @@
 
 #include "element.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <math.h>
 

kalzium/src/spectrumviewimpl.cpp

@@ -16,8 +16,8 @@
 
 #include <tdefiledialog.h>
 #include <kguiitem.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 
 #include "exporter.h"

kalzium/src/spectrumwidget.cpp

@@ -24,8 +24,8 @@
 #include "kalziumutils.h"
 
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <math.h>
 
 #include <tqcursor.h>

kanagram/src/grammarmanager.cpp

@@ -25,7 +25,7 @@
 
 #include "grammarmanager.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 Conjugation::conjug_name_t
 Conjugation::names [] =

kanagram/src/kanagram.cpp

@@ -37,8 +37,8 @@ using namespace std;
 #include <tdeconfig.h>
 #include <khelpmenu.h>
 #include <kinputdialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <tdeconfigdialog.h>

kanagram/src/kanagramgame.cpp

@@ -24,9 +24,9 @@
 
 #include <kurl.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kanagramgame.h"
 #include "keduvocdocument.h"

kanagram/src/keduvocdocument.cpp

@@ -19,9 +19,9 @@
 #include "keduvocdocument.h"
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeio/netaccess.h>
 
 #include <tqfileinfo.h>

kanagram/src/keduvockvtmlreader.cpp

@@ -18,8 +18,8 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include <tqdom.h>
 #include <tqtextstream.h>

kanagram/src/mainsettings.cpp

@@ -26,10 +26,10 @@
 
 #include <kdebug.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdeconfigdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeio/netaccess.h>
 
 #include "mainsettings.h"

kanagram/src/newstuff.cpp

@@ -6,7 +6,7 @@
 #include <kdebug.h>
 #include <knewstuff/downloaddialog.h>
 #include <knewstuff/knewstuff.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kanagramsettings.h"
 #include "newstuffdialog.h"

kanagram/src/newstuffdialog.cpp

@@ -2,7 +2,7 @@
 
 #include <knewstuff/knewstuff.h>
 #include <knewstuff/entry.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/netaccess.h>
 #include <kurl.h>
 #include <kstandarddirs.h>

kanagram/src/vocabedit.cpp

@@ -29,11 +29,11 @@
 #include <tqvaluevector.h>
 
 #include <kstandarddirs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kurl.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 #include "keduvocdocument.h"
 #include "keduvocexpression.h"

kbruch/src/exercisebase.cpp

@@ -20,7 +20,7 @@
 
 /* these includes are needed for KDE support */
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 /* ----- public member functions ----- */
 

kbruch/src/exercisecompare.cpp

@@ -20,7 +20,7 @@
 
 /* these includes are needed for KDE support */
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 /* these includes are needed for TQt support */
 #include <tqlabel.h>

kbruch/src/exerciseconvert.cpp

@@ -20,8 +20,8 @@
 
 /* these includes are needed for KDE support */
 #include <tdeapplication.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <knumvalidator.h>
 
 /* these includes are needed for TQt support */

kbruch/src/exercisefactorize.cpp

@@ -20,8 +20,8 @@
 
 /* these includes are needed for KDE support */
 #include <tdeapplication.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <knumvalidator.h>
 
 /* these includes are needed for TQt support */

kbruch/src/fractionbasewidget.cpp

@@ -19,7 +19,7 @@
 #include "fractionbasewidget.moc"
 
 /* these includes are needed for KDE support */
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 /* these includes are needed for TQt support */
 #include <tqpainter.h>

kbruch/src/kbruch.h

@@ -23,7 +23,7 @@
 #include <config.h>
 
 /* for the I18N_NOOP macro */
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "task.h"
 #include "mainqtwidget.h"

kbruch/src/mainqtwidget.cpp

@@ -25,7 +25,7 @@
 #include <kiconloader.h>
 #include <kjanuswidget.h>
 #include <tdeconfigdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqsplitter.h>
 #include <tqlabel.h>

kbruch/src/statisticsview.cpp

@@ -25,7 +25,7 @@
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "settingsclass.h"

kbruch/src/taskview.cpp

@@ -19,8 +19,8 @@
 #include "taskview.moc"
 
 /* these includes are needed for KDE support */
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeapplication.h>
 #include <knumvalidator.h>
 

kbruch/src/taskwidget.cpp

@@ -19,7 +19,7 @@
 #include "taskwidget.moc"
 
 /* these includes are needed for KDE support */
-#include <klocale.h>
+#include <tdelocale.h>
 
 /* these includes are needed for TQt support */
 #include <tqpainter.h>

keduca/keduca/keduca.cpp

@@ -21,7 +21,7 @@
 #include "../libkeduca/kgallerydialog.h"
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdefiledialog.h>
 #include <kdebug.h>

keduca/keduca/keducaprefs.cpp

@@ -18,7 +18,7 @@
 #include "keducaprefs.h"
 #include "keducaprefs.moc"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdeconfig.h>
 

keduca/keduca/keducaview.cpp

@@ -24,9 +24,9 @@
 
 #include <stdlib.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
 #include <kpushbutton.h>
 #include <kdebug.h>

keduca/keduca/kgroupeduca.cpp

@@ -20,7 +20,7 @@
 #include "kcheckeduca.h"
 #include "tderadioeduca.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 KGroupEduca::KGroupEduca(TQWidget *parent, const char *name ) : TQVButtonGroup(i18n("Answers"), parent, name)
 {

keduca/keduca/kquestion.cpp

@@ -25,7 +25,7 @@
 #include <tqtimer.h>
 
 #include <kprogress.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 KQuestion::KQuestion( TQWidget *parent, const char *name )
   : TQHBox( parent, name ), _countdownTimer( 0 )

keduca/keducabuilder/kcontroladdedit.cpp

@@ -19,7 +19,7 @@
 #include "kcontroladdedit.moc"
 
 // KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kurlrequester.h>
 #include <kcombobox.h>

keduca/keducabuilder/kcontrolheader.cpp

@@ -18,7 +18,7 @@
 #include "kcontrolheader.h"
 #include "kcontrolheader.moc"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <ksimpleconfig.h>
 #include <klineedit.h>

keduca/keducabuilder/keducabuilder.cpp

@@ -24,12 +24,12 @@
 #include "../libkeduca/kgallerydialog.h"
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
 #include <kedittoolbar.h>
 #include <kdebug.h>
 #include <tdeio/netaccess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprinter.h>
 
 #include <tqlayout.h>

keduca/keducabuilder/keducaeditorstartdialog.cpp

@@ -19,8 +19,8 @@
 
 #include <kdebug.h>
 #include <kurlrequester.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kcombobox.h>
 

keduca/libkeduca/fileread.cpp

@@ -23,7 +23,7 @@
 #include <kstandarddirs.h>
 #include <kmimetype.h>
 #include <kdebug.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include <tqfileinfo.h>
 #include <tqpixmap.h>

keduca/libkeduca/kgallerydialog.cpp

@@ -20,8 +20,8 @@
 
 #include <kdebug.h>
 #include <tdeconfig.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeio/netaccess.h>
 
 #include <tqlineedit.h>

kgeography/src/answersdialog.cpp

@@ -8,7 +8,7 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqlabel.h>
 #include <tqlayout.h>

kgeography/src/askwidget.cpp

@@ -8,8 +8,8 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include <tqlabel.h>
 

kgeography/src/boxasker.cpp

@@ -12,7 +12,7 @@
 
 #include <tdeaccelmanager.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 
 #include <tqlabel.h>

kgeography/src/capitaldivisionasker.cpp

@@ -8,7 +8,7 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqradiobutton.h>
  

kgeography/src/divisioncapitalasker.cpp

@@ -8,7 +8,7 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqradiobutton.h>
  

kgeography/src/divisionflagasker.cpp

@@ -8,7 +8,7 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqimage.h>
 #include <tqradiobutton.h>

kgeography/src/flagdivisionasker.cpp

@@ -8,7 +8,7 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqimage.h>
 #include <tqlayout.h>

kgeography/src/kgeography.cpp

@@ -10,12 +10,12 @@
 
 #include <tdeaction.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kinputdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <kstdaction.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 
 #include <tqlabel.h>
 #include <tqlayout.h>

kgeography/src/map.cpp

@@ -11,7 +11,7 @@
 #include <stdlib.h> // for RAND_MAX
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqfile.h>
 #include <tqfileinfo.h>

kgeography/src/mapasker.cpp

@@ -8,8 +8,8 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include <tqlabel.h>
 #include <tqlayout.h>

kgeography/src/mapchooser.cpp

@@ -8,9 +8,9 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include <klocale.h>
-#include <kglobal.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 
 #include <tqhbox.h>

kgeography/src/mapparser.cpp

@@ -8,7 +8,7 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "division.h"
 #include "map.h"

kgeography/src/mapwidget.cpp

@@ -12,7 +12,7 @@
 #include <stdlib.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqcursor.h>
 #include <tqpainter.h>

khangman/khangman/khangman.cpp

@@ -36,9 +36,9 @@
 #include <tdeconfigdialog.h>
 #include <kdebug.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdemainwindow.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <kstatusbar.h>
 #include <tdetoolbarbutton.h>

khangman/khangman/khangmanview.cpp

@@ -19,8 +19,8 @@
 #include <kaudioplayer.h>
 #include <kdebug.h>
 #include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpassivepopup.h>
 #include <kpushbutton.h>
 #include <kstandarddirs.h>

khangman/khangman/main.cpp

@@ -22,7 +22,7 @@
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
 

khangman/khangman/timer.cpp

@@ -18,7 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqlabel.h>
 #include <tqslider.h>

kig/filters/cabri-filter.cc

@@ -46,7 +46,7 @@
 #include <tqregexp.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 /**
  * a line:

kig/filters/drgeo-filter-chooser.cc

@@ -20,8 +20,8 @@
 #include "drgeo-filter-chooser.moc"
 
 #include <tdelistbox.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
 

kig/filters/drgeo-filter.cc

@@ -54,7 +54,7 @@
 #include <tqfile.h>
 #include <tqnamespace.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #undef DRGEO_DEBUG
 //#define DRGEO_DEBUG

kig/filters/exporter.cc

@@ -45,8 +45,8 @@
 #include <tdeaction.h>
 #include <kiconloader.h>
 #include <kimageio.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <knuminput.h>
 
 #include <map>

kig/filters/filter.cc

@@ -26,8 +26,8 @@
 #include "kseg-filter.h"
 #include "drgeo-filter.h"
 
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 KigFilters* KigFilters::sThis;
 

kig/filters/kgeo-resource.h

@@ -48,7 +48,7 @@
 
 #include <iostream>
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 ///////////////////////////////////////////////////////////////////
 // resource.h  -- contains macros used for commands

kig/filters/kseg-filter.cc

@@ -50,7 +50,7 @@
 #include <tqdatastream.h>
 #include <tqbuffer.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 KigFilterKSeg::KigFilterKSeg()
 {

kig/filters/latexexporter.cc

@@ -49,8 +49,8 @@
 #include <tqfile.h>
 #include <tqtextstream.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #ifdef HAVE_TRUNC
 #define KDE_TRUNC(a)	trunc(a)

kig/filters/native-filter.cc

@@ -38,7 +38,7 @@
 
 #include <karchive.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <ktar.h>
 

kig/filters/svgexporter.cc

@@ -31,8 +31,8 @@
 #include <tqpicture.h>
 #include <tqrect.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include <map>
 

kig/kig/aboutdata.h

@@ -16,7 +16,7 @@
 // 02110-1301, USA.
 
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "config.h"
 

kig/kig/kig.cpp

@@ -32,8 +32,8 @@
 #include <tdefiledialog.h>
 #include <kkeydialog.h>
 #include <klibloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstatusbar.h>
 #include <kstdaction.h>
 #include <ktip.h>

kig/kig/kig_commands.h

@@ -23,7 +23,7 @@
 #define KIG_COMMANDS_H
 
 #include <kcommand.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "../objects/object_holder.h"

kig/kig/kig_part.cpp

@@ -47,12 +47,12 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kinstance.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdemainwindow.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kmimetype.h>
 #include <kprinter.h>
 #include <kstandarddirs.h>

kig/kig/kig_view.cpp

@@ -38,7 +38,7 @@
 
 #include <kdebug.h>
 #include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <kstdaction.h>
 #include <tdeaction.h>

kig/kig/main.cpp

@@ -23,7 +23,7 @@
 #include <kuniqueapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klibloader.h>
 #include <kdebug.h>
 

kig/misc/builtin_stuff.cc

@@ -42,7 +42,7 @@
 #include "../objects/vector_type.h"
 #include "../objects/polygon_type.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 void setupBuiltinStuff()
 {

kig/misc/common.cpp

@@ -27,7 +27,7 @@
 
 #include <kdebug.h>
 #include <knumvalidator.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #if KDE_IS_VERSION( 3, 1, 90 )
 #include <kinputdialog.h>
 #else

kig/misc/coordinate_system.cpp

@@ -32,8 +32,8 @@
 #include <tqregexp.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <knumvalidator.h>
 
 #include <string>

kig/misc/goniometry.cc

@@ -25,7 +25,7 @@
 #include <tqstringlist.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <cmath>
 

kig/misc/guiaction.cc

@@ -32,7 +32,7 @@
 #include "../objects/bogus_imp.h"
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqregexp.h>
 

kig/misc/kigfiledialog.cc

@@ -21,8 +21,8 @@
 #include <tqfile.h>
 #include <tqpoint.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 KigFileDialog::KigFileDialog( const TQString& startDir, const TQString& filter,
               const TQString& caption,  TQWidget* parent )