Rename additional header files to avoid conflicts with KDE4

fileplugin/tdefile_kbarcode.cpp

@@ -5,7 +5,7 @@
 #include "tdefile_kbarcode.h"
 
 #include <kgenericfactory.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqfile.h>
 #include <tqdom.h>

kbarcode/barcodecombo.cpp

@@ -34,7 +34,7 @@
 #include <kiconloader.h>
 #include <knuminput.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 
 BarcodeValidator::BarcodeValidator( TQObject* parent, const char* name )

kbarcode/barcodedialog.cpp

@@ -27,8 +27,8 @@
 #include <tdefiledialog.h>
 #include <kiconloader.h>
 #include <kimageio.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprinter.h>
 #include <kpushbutton.h>
 

kbarcode/barcodedialogs.cpp

@@ -35,7 +35,7 @@
 // KDE includes
 #include <kcombobox.h>
 #include <knuminput.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcolorbutton.h>
 
 

kbarcode/barcodeprinterdlg.cpp

@@ -19,7 +19,7 @@
 #include "printersettings.h"
 
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurlrequester.h>
 
 #include <tqcheckbox.h>

kbarcode/barkode.cpp

@@ -67,7 +67,7 @@ enum {
 #include <tqpixmap.h>
 #include <tqsize.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 TQValueList<tBarcodeInfo> Barkode::s_info;

kbarcode/batchprinter.cpp

@@ -30,13 +30,13 @@
 #include <tqprogressdialog.h>
 
 // KDE includes
-#include <kabc/addressee.h>
-#include <kabc/addresseelist.h>
+#include <tdeabc/addressee.h>
+#include <tdeabc/addresseelist.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kimageio.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprinter.h>
 
 // Other includes

kbarcode/batchwizard.cpp

@@ -43,10 +43,10 @@
 #include <tqvbuttongroup.h>
 #include <tqwidgetstack.h>
 
-#include <kabc/addressee.h>
-#include <kabc/addresseelist.h>
-#include <kabc/addressbook.h>
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/addressee.h>
+#include <tdeabc/addresseelist.h>
+#include <tdeabc/addressbook.h>
+#include <tdeabc/stdaddressbook.h>
 #include <tdeapplication.h>
 #include <kcombobox.h>
 #include <kcompletion.h>
@@ -56,7 +56,7 @@
 #include <klineedit.h>
 #include <tdelistbox.h>
 #include <tdelistview.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <knuminput.h>
 #include <tdepopupmenu.h>
 #include <kpushbutton.h>

kbarcode/commands.h

@@ -23,7 +23,7 @@
 #include <tqobject.h>
 
 #include <kcommand.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "barcodeitem.h"
 #include "tcanvasitem.h"

kbarcode/configdialog.cpp

@@ -30,17 +30,17 @@
 #include <tqtooltip.h>
 
 // KDE includes
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kcolorbutton.h>
 #include <kiconloader.h>
 #include <kimageio.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
 #include <knuminput.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 
 const TQString cached = I18N_NOOP("There are currently %1 cached barcodes.");

kbarcode/confwizard.cpp

@@ -34,8 +34,8 @@
 #include <tdeapplication.h>
 #include <kcombobox.h>
 #include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <kurllabel.h>
 #include <kstandarddirs.h>

kbarcode/csvimportdlg.cpp

@@ -42,8 +42,8 @@
 #include <tdeapplication.h>
 #include <kcombobox.h>
 #include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <knuminput.h>
 #include <kpushbutton.h>
 #include <kurlrequester.h>

kbarcode/databasebrowser.cpp

@@ -28,8 +28,8 @@
 #include <tdeaction.h>
 #include <tdeapplication.h>
 #include <keditcl.h>
-#include <klocale.h>
-#include <kmenubar.h>
+#include <tdelocale.h>
+#include <tdemenubar.h>
 #include <tdepopupmenu.h>
 #include <kstatusbar.h>
 

kbarcode/definition.cpp

@@ -26,8 +26,8 @@
 // KDE includes
 #include <tdeapplication.h>
 #include <tdefiledialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tqprogressdialog.h>
 

kbarcode/definitiondialog.cpp

@@ -28,7 +28,7 @@
 #include <tqpainter.h>
 
 // KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
 
 LabelPreview::LabelPreview( TQWidget* parent, const char* name )
     : TQWidget( parent, name)

kbarcode/documentitemdlg.cpp

@@ -21,7 +21,7 @@
 #include <tqvbox.h>
 
 #include <kcommand.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 DocumentItemDlg::DocumentItemDlg( TokenProvider* token, DocumentItem* item, KCommandHistory* history, TQWidget* parent )
     : KDialogBase( Tabbed, i18n("Properties"), KDialogBase::Ok|KDialogBase::Cancel,

kbarcode/dsmainwindow.cpp

@@ -33,9 +33,9 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmenubar.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemenubar.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <krun.h>

kbarcode/encodingcombo.cpp

@@ -18,8 +18,8 @@
 #include "encodingcombo.h"
 
 #include <kcharsets.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tqtextcodec.h>
 
 EncodingCombo::EncodingCombo( TQWidget* parent )

kbarcode/gnubarcode.cpp

@@ -28,7 +28,7 @@
 #include <tqpainter.h>
 #include <tqpaintdevicemetrics.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #define FONT_SPACE (2*m_scaley)
 #define SHRINK_AMOUNT 0.15

kbarcode/imageitem.cpp

@@ -24,7 +24,7 @@
 #include <tqpaintdevicemetrics.h>
 #include <tqpainter.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmdcodec.h> 
 
 ImageItem::ImageItem()

kbarcode/kbarcode.cpp

@@ -34,10 +34,10 @@
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <kpushbutton.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 KBarcode::KBarcode( TQWidget *parent, const char *name, WFlags f)
     : DCOPObject("KBarcode"),

kbarcode/label.cpp

@@ -38,7 +38,7 @@
 
 // KDE includes
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprinter.h>
 
 Label::Label( Definition* _def, TQIODevice* device, TQString labelname, TQPaintDevice* _printer, TQString customer_id, TQString _article_no, TQString _group )

kbarcode/labeleditor.cpp

@@ -77,7 +77,7 @@
 #include <tqxml.h>
 
 // KDE includes
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/stdaddressbook.h>
 #include <tdeaction.h>
 #include <tdeapplication.h>
 #include <kcolordialog.h>
@@ -88,9 +88,9 @@
 #include <kimageio.h>
 #include <klineedit.h>
 #include <tdelistbox.h>
-#include <klocale.h>
-#include <kmenubar.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemenubar.h>
+#include <tdemessagebox.h>
 #include <knuminput.h>
 #include <tdepopupmenu.h>
 #include <kpushbutton.h>
@@ -99,7 +99,7 @@
 #include <tdespell.h>
 #include <kstatusbar.h>
 #include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <dcopclient.h>
 
 #include "tcanvasitem.h"

kbarcode/labelutils.cpp

@@ -27,8 +27,8 @@
 
 // KDE includes
 #include <tdeapplication.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 // own includes
 #include "printersettings.h"

kbarcode/main.cpp

@@ -19,7 +19,7 @@
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
 #include <kimageio.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include "kbarcode.h"

kbarcode/measurements.cpp

@@ -21,7 +21,7 @@
 #include <tqpaintdevicemetrics.h>
 
 // KDE includes
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 Measurements::Measurements()
 {

kbarcode/measurements.h

@@ -18,7 +18,7 @@
 #ifndef MEASUREMENTS_H
 #define MEASUREMENTS_H
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 class TQPaintDevice;
 

kbarcode/multilineeditdlg.cpp

@@ -23,7 +23,7 @@
 #include <tdeversion.h>
 #include <kcolordialog.h>
 #include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdespell.h>
 #include <dstextedit.h>
 #include <tdetoolbar.h>

kbarcode/mybarcode.cpp

@@ -30,11 +30,11 @@ f/***************************************************************************
 // KDE includes
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #define BARCODE_MARGIN 10     /* Margin added by GNU Barcode to the barcodes */
 

kbarcode/newlabel.cpp

@@ -27,7 +27,7 @@
 #include <tqsqlquery.h>
 
 // KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
 #include <kpushbutton.h>
 

kbarcode/pixmapbarcode.cpp

@@ -23,7 +23,7 @@
 
 #include <tdeapplication.h>
 #include <kprocess.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include <tqbuffer.h>
 #include <tqdom.h>

kbarcode/previewdialog.cpp

@@ -30,13 +30,13 @@
 #include <tqsqlcursor.h>
 
 // KDE includes
-#include <kabc/addresseedialog.h>
+#include <tdeabc/addresseedialog.h>
 #include <tdeapplication.h>
 #include <kcombobox.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 #include <kpushbutton.h>
 

kbarcode/previewdialog.h

@@ -19,7 +19,7 @@
 #define PREVIEWDIALOG_H
 
 #include <tqdialog.h>
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
 
 class Definition;
 class KComboBox;

kbarcode/printersettings.cpp

@@ -22,8 +22,8 @@
 #include <tdeapplication.h>
 #include <kcombobox.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kurl.h>
 
 // Stolen from koffice/lib/kofficecore/koGlobal.cc

kbarcode/printlabeldlg.cpp

@@ -24,7 +24,7 @@
 
 // KDE includes
 #include <knuminput.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 PrintLabelDlg::PrintLabelDlg(TQWidget *parent, const char *name )
     : KDialogBase( KDialogBase::Plain, i18n("Print"),

kbarcode/propertywidget.cpp

@@ -38,7 +38,7 @@
 #include <kiconloader.h>
 #include <kimageio.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 #include <ktextedit.h>
 #include <kurlrequester.h>
@@ -51,7 +51,7 @@
 #include <tqsqlquery.h>
 #include <tqvbox.h>
 #include <tqvbuttongroup.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #define IMAGE_INTERNAL i18n("Image Saved in KBarcode")
 

kbarcode/purepostscript.cpp

@@ -25,7 +25,7 @@
 #include <tqtextstream.h>
 
 #include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #define MAX_LINE_LENGTH 256
 #define BEGIN_TEMPLATE "--BEGIN TEMPLATE--"

kbarcode/rectsettingsdlg.cpp

@@ -27,7 +27,7 @@
 // KDE includes
 #include <kcolorbutton.h>
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 
 void fillLineCombo( KComboBox* box )

kbarcode/smalldialogs.cpp

@@ -26,7 +26,7 @@
 // KDE includes
 #include <knuminput.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 using namespace DSSmallDialogs;

kbarcode/sqltables.cpp

@@ -33,8 +33,8 @@
 #include <kcombobox.h>
 #include <tdeconfig.h>
 #include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <kstandarddirs.h>
 

kbarcode/tbarcode2.cpp

@@ -24,7 +24,7 @@
 #include <tqfile.h>
 
 #include <kprocess.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 TBarcodeOptions::TBarcodeOptions()
 {

kbarcode/tdeactionmap.cpp

@@ -33,7 +33,7 @@
 #if TDE_VERSION >= 0x030500
 #include <tdelistviewsearchline.h>
 #endif
-#include <klocale.h>
+#include <tdelocale.h>
 
 class TDEListViewActionItem : public TDEListViewItem {
 public:

kbarcode/tec.cpp

@@ -41,9 +41,9 @@
 #include <tdelistview.h>
 #include <klineedit.h>
 #include <klineeditdlg.h>
-#include <klocale.h>
-#include <kmenubar.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemenubar.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <knuminput.h>
 #include <kprinter.h>

kbarcode/tec.h

@@ -41,9 +41,9 @@
 #include <tdelistview.h>
 #include <klineedit.h>
 #include <klineeditdlg.h>
-#include <klocale.h>
-#include <kmenubar.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemenubar.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <knuminput.h>
 #include <kprinter.h>

kbarcode/textlineedit.cpp

@@ -18,7 +18,7 @@
 #include <tdeversion.h>
 #include <kcolordialog.h>
 #include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdespell.h>
 #include <klineedit.h>
 #include <tdetoolbar.h>

kbarcode/tokendialog.cpp

@@ -23,7 +23,7 @@
 #include <klineedit.h>
 #include <tdelistbox.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqhbox.h> 
 #include <tqlabel.h>

kbarcode/tokenprovider.cpp

@@ -31,8 +31,8 @@
 #include <tqvaluelist.h>
 #include <time.h>
 
-#include <klocale.h>
-#include <kabc/addressee.h>
+#include <tdelocale.h>
+#include <tdeabc/addressee.h>
 
 #ifdef USE_JAVASCRIPT
 #ifdef NO_KJS_EMBED

kbarcode/xmlutils.cpp

@@ -33,8 +33,8 @@
 
 // KDE includes
 #include <tdeapplication.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 XMLUtils::XMLUtils()
 {