Rename additional header files to avoid conflicts with KDE4

134 files changed, 166 insertions, 166 deletions

diff --git a/microbe/expression.cpp b/microbe/expression.cpp
index 629a4f2..8e154a6 100644
--- a/microbe/expression.cpp
+++ b/microbe/expression.cpp
@@ -26,7 +26,7 @@
 #include "pic14.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqregexp.h>
 
 Expression::Expression( PIC14 *pic, Microbe *master, SourceLine sourceLine, bool suppressNumberTooBig )
diff --git a/microbe/main.cpp b/microbe/main.cpp
index b0f663a..7b6d5ab 100644
--- a/microbe/main.cpp
+++ b/microbe/main.cpp
@@ -24,7 +24,7 @@
 
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqfile.h>
 
 #include <iostream>
diff --git a/microbe/microbe.cpp b/microbe/microbe.cpp
index 8a01cc1..0f1be5c 100644
--- a/microbe/microbe.cpp
+++ b/microbe/microbe.cpp
@@ -25,7 +25,7 @@
 #include "pic14.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqfile.h>
 
 #include <iostream>
diff --git a/microbe/parser.cpp b/microbe/parser.cpp
index 9505f58..1324298 100644
--- a/microbe/parser.cpp
+++ b/microbe/parser.cpp
@@ -27,7 +27,7 @@
 
 #include <assert.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqfile.h>
 #include <tqregexp.h>
 #include <tqstring.h>
diff --git a/src/canvasmanipulator.cpp b/src/canvasmanipulator.cpp
index d0b1649..803ed6d 100644
--- a/src/canvasmanipulator.cpp
+++ b/src/canvasmanipulator.cpp
@@ -28,7 +28,7 @@
 
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include <tqpainter.h>
 #include <tqtimer.h>
diff --git a/src/circuitdocument.cpp b/src/circuitdocument.cpp
index 01f4178..31aef66 100644
--- a/src/circuitdocument.cpp
+++ b/src/circuitdocument.cpp
@@ -27,8 +27,8 @@
 
 #include <kdebug.h>
 #include <kinputdialog.h> 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tqregexp.h>
 #include <tqtimer.h> 
 
diff --git a/src/circuitview.cpp b/src/circuitview.cpp
index 90cb376..14c3a5f 100644
--- a/src/circuitview.cpp
+++ b/src/circuitview.cpp
@@ -15,7 +15,7 @@
 #include "simulator.h"
 #include "viewiface.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqwhatsthis.h>
 
 CircuitView::CircuitView( CircuitDocument * circuitDocument, ViewContainer *viewContainer, uint viewAreaId, const char *name )
diff --git a/src/core/main.cpp b/src/core/main.cpp
index 5269431..eae01fd 100644
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -15,7 +15,7 @@
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 static const char description[] =
     I18N_NOOP("An IDE for microcontrollers and electronics");
diff --git a/src/docmanager.cpp b/src/docmanager.cpp
index 7112a6e..71a5bea 100644
--- a/src/docmanager.cpp
+++ b/src/docmanager.cpp
@@ -21,8 +21,8 @@
 #include "textview.h"
 #include "viewcontainer.h"
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <ktabwidget.h>
 #include <tqfile.h>
 
diff --git a/src/document.cpp b/src/document.cpp
index eca7c6b..7a59c46 100644
--- a/src/document.cpp
+++ b/src/document.cpp
@@ -16,8 +16,8 @@
 #include "viewcontainer.h"
 
 #include <tdefiledialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <ktabwidget.h>
 
 Document::Document( const TQString &caption, KTechlab *ktechlab, const char *name )
diff --git a/src/drawparts/dpline.cpp b/src/drawparts/dpline.cpp
index 31a4a70..5127a0e 100644
--- a/src/drawparts/dpline.cpp
+++ b/src/drawparts/dpline.cpp
@@ -15,7 +15,7 @@
 
 #include <cmath>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpainter.h>
 
 
diff --git a/src/drawparts/dptext.cpp b/src/drawparts/dptext.cpp
index 7524b1e..ee22348 100644
--- a/src/drawparts/dptext.cpp
+++ b/src/drawparts/dptext.cpp
@@ -14,7 +14,7 @@
 #include "resizeoverlay.h"
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpainter.h>
 
 Item* DPText::construct( ItemDocument *itemDocument, bool newItem, const char *id )
diff --git a/src/drawparts/drawpart.cpp b/src/drawparts/drawpart.cpp
index 8e5d803..1ac24cf 100644
--- a/src/drawparts/drawpart.cpp
+++ b/src/drawparts/drawpart.cpp
@@ -13,7 +13,7 @@
 #include "drawpart.h"
 #include "variant.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqbitarray.h>
 
 DrawPart::DrawPart( ItemDocument *itemDocument, bool newItem, const char *id )
diff --git a/src/drawparts/solidshape.cpp b/src/drawparts/solidshape.cpp
index 05c5f3f..419e0ad 100644
--- a/src/drawparts/solidshape.cpp
+++ b/src/drawparts/solidshape.cpp
@@ -14,7 +14,7 @@
 
 #include <cmath>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpainter.h>
 
 
diff --git a/src/electronics/components/addac.cpp b/src/electronics/components/addac.cpp
index f1f7a92..afed135 100644
--- a/src/electronics/components/addac.cpp
+++ b/src/electronics/components/addac.cpp
@@ -17,7 +17,7 @@
 
 #include <cmath>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 Item* ADC::construct( ItemDocument *itemDocument, bool newItem, const char *id )
diff --git a/src/electronics/components/bidirled.cpp b/src/electronics/components/bidirled.cpp
index 50e7052..4e1ac95 100644
--- a/src/electronics/components/bidirled.cpp
+++ b/src/electronics/components/bidirled.cpp
@@ -16,7 +16,7 @@
 #include "libraryitem.h"
 #include "simulator.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpainter.h>
 
 Item* BiDirLED::construct( ItemDocument *itemDocument, bool newItem, const char *id )
diff --git a/src/electronics/components/binarycounter.cpp b/src/electronics/components/binarycounter.cpp
index a93a1b2..04088e6 100644
--- a/src/electronics/components/binarycounter.cpp
+++ b/src/electronics/components/binarycounter.cpp
@@ -14,7 +14,7 @@
 #include "libraryitem.h"
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 Item* BinaryCounter::construct( ItemDocument *itemDocument, bool newItem, const char *id )
 {
diff --git a/src/electronics/components/bussplitter.cpp b/src/electronics/components/bussplitter.cpp
index 6eb58e8..4c18dec 100644
--- a/src/electronics/components/bussplitter.cpp
+++ b/src/electronics/components/bussplitter.cpp
@@ -13,7 +13,7 @@
 #include "libraryitem.h"
 #include "wire.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpainter.h>
 
 Item* BusSplitter::construct( ItemDocument *itemDocument, bool newItem, const char *id )
diff --git a/src/electronics/components/demultiplexer.cpp b/src/electronics/components/demultiplexer.cpp
index 7124c89..f757f3d 100644
--- a/src/electronics/components/demultiplexer.cpp
+++ b/src/electronics/components/demultiplexer.cpp
@@ -14,7 +14,7 @@
 #include "libraryitem.h"
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <cmath>
 
diff --git a/src/electronics/components/dependentsource.cpp b/src/electronics/components/dependentsource.cpp
index 1808c86..d0a3b37 100644
--- a/src/electronics/components/dependentsource.cpp
+++ b/src/electronics/components/dependentsource.cpp
@@ -18,7 +18,7 @@
 #include "vccs.h"
 #include "vcvs.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpainter.h>
 
 //BEGIN class DependentSource
diff --git a/src/electronics/components/discretelogic.cpp b/src/electronics/components/discretelogic.cpp
index 0c26e78..f850208 100644
--- a/src/electronics/components/discretelogic.cpp
+++ b/src/electronics/components/discretelogic.cpp
@@ -15,7 +15,7 @@
 #include "libraryitem.h"
 #include "simulator.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpainter.h>
 
 
diff --git a/src/electronics/components/ec555.cpp b/src/electronics/components/ec555.cpp
index 2b5b9db..4ef2215 100644
--- a/src/electronics/components/ec555.cpp
+++ b/src/electronics/components/ec555.cpp
@@ -16,7 +16,7 @@
 #include "resistance.h"
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpainter.h>
 
 Item* EC555::construct( ItemDocument *itemDocument, bool newItem, const char *id )
diff --git a/src/electronics/components/ecbcdto7segment.cpp b/src/electronics/components/ecbcdto7segment.cpp
index f618a8e..f68d1f7 100644
--- a/src/electronics/components/ecbcdto7segment.cpp
+++ b/src/electronics/components/ecbcdto7segment.cpp
@@ -14,7 +14,7 @@
 #include "libraryitem.h"
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // Values for a,b,c,d,e,f,g of common-anode 7 segment display
 bool numbers[16][7] =
diff --git a/src/electronics/components/ecbjt.cpp b/src/electronics/components/ecbjt.cpp
index aed928e..6ea97a8 100644
--- a/src/electronics/components/ecbjt.cpp
+++ b/src/electronics/components/ecbjt.cpp
@@ -14,7 +14,7 @@
 #include "libraryitem.h"
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpainter.h>
 
 Item * ECBJT::constructNPN( ItemDocument * itemDocument, bool newItem, const char * id )
diff --git a/src/electronics/components/eccapacitor.cpp b/src/electronics/components/eccapacitor.cpp
index c951291..5173d65 100644
--- a/src/electronics/components/eccapacitor.cpp
+++ b/src/electronics/components/eccapacitor.cpp
@@ -13,7 +13,7 @@
 #include "ecnode.h"
 #include "libraryitem.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpainter.h>
 
 Item* ECCapacitor::construct( ItemDocument *itemDocument, bool newItem, const char *id )
diff --git a/src/electronics/components/ecclockinput.cpp b/src/electronics/components/ecclockinput.cpp
index 7d3d608..70e3855 100644
--- a/src/electronics/components/ecclockinput.cpp
+++ b/src/electronics/components/ecclockinput.cpp
@@ -14,7 +14,7 @@
 #include "libraryitem.h"
 #include "simulator.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpainter.h>
 
 #include <cmath>
diff --git a/src/electronics/components/eccurrentsignal.cpp b/src/electronics/components/eccurrentsignal.cpp
index 14c632b..c11aab3 100644
--- a/src/electronics/components/eccurrentsignal.cpp
+++ b/src/electronics/components/eccurrentsignal.cpp
@@ -15,7 +15,7 @@
 #include "pin.h"
 #include "simulator.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpainter.h>
 
 Item* ECCurrentSignal::construct( ItemDocument *itemDocument, bool newItem, const char *id )
diff --git a/src/electronics/components/eccurrentsource.cpp b/src/electronics/components/eccurrentsource.cpp
index 88c61da..cbd97f6 100644
--- a/src/electronics/components/eccurrentsource.cpp
+++ b/src/electronics/components/eccurrentsource.cpp
@@ -15,7 +15,7 @@
 #include "libraryitem.h"
 #include "pin.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpainter.h>
 
 Item* ECCurrentSource::construct( ItemDocument *itemDocument, bool newItem, const char *id )
diff --git a/src/electronics/components/ecdiode.cpp b/src/electronics/components/ecdiode.cpp
index 744f27e..0098cc6 100644
--- a/src/electronics/components/ecdiode.cpp
+++ b/src/electronics/components/ecdiode.cpp
@@ -13,7 +13,7 @@
 #include "ecnode.h"
 #include "libraryitem.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpainter.h>
 
 Item* ECDiode::construct( ItemDocument *itemDocument, bool newItem, const char *id )
diff --git a/src/electronics/components/ecfixedvoltage.cpp b/src/electronics/components/ecfixedvoltage.cpp
index fa21dfe..96df9f2 100644
--- a/src/electronics/components/ecfixedvoltage.cpp
+++ b/src/electronics/components/ecfixedvoltage.cpp
@@ -14,7 +14,7 @@
 #include "voltagepoint.h"
 #include "libraryitem.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpainter.h>
 
 Item* ECFixedVoltage::construct( ItemDocument *itemDocument, bool newItem, const char *id )
diff --git a/src/electronics/components/ecground.cpp b/src/electronics/components/ecground.cpp
index 68bf7e2..3eebb1e 100644
--- a/src/electronics/components/ecground.cpp
+++ b/src/electronics/components/ecground.cpp
@@ -14,7 +14,7 @@
 #include "libraryitem.h"
 #include "pin.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpainter.h>
 
 Item* ECGround::construct( ItemDocument *itemDocument, bool newItem, const char *id )
diff --git a/src/electronics/components/eckeypad.cpp b/src/electronics/components/eckeypad.cpp
index 4a0ec7b..b50c810 100644
--- a/src/electronics/components/eckeypad.cpp
+++ b/src/electronics/components/eckeypad.cpp
@@ -14,7 +14,7 @@
 #include "switch.h"
 
 #include "ecnode.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 Item* ECKeyPad::construct( ItemDocument *itemDocument, bool newItem, const char *id )
 {
diff --git a/src/electronics/components/ecled.cpp b/src/electronics/components/ecled.cpp
index 4943621..b50744e 100644
--- a/src/electronics/components/ecled.cpp
+++ b/src/electronics/components/ecled.cpp
@@ -15,7 +15,7 @@
 #include "libraryitem.h"
 #include "simulator.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpainter.h>
 
 Item* ECLed::construct( ItemDocument *itemDocument, bool newItem, const char *id )
diff --git a/src/electronics/components/ecopamp.cpp b/src/electronics/components/ecopamp.cpp
index 04ed81f..341bd82 100644
--- a/src/electronics/components/ecopamp.cpp
+++ b/src/electronics/components/ecopamp.cpp
@@ -13,7 +13,7 @@
 #include "ecnode.h"
 #include "libraryitem.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpainter.h>
 
 Item* ECOpAmp::construct( ItemDocument *itemDocument, bool newItem, const char *id )
diff --git a/src/electronics/components/ecpotentiometer.cpp b/src/electronics/components/ecpotentiometer.cpp
index 460ac4e..d775634 100644
--- a/src/electronics/components/ecpotentiometer.cpp
+++ b/src/electronics/components/ecpotentiometer.cpp
@@ -14,7 +14,7 @@
 #include "libraryitem.h"
 #include "resistance.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpainter.h>
 #include <tqstyle.h>
 
diff --git a/src/electronics/components/ecresistor.cpp b/src/electronics/components/ecresistor.cpp
index e03be7b..3d3e703 100644
--- a/src/electronics/components/ecresistor.cpp
+++ b/src/electronics/components/ecresistor.cpp
@@ -13,7 +13,7 @@
 #include "libraryitem.h"
 #include "resistance.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpainter.h>
 
 Item* ECResistor::construct( ItemDocument *itemDocument, bool newItem, const char *id )
diff --git a/src/electronics/components/ecsevensegment.cpp b/src/electronics/components/ecsevensegment.cpp
index e68bf7c..8037517 100644
--- a/src/electronics/components/ecsevensegment.cpp
+++ b/src/electronics/components/ecsevensegment.cpp
@@ -16,7 +16,7 @@
 #include "libraryitem.h"
 #include "simulator.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpainter.h>
 #include <tqstring.h>
 
diff --git a/src/electronics/components/ecsignallamp.cpp b/src/electronics/components/ecsignallamp.cpp
index 0a25c39..59b867b 100644
--- a/src/electronics/components/ecsignallamp.cpp
+++ b/src/electronics/components/ecsignallamp.cpp
@@ -15,7 +15,7 @@
 #include "libraryitem.h"
 #include "pin.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpainter.h>
 
 Item* ECSignalLamp::construct( ItemDocument *itemDocument, bool newItem, const char *id )
diff --git a/src/electronics/components/ecsubcircuit.cpp b/src/electronics/components/ecsubcircuit.cpp
index c897f02..b5fd799 100644
--- a/src/electronics/components/ecsubcircuit.cpp
+++ b/src/electronics/components/ecsubcircuit.cpp
@@ -16,7 +16,7 @@
 #include "subcircuits.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqfile.h>
 
 Item* ECSubcircuit::construct( ItemDocument *itemDocument, bool newItem, const char *id )
diff --git a/src/electronics/components/ecvoltagesignal.cpp b/src/electronics/components/ecvoltagesignal.cpp
index 1590766..d972199 100644
--- a/src/electronics/components/ecvoltagesignal.cpp
+++ b/src/electronics/components/ecvoltagesignal.cpp
@@ -15,7 +15,7 @@
 #include "simulator.h"
 #include "voltagesignal.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpainter.h>
 
 const double conductance = 1e5; // Internal resistance
diff --git a/src/electronics/components/ecvoltagesource.cpp b/src/electronics/components/ecvoltagesource.cpp
index 9090b3b..ce16fe8 100644
--- a/src/electronics/components/ecvoltagesource.cpp
+++ b/src/electronics/components/ecvoltagesource.cpp
@@ -15,7 +15,7 @@
 #include "libraryitem.h"
 #include "pin.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpainter.h>
 
 const double conductance = 1e5; // Internal resistance
diff --git a/src/electronics/components/externalconnection.cpp b/src/electronics/components/externalconnection.cpp
index ca89240..ae19044 100644
--- a/src/electronics/components/externalconnection.cpp
+++ b/src/electronics/components/externalconnection.cpp
@@ -11,7 +11,7 @@
 #include "externalconnection.h"
 #include "libraryitem.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpainter.h>
 
 Item* ExternalConnection::construct( ItemDocument *itemDocument, bool newItem, const char *id )
diff --git a/src/electronics/components/flipflop.cpp b/src/electronics/components/flipflop.cpp
index 9bceb4d..5bde526 100644
--- a/src/electronics/components/flipflop.cpp
+++ b/src/electronics/components/flipflop.cpp
@@ -16,7 +16,7 @@
 #include "simulator.h"
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpainter.h>
 
 
diff --git a/src/electronics/components/fulladder.cpp b/src/electronics/components/fulladder.cpp
index 3c71210..0cf55d6 100644
--- a/src/electronics/components/fulladder.cpp
+++ b/src/electronics/components/fulladder.cpp
@@ -14,7 +14,7 @@
 #include "libraryitem.h"
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 Item* FullAdder::construct( ItemDocument *itemDocument, bool newItem, const char *id )
diff --git a/src/electronics/components/inductor.cpp b/src/electronics/components/inductor.cpp
index 5949a3b..3790fcb 100644
--- a/src/electronics/components/inductor.cpp
+++ b/src/electronics/components/inductor.cpp
@@ -12,7 +12,7 @@
 #include "inductor.h"
 #include "libraryitem.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpainter.h>
 
 Item* Inductor::construct( ItemDocument *itemDocument, bool newItem, const char *id )
diff --git a/src/electronics/components/magnitudecomparator.cpp b/src/electronics/components/magnitudecomparator.cpp
index bae9b12..dacf9f7 100644
--- a/src/electronics/components/magnitudecomparator.cpp
+++ b/src/electronics/components/magnitudecomparator.cpp
@@ -13,7 +13,7 @@
 #include "variant.h"
 
 #include <cmath>
-#include <klocale.h>
+#include <tdelocale.h>
 
 Item* MagnitudeComparator::construct( ItemDocument *itemDocument, bool newItem, const char *id )
 {
diff --git a/src/electronics/components/matrixdisplay.cpp b/src/electronics/components/matrixdisplay.cpp
index 4ba3dc6..3eb9fdd 100644
--- a/src/electronics/components/matrixdisplay.cpp
+++ b/src/electronics/components/matrixdisplay.cpp
@@ -17,7 +17,7 @@
 #include "simulator.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpainter.h>
 #include <tqstring.h>
 
diff --git a/src/electronics/components/matrixdisplaydriver.cpp b/src/electronics/components/matrixdisplaydriver.cpp
index a25bb7a..578445f 100644
--- a/src/electronics/components/matrixdisplaydriver.cpp
+++ b/src/electronics/components/matrixdisplaydriver.cpp
@@ -12,7 +12,7 @@
 #include "logic.h"
 #include "matrixdisplaydriver.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpainter.h>
 #include <tqstring.h>
 
diff --git a/src/electronics/components/meter.cpp b/src/electronics/components/meter.cpp
index fc021a6..9d9290f 100644
--- a/src/electronics/components/meter.cpp
+++ b/src/electronics/components/meter.cpp
@@ -19,7 +19,7 @@
 #include "simulator.h"
 
 #include <cmath>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpainter.h>
 
 
diff --git a/src/electronics/components/multiinputgate.cpp b/src/electronics/components/multiinputgate.cpp
index c06d982..5359292 100644
--- a/src/electronics/components/multiinputgate.cpp
+++ b/src/electronics/components/multiinputgate.cpp
@@ -15,7 +15,7 @@
 #include "logic.h"
 
 #include <cmath>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpainter.h>
 
 //BEGIN class MultiInputGate
diff --git a/src/electronics/components/multiplexer.cpp b/src/electronics/components/multiplexer.cpp
index a8770e4..e48d33d 100644
--- a/src/electronics/components/multiplexer.cpp
+++ b/src/electronics/components/multiplexer.cpp
@@ -14,7 +14,7 @@
 #include "libraryitem.h"
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <cmath>
 
diff --git a/src/electronics/components/parallelportcomponent.cpp b/src/electronics/components/parallelportcomponent.cpp
index 6126c1e..74c7c95 100644
--- a/src/electronics/components/parallelportcomponent.cpp
+++ b/src/electronics/components/parallelportcomponent.cpp
@@ -18,7 +18,7 @@
 #include "resistance.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpainter.h>
 
 #include <cmath>
diff --git a/src/electronics/components/piccomponent.cpp b/src/electronics/components/piccomponent.cpp
index 0712992..9ee429d 100644
--- a/src/electronics/components/piccomponent.cpp
+++ b/src/electronics/components/piccomponent.cpp
@@ -27,8 +27,8 @@
 
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tqguardedptr.h>
 #include <tqstringlist.h>
 
diff --git a/src/electronics/components/probe.cpp b/src/electronics/components/probe.cpp
index 1915d51..dfe29fd 100644
--- a/src/electronics/components/probe.cpp
+++ b/src/electronics/components/probe.cpp
@@ -18,7 +18,7 @@
 #include "simulator.h"
 #include "voltagesource.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpainter.h>
 
 //BEGIN class Probe
diff --git a/src/electronics/components/pushswitch.cpp b/src/electronics/components/pushswitch.cpp
index 8257440..5b926d6 100644
--- a/src/electronics/components/pushswitch.cpp
+++ b/src/electronics/components/pushswitch.cpp
@@ -13,7 +13,7 @@
 #include "pushswitch.h"
 #include "switch.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpainter.h>
 #include <tqpixmap.h>
 #include <tqpoint.h>
diff --git a/src/electronics/components/ram.cpp b/src/electronics/components/ram.cpp
index d0ac2b1..375bf21 100644
--- a/src/electronics/components/ram.cpp
+++ b/src/electronics/components/ram.cpp
@@ -14,7 +14,7 @@
 #include "variant.h"
 
 #include <cmath>
-#include <klocale.h>
+#include <tdelocale.h>
 
 Item* RAM::construct( ItemDocument *itemDocument, bool newItem, const char *id )
 {
diff --git a/src/electronics/components/resistordip.cpp b/src/electronics/components/resistordip.cpp
index 3ff030c..b5c75c9 100644
--- a/src/electronics/components/resistordip.cpp
+++ b/src/electronics/components/resistordip.cpp
@@ -14,7 +14,7 @@
 #include "resistordip.h"
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpainter.h>
 
 Item* ResistorDIP::construct( ItemDocument *itemDocument, bool newItem, const char *id )
diff --git a/src/electronics/components/rotoswitch.cpp b/src/electronics/components/rotoswitch.cpp
index 738942b..96a7681 100644
--- a/src/electronics/components/rotoswitch.cpp
+++ b/src/electronics/components/rotoswitch.cpp
@@ -15,7 +15,7 @@
 #include "libraryitem.h"
 #include "switch.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpainter.h>
 #include <cmath>
 #include <assert.h>
diff --git a/src/electronics/components/serialportcomponent.cpp b/src/electronics/components/serialportcomponent.cpp
index 4e3a221..e59b80c 100644
--- a/src/electronics/components/serialportcomponent.cpp
+++ b/src/electronics/components/serialportcomponent.cpp
@@ -18,7 +18,7 @@
 #include "resistance.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpainter.h>
 
 #include <cmath>
diff --git a/src/electronics/components/toggleswitch.cpp b/src/electronics/components/toggleswitch.cpp
index 7c877f9..3d11ea6 100644
--- a/src/electronics/components/toggleswitch.cpp
+++ b/src/electronics/components/toggleswitch.cpp
@@ -15,7 +15,7 @@
 #include "libraryitem.h"
 #include "switch.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpainter.h>
 
 //BEGIN class ECDPDT
diff --git a/src/electronics/gpsimprocessor.cpp b/src/electronics/gpsimprocessor.cpp
index 2b45da7..587fc6f 100644
--- a/src/electronics/gpsimprocessor.cpp
+++ b/src/electronics/gpsimprocessor.cpp
@@ -24,9 +24,9 @@
 #include <assert.h>
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <ktempfile.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
+#include <tdetempfile.h>
 #include <kstandarddirs.h>
 #include <tqfile.h>
 #include <tqtextstream.h>
diff --git a/src/flowcodedocument.cpp b/src/flowcodedocument.cpp
index efe0a94..7bdc695 100644
--- a/src/flowcodedocument.cpp
+++ b/src/flowcodedocument.cpp
@@ -24,8 +24,8 @@
 #include "programmerdlg.h"
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 FlowCodeDocument::FlowCodeDocument( const TQString &caption, KTechlab *ktechlab, const char *name )
 	: ICNDocument( caption, ktechlab, name )
diff --git a/src/flowcodeview.cpp b/src/flowcodeview.cpp
index ea67606..3690117 100644
--- a/src/flowcodeview.cpp
+++ b/src/flowcodeview.cpp
@@ -14,7 +14,7 @@
 #include "viewiface.h"
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <tqwhatsthis.h>
 
diff --git a/src/flowparts/callsub.cpp b/src/flowparts/callsub.cpp
index 2b2d30b..1346157 100644
--- a/src/flowparts/callsub.cpp
+++ b/src/flowparts/callsub.cpp
@@ -13,7 +13,7 @@
 #include "libraryitem.h"
 #include "flowcode.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 Item* CallSub::construct( ItemDocument *itemDocument, bool newItem, const char *id )
 {
diff --git a/src/flowparts/count.cpp b/src/flowparts/count.cpp
index e4bbdc3..ac44fb6 100644
--- a/src/flowparts/count.cpp
+++ b/src/flowparts/count.cpp
@@ -13,7 +13,7 @@
 #include "libraryitem.h"
 #include "flowcode.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 Item* Count::construct( ItemDocument *itemDocument, bool newItem, const char *id )
 {
diff --git a/src/flowparts/delay.cpp b/src/flowparts/delay.cpp
index ae85595..e9d02f6 100644
--- a/src/flowparts/delay.cpp
+++ b/src/flowparts/delay.cpp
@@ -13,7 +13,7 @@
 #include "libraryitem.h"
 #include "flowcode.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 Item* Delay::construct( ItemDocument *itemDocument, bool newItem, const char *id )
 {
diff --git a/src/flowparts/embed.cpp b/src/flowparts/embed.cpp
index 7e5f3a3..68357a6 100644
--- a/src/flowparts/embed.cpp
+++ b/src/flowparts/embed.cpp
@@ -13,7 +13,7 @@
 #include "libraryitem.h"
 #include "flowcode.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 Item* Embed::construct( ItemDocument *itemDocument, bool newItem, const char *id )
 {
diff --git a/src/flowparts/end.cpp b/src/flowparts/end.cpp
index 137dae0..6f27989 100644
--- a/src/flowparts/end.cpp
+++ b/src/flowparts/end.cpp
@@ -13,7 +13,7 @@
 #include "libraryitem.h"
 #include "flowcode.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 Item* End::construct( ItemDocument *itemDocument, bool newItem, const char *id )
 {
diff --git a/src/flowparts/forloop.cpp b/src/flowparts/forloop.cpp
index 23f4da5..305ad0f 100644
--- a/src/flowparts/forloop.cpp
+++ b/src/flowparts/forloop.cpp
@@ -13,7 +13,7 @@
 #include "libraryitem.h"
 #include "flowcode.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 Item* ForLoop::construct( ItemDocument *itemDocument, bool newItem, const char *id )
 {
diff --git a/src/flowparts/inputbutton.cpp b/src/flowparts/inputbutton.cpp
index d7c2a98..6ec6249 100644
--- a/src/flowparts/inputbutton.cpp
+++ b/src/flowparts/inputbutton.cpp
@@ -12,7 +12,7 @@
 #include "libraryitem.h"
 #include "flowcode.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 Item* InputButton::construct( ItemDocument *itemDocument, bool newItem, const char *id )
 {
diff --git a/src/flowparts/interrupt.cpp b/src/flowparts/interrupt.cpp
index 9325c33..6162949 100644
--- a/src/flowparts/interrupt.cpp
+++ b/src/flowparts/interrupt.cpp
@@ -13,7 +13,7 @@
 #include "libraryitem.h"
 #include "flowcode.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 Item* Interrupt::construct( ItemDocument *itemDocument, bool newItem, const char *id )
 {
diff --git a/src/flowparts/keypad.cpp b/src/flowparts/keypad.cpp
index 47e6f30..d1e99e4 100644
--- a/src/flowparts/keypad.cpp
+++ b/src/flowparts/keypad.cpp
@@ -13,7 +13,7 @@
 #include "libraryitem.h"
 #include "flowcode.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 Item* Keypad::construct( ItemDocument *itemDocument, bool newItem, const char *id )
 {
diff --git a/src/flowparts/pinmapping.cpp b/src/flowparts/pinmapping.cpp
index 80273df..84c8217 100644
--- a/src/flowparts/pinmapping.cpp
+++ b/src/flowparts/pinmapping.cpp
@@ -20,7 +20,7 @@
 #include "viewcontainer.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdestdaccel.h>
 
 #include <tqaccel.h>
diff --git a/src/flowparts/pulse.cpp b/src/flowparts/pulse.cpp
index 77f9dd0..88e7098 100644
--- a/src/flowparts/pulse.cpp
+++ b/src/flowparts/pulse.cpp
@@ -12,7 +12,7 @@
 #include "flowcode.h"
 #include "pulse.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 Item* Pulse::construct( ItemDocument *itemDocument, bool newItem, const char *id )
 {
diff --git a/src/flowparts/readport.cpp b/src/flowparts/readport.cpp
index 4385c58..11d3cb8 100644
--- a/src/flowparts/readport.cpp
+++ b/src/flowparts/readport.cpp
@@ -13,7 +13,7 @@
 #include "libraryitem.h"
 #include "flowcode.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 Item* ReadPort::construct( ItemDocument *itemDocument, bool newItem, const char *id )
 {
diff --git a/src/flowparts/repeat.cpp b/src/flowparts/repeat.cpp
index 3dda0ae..a4bdbfa 100644
--- a/src/flowparts/repeat.cpp
+++ b/src/flowparts/repeat.cpp
@@ -13,7 +13,7 @@
 #include "libraryitem.h"
 #include "flowcode.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 Item* Repeat::construct( ItemDocument *itemDocument, bool newItem, const char *id )
 {
diff --git a/src/flowparts/setpin.cpp b/src/flowparts/setpin.cpp
index be826da..d5c9985 100644
--- a/src/flowparts/setpin.cpp
+++ b/src/flowparts/setpin.cpp
@@ -16,7 +16,7 @@
 #include "flowcodedocument.h"
 #include "microsettings.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 Item* SetPin::construct( ItemDocument *itemDocument, bool newItem, const char *id )
 {
diff --git a/src/flowparts/sevenseg.cpp b/src/flowparts/sevenseg.cpp
index 90a4e7e..d74586e 100644
--- a/src/flowparts/sevenseg.cpp
+++ b/src/flowparts/sevenseg.cpp
@@ -13,7 +13,7 @@
 #include "libraryitem.h"
 #include "flowcode.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 Item* SevenSeg::construct( ItemDocument *itemDocument, bool newItem, const char *id )
 {
diff --git a/src/flowparts/start.cpp b/src/flowparts/start.cpp
index b365d14..0d3da0c 100644
--- a/src/flowparts/start.cpp
+++ b/src/flowparts/start.cpp
@@ -13,7 +13,7 @@
 #include "libraryitem.h"
 #include "flowcode.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 Item* Start::construct( ItemDocument *itemDocument, bool newItem, const char *id )
 {
diff --git a/src/flowparts/sub.cpp b/src/flowparts/sub.cpp
index 6b02944..5be9f8e 100644
--- a/src/flowparts/sub.cpp
+++ b/src/flowparts/sub.cpp
@@ -13,7 +13,7 @@
 #include "libraryitem.h"
 #include "flowcode.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 Item* Sub::construct( ItemDocument *itemDocument, bool newItem, const char *id )
 {
diff --git a/src/flowparts/testpin.cpp b/src/flowparts/testpin.cpp
index 05f0a97..012c2a9 100644
--- a/src/flowparts/testpin.cpp
+++ b/src/flowparts/testpin.cpp
@@ -13,7 +13,7 @@
 #include "libraryitem.h"
 #include "flowcode.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 Item* TestPin::construct( ItemDocument *itemDocument, bool newItem, const char *id )
 {
diff --git a/src/flowparts/unary.cpp b/src/flowparts/unary.cpp
index 077afc7..de39d84 100644
--- a/src/flowparts/unary.cpp
+++ b/src/flowparts/unary.cpp
@@ -13,7 +13,7 @@
 #include "libraryitem.h"
 #include "flowcode.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 Item* Unary::construct( ItemDocument *itemDocument, bool newItem, const char *id )
 {
diff --git a/src/flowparts/varassignment.cpp b/src/flowparts/varassignment.cpp
index d40af61..9ef2c0b 100644
--- a/src/flowparts/varassignment.cpp
+++ b/src/flowparts/varassignment.cpp
@@ -13,7 +13,7 @@
 #include "libraryitem.h"
 #include "flowcode.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 Item* VarAssignment::construct( ItemDocument *itemDocument, bool newItem, const char *id )
 {
diff --git a/src/flowparts/varcomparison.cpp b/src/flowparts/varcomparison.cpp
index 30eff19..d76ad7c 100644
--- a/src/flowparts/varcomparison.cpp
+++ b/src/flowparts/varcomparison.cpp
@@ -13,7 +13,7 @@
 #include "libraryitem.h"
 #include "flowcode.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 Item* VarComparison::construct( ItemDocument *itemDocument, bool newItem, const char *id )
 {
diff --git a/src/flowparts/while.cpp b/src/flowparts/while.cpp
index be2189d..ef8474f 100644
--- a/src/flowparts/while.cpp
+++ b/src/flowparts/while.cpp
@@ -13,7 +13,7 @@
 #include "libraryitem.h"
 #include "flowcode.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 Item* While::construct( ItemDocument *itemDocument, bool newItem, const char *id )
 {
diff --git a/src/flowparts/writeport.cpp b/src/flowparts/writeport.cpp
index 9816f69..c76c349 100644
--- a/src/flowparts/writeport.cpp
+++ b/src/flowparts/writeport.cpp
@@ -13,7 +13,7 @@
 #include "libraryitem.h"
 #include "flowcode.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 Item* WritePort::construct( ItemDocument *itemDocument, bool newItem, const char *id )
 {
diff --git a/src/gui/colorcombo.cpp b/src/gui/colorcombo.cpp
index 55b8958..e5d17dd 100644
--- a/src/gui/colorcombo.cpp
+++ b/src/gui/colorcombo.cpp
@@ -11,7 +11,7 @@
 #include "colorcombo.h"
 
 #include <kcolordialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpainter.h>
 
 bool ColorCombo::createdPalettes = false;
diff --git a/src/gui/contexthelp.cpp b/src/gui/contexthelp.cpp
index c19105e..f12ed61 100644
--- a/src/gui/contexthelp.cpp
+++ b/src/gui/contexthelp.cpp
@@ -14,7 +14,7 @@
 #include "itemlibrary.h"
 #include "katemdi.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqlayout.h>
 #include <tqlabel.h>
diff --git a/src/gui/doublespinbox.cpp b/src/gui/doublespinbox.cpp
index c847ae3..d513ebd 100644
--- a/src/gui/doublespinbox.cpp
+++ b/src/gui/doublespinbox.cpp
@@ -12,8 +12,8 @@
 #include "doublespinbox.h"
 
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 #include <tqlineedit.h>
 #include <tqregexp.h>
diff --git a/src/gui/itemeditor.cpp b/src/gui/itemeditor.cpp
index f82f46e..fa37dfb 100644
--- a/src/gui/itemeditor.cpp
+++ b/src/gui/itemeditor.cpp
@@ -14,7 +14,7 @@
 #include "orientationwidget.h"
 #include "propertieslistview.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include <tqlayout.h>
diff --git a/src/gui/itemselector.cpp b/src/gui/itemselector.cpp
index f4ba5e6..d10cd52 100644
--- a/src/gui/itemselector.cpp
+++ b/src/gui/itemselector.cpp
@@ -21,7 +21,7 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqdragobject.h>
 #include <tqlayout.h>
diff --git a/src/gui/logview.cpp b/src/gui/logview.cpp
index 2da75a2..9031f45 100644
--- a/src/gui/logview.cpp
+++ b/src/gui/logview.cpp
@@ -13,7 +13,7 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <katemdi.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpopupmenu.h>
 
 
diff --git a/src/gui/microselectwidget.cpp b/src/gui/microselectwidget.cpp
index d6c1ced..0abb83d 100644
--- a/src/gui/microselectwidget.cpp
+++ b/src/gui/microselectwidget.cpp
@@ -14,7 +14,7 @@
 #include "microselectwidget.h"
 
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqgroupbox.h>
 #include <tqlabel.h>
 #include <tqlayout.h>
diff --git a/src/gui/microsettingsdlg.cpp b/src/gui/microsettingsdlg.cpp
index e551ebd..195aa3d 100644
--- a/src/gui/microsettingsdlg.cpp
+++ b/src/gui/microsettingsdlg.cpp
@@ -20,8 +20,8 @@
 #include <kdebug.h>
 #include <kinputdialog.h>
 #include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 
 #include <tqgroupbox.h>
diff --git a/src/gui/newfiledlg.cpp b/src/gui/newfiledlg.cpp
index 4a32b00..fd929e6 100644
--- a/src/gui/newfiledlg.cpp
+++ b/src/gui/newfiledlg.cpp
@@ -22,7 +22,7 @@
 #include <kdebug.h>
 #include <klineedit.h>
 #include <kiconview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 
 #include <tqcanvas.h>
diff --git a/src/gui/oscilloscope.cpp b/src/gui/oscilloscope.cpp
index d88924c..92c32bf 100644
--- a/src/gui/oscilloscope.cpp
+++ b/src/gui/oscilloscope.cpp
@@ -20,9 +20,9 @@
 #include <kcombobox.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h> 
+#include <tdelocale.h> 
 #include <knuminput.h>
 #include <tqbutton.h>
 #include <tqlabel.h>
diff --git a/src/gui/oscilloscopeview.cpp b/src/gui/oscilloscopeview.cpp
index e827814..5abcd3f 100644
--- a/src/gui/oscilloscopeview.cpp
+++ b/src/gui/oscilloscopeview.cpp
@@ -16,8 +16,8 @@
 
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <tdepopupmenu.h>
 #include <tqcheckbox.h>
 #include <tqcursor.h>
diff --git a/src/gui/outputmethoddlg.cpp b/src/gui/outputmethoddlg.cpp
index cb53109..2162865 100644
--- a/src/gui/outputmethoddlg.cpp
+++ b/src/gui/outputmethoddlg.cpp
@@ -20,7 +20,7 @@
 #include <kcombobox.h>
 #include <tdeconfigskeleton.h>
 #include <kdebug.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kurlrequester.h>
 
 #include <tqcheckbox.h>
diff --git a/src/gui/pieditor.cpp b/src/gui/pieditor.cpp
index 3b9505b..941126f 100644
--- a/src/gui/pieditor.cpp
+++ b/src/gui/pieditor.cpp
@@ -15,7 +15,7 @@
 
 #include <kcombobox.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 #include <kurlrequester.h>
 #include <tqlayout.h>
diff --git a/src/gui/programmerdlg.cpp b/src/gui/programmerdlg.cpp
index c8a8066..77446d8 100644
--- a/src/gui/programmerdlg.cpp
+++ b/src/gui/programmerdlg.cpp
@@ -18,7 +18,7 @@
 
 #include <kcombobox.h>
 #include <kguiitem.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstdguiitem.h>
 
 ProgrammerDlg::ProgrammerDlg( const TQString & picID, TQWidget *parent, const char *name )
diff --git a/src/gui/projectdlgs.cpp b/src/gui/projectdlgs.cpp
index d6f0ac6..f6e2718 100644
--- a/src/gui/projectdlgs.cpp
+++ b/src/gui/projectdlgs.cpp
@@ -22,7 +22,7 @@
 #include <tdeversion.h>
 #include <tdefiledialog.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurlrequester.h>
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
diff --git a/src/gui/propertieslistview.cpp b/src/gui/propertieslistview.cpp
index cf30212..560dedd 100644
--- a/src/gui/propertieslistview.cpp
+++ b/src/gui/propertieslistview.cpp
@@ -19,7 +19,7 @@
 
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqevent.h>
 #include <tqheader.h>
 #include <tqpushbutton.h>
diff --git a/src/gui/settingsdlg.cpp b/src/gui/settingsdlg.cpp
index 5b113e0..e8e481d 100644
--- a/src/gui/settingsdlg.cpp
+++ b/src/gui/settingsdlg.cpp
@@ -25,8 +25,8 @@
 #include <tdeconfig.h>
 #include <kinputdialog.h>
 #include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <knuminput.h>
 #include <kpushbutton.h>
 #include <kstandarddirs.h>
diff --git a/src/gui/symbolviewer.cpp b/src/gui/symbolviewer.cpp
index e887c8b..0e972e2 100644
--- a/src/gui/symbolviewer.cpp
+++ b/src/gui/symbolviewer.cpp
@@ -17,7 +17,7 @@
 #include <kcombobox.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlabel.h>
 #include <tqlayout.h>
 
diff --git a/src/icnview.cpp b/src/icnview.cpp
index ab2789e..43e5a9d 100644
--- a/src/icnview.cpp
+++ b/src/icnview.cpp
@@ -14,9 +14,9 @@
 #include "ktechlab.h"
 
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 
 ICNView::ICNView( ICNDocument *icnDocument, ViewContainer *viewContainer, uint viewAreaId, const char *name )
diff --git a/src/itemdocument.cpp b/src/itemdocument.cpp
index b6bf6a0..a8272d2 100644
--- a/src/itemdocument.cpp
+++ b/src/itemdocument.cpp
@@ -28,8 +28,8 @@
 #include <kdebug.h>
 #include <tdefiledialog.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <kprinter.h>
 #include <tqcheckbox.h>
diff --git a/src/itemdocumentdata.cpp b/src/itemdocumentdata.cpp
index d5ea552..24a0ac6 100644
--- a/src/itemdocumentdata.cpp
+++ b/src/itemdocumentdata.cpp
@@ -21,9 +21,9 @@
 
 #include <kdebug.h>
 #include <tdeio/netaccess.h>
-#include <klocale.h>
-#include <kmessagebox.h> 
-#include <ktempfile.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h> 
+#include <tdetempfile.h>
 #include <tqbitarray.h>
 #include <tqfile.h>
 
diff --git a/src/itemview.cpp b/src/itemview.cpp
index 06f7ff5..3692675 100644
--- a/src/itemview.cpp
+++ b/src/itemview.cpp
@@ -21,7 +21,7 @@
 
 #include <tdeaccel.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <kurldrag.h>
 
diff --git a/src/katemdi.cpp b/src/katemdi.cpp
index b96aa3a..7e4a9ff 100644
--- a/src/katemdi.cpp
+++ b/src/katemdi.cpp
@@ -23,9 +23,9 @@
 #include "katemdi.h"
 
 #include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
 #include <tdepopupmenu.h>
diff --git a/src/ktechlab.cpp b/src/ktechlab.cpp
index ef8505b..a5c3531 100644
--- a/src/ktechlab.cpp
+++ b/src/ktechlab.cpp
@@ -47,8 +47,8 @@
 #include <kiconloader.h>
 #include <tdeio/netaccess.h>
 #include <kkeydialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <ktabwidget.h> 
diff --git a/src/languages/flowcode.cpp b/src/languages/flowcode.cpp
index fe575f9..743fa54 100644
--- a/src/languages/flowcode.cpp
+++ b/src/languages/flowcode.cpp
@@ -18,8 +18,8 @@
 #include "node.h"
 #include "pinmapping.h"
 
-#include <klocale.h>
-// #include <kmessagebox.h>
+#include <tdelocale.h>
+// #include <tdemessagebox.h>
 #include <tqfile.h>
 
 FlowCode::FlowCode( ProcessChain *processChain, KTechlab *parent )
diff --git a/src/languages/gpasm.cpp b/src/languages/gpasm.cpp
index 1da7355..92dc0db 100644
--- a/src/languages/gpasm.cpp
+++ b/src/languages/gpasm.cpp
@@ -15,8 +15,8 @@
 #include "languagemanager.h"
 #include "src/core/ktlconfig.h"
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <tqregexp.h>
 
diff --git a/src/languages/gpdasm.cpp b/src/languages/gpdasm.cpp
index 0827ba8..1fd7fbb 100644
--- a/src/languages/gpdasm.cpp
+++ b/src/languages/gpdasm.cpp
@@ -13,8 +13,8 @@
 #include "logview.h"
 #include "languagemanager.h"
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <tqfile.h>
 #include <tqregexp.h>
diff --git a/src/languages/gplib.cpp b/src/languages/gplib.cpp
index b7d3156..ad579fd 100644
--- a/src/languages/gplib.cpp
+++ b/src/languages/gplib.cpp
@@ -12,8 +12,8 @@
 #include "languagemanager.h"
 #include "logview.h"
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 
 Gplib::Gplib( ProcessChain *processChain, KTechlab * parent )
diff --git a/src/languages/gplink.cpp b/src/languages/gplink.cpp
index 3562a09..54ca0f3 100644
--- a/src/languages/gplink.cpp
+++ b/src/languages/gplink.cpp
@@ -12,8 +12,8 @@
 #include "languagemanager.h"
 #include "logview.h"
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 
 Gplink::Gplink( ProcessChain *processChain, KTechlab * parent )
diff --git a/src/languages/language.cpp b/src/languages/language.cpp
index 1296d93..67afac4 100644
--- a/src/languages/language.cpp
+++ b/src/languages/language.cpp
@@ -20,7 +20,7 @@
 
 #include <kdebug.h>
 #include <tdeio/netaccess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <tqregexp.h>
 #include <tqtimer.h>
diff --git a/src/languages/languagemanager.cpp b/src/languages/languagemanager.cpp
index 5d9b4cc..47bfaa2 100644
--- a/src/languages/languagemanager.cpp
+++ b/src/languages/languagemanager.cpp
@@ -12,7 +12,7 @@
 #include "languagemanager.h"
 #include "logview.h"
 #include "ktechlab.h"
-#include "ktempfile.h"
+#include "tdetempfile.h"
 #include "src/core/ktlconfig.h"
 #include "outputmethoddlg.h"
 #include "processchain.h"
@@ -24,7 +24,7 @@
 
 #include <kdockwidget.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqwhatsthis.h>
 
 #include <assert.h>
diff --git a/src/languages/microbe.cpp b/src/languages/microbe.cpp
index 110d200..e5af567 100644
--- a/src/languages/microbe.cpp
+++ b/src/languages/microbe.cpp
@@ -15,8 +15,8 @@
 #include "languagemanager.h"
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 
 #include <tqfile.h>
diff --git a/src/languages/picprogrammer.cpp b/src/languages/picprogrammer.cpp
index 4786297..8f3b13d 100644
--- a/src/languages/picprogrammer.cpp
+++ b/src/languages/picprogrammer.cpp
@@ -15,8 +15,8 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include <tqapplication.h>
 #include <tqfile.h>
diff --git a/src/languages/processchain.cpp b/src/languages/processchain.cpp
index 00edbb8..83757aa 100644
--- a/src/languages/processchain.cpp
+++ b/src/languages/processchain.cpp
@@ -29,8 +29,8 @@
 #include "sdcc.h"
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <ktempfile.h>
+#include <tdelocale.h>
+#include <tdetempfile.h>
 #include <tqfile.h>
 #include <tqtimer.h>
 
diff --git a/src/languages/sdcc.cpp b/src/languages/sdcc.cpp
index 96cf54c..7b73361 100644
--- a/src/languages/sdcc.cpp
+++ b/src/languages/sdcc.cpp
@@ -16,8 +16,8 @@
 #include "sdcc.h"
 #include "src/core/ktlconfig.h"
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 
 SDCC::SDCC( ProcessChain * processChain, KTechlab * parent )
diff --git a/src/mechanics/chassiscircular2.cpp b/src/mechanics/chassiscircular2.cpp
index 715073f..117676e 100644
--- a/src/mechanics/chassiscircular2.cpp
+++ b/src/mechanics/chassiscircular2.cpp
@@ -12,7 +12,7 @@
 
 #include "libraryitem.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpainter.h>
 #include <tqwmatrix.h>
 
diff --git a/src/mechanics/mechanicsdocument.cpp b/src/mechanics/mechanicsdocument.cpp
index 98542ef..1c197be 100644
--- a/src/mechanics/mechanicsdocument.cpp
+++ b/src/mechanics/mechanicsdocument.cpp
@@ -18,7 +18,7 @@
 #include "mechanicssimulation.h"
 #include "mechanicsview.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 MechanicsDocument::MechanicsDocument( const TQString &caption, KTechlab *ktechlab, const char *name )
 	: ItemDocument( caption, ktechlab, name )
diff --git a/src/mechanics/mechanicsitem.cpp b/src/mechanics/mechanicsitem.cpp
index 81340b4..c02cfa4 100644
--- a/src/mechanics/mechanicsitem.cpp
+++ b/src/mechanics/mechanicsitem.cpp
@@ -13,7 +13,7 @@
 #include "mechanicsdocument.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqbitarray.h>
 #include <tqpainter.h>
 #include <tqwmatrix.h>
diff --git a/src/micro/picinfo12bit.cpp b/src/micro/picinfo12bit.cpp
index 12f8dd5..7df9472 100644
--- a/src/micro/picinfo12bit.cpp
+++ b/src/micro/picinfo12bit.cpp
@@ -11,7 +11,7 @@
 #include "micropackage.h"
 #include "picinfo12bit.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstaticdeleter.h>
 
 PicAsm12bit *PicAsm12bit::m_self = 0;
diff --git a/src/micro/picinfo14bit.cpp b/src/micro/picinfo14bit.cpp
index 9e75a92..203b33c 100644
--- a/src/micro/picinfo14bit.cpp
+++ b/src/micro/picinfo14bit.cpp
@@ -11,7 +11,7 @@
 #include "micropackage.h"
 #include "picinfo14bit.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstaticdeleter.h>
 
 PicAsm14bit *PicAsm14bit::m_self = 0;
diff --git a/src/micro/picinfo16bit.cpp b/src/micro/picinfo16bit.cpp
index cc7663f..632cc17 100644
--- a/src/micro/picinfo16bit.cpp
+++ b/src/micro/picinfo16bit.cpp
@@ -11,7 +11,7 @@
 #include "micropackage.h"
 #include "picinfo16bit.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstaticdeleter.h>
 
 PicAsm16bit *PicAsm16bit::m_self = 0;
diff --git a/src/picitem.cpp b/src/picitem.cpp
index dfadedf..2cda9a3 100644
--- a/src/picitem.cpp
+++ b/src/picitem.cpp
@@ -18,7 +18,7 @@
 
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpainter.h>
 
 static const int InnerWidth = 88;
diff --git a/src/projectmanager.cpp b/src/projectmanager.cpp
index 305b1cc..7acfa25 100644
--- a/src/projectmanager.cpp
+++ b/src/projectmanager.cpp
@@ -24,8 +24,8 @@
 #include <tdefiledialog.h>
 #include <kiconloader.h>
 #include <tdeio/netaccess.h>
-#include <klocale.h>
-#include <kmessagebox.h> 
+#include <tdelocale.h>
+#include <tdemessagebox.h> 
 #include <kmimetype.h>
 #include <kstandarddirs.h>
 #include <tqdom.h>
diff --git a/src/textdocument.cpp b/src/textdocument.cpp
index b967d84..ae4bfe7 100644
--- a/src/textdocument.cpp
+++ b/src/textdocument.cpp
@@ -29,9 +29,9 @@
 
 #include <kdebug.h>
 #include <klibloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <ktempfile.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
+#include <tdetempfile.h>
 
 
 TextDocument *TextDocument::constructTextDocument( const TQString& caption, KTechlab *parent, const char *name )
diff --git a/src/textview.cpp b/src/textview.cpp
index 05c8075..96c0095 100644
--- a/src/textview.cpp
+++ b/src/textview.cpp
@@ -29,7 +29,7 @@
 // #include "kateview.h"
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 
diff --git a/src/variant.cpp b/src/variant.cpp
index bfeafa9..3659bbc 100644
--- a/src/variant.cpp
+++ b/src/variant.cpp
@@ -12,7 +12,7 @@
 #include "cnitem.h"
 
 #include <cmath>
-#include <klocale.h>
+#include <tdelocale.h>
 
 Variant::Variant( Type::Value type )
 	: TQObject()
diff --git a/src/view.cpp b/src/view.cpp
index c5c5205..f219faf 100644
--- a/src/view.cpp
+++ b/src/view.cpp
@@ -17,7 +17,7 @@
 
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ksqueezedtextlabel.h>
 #include <tqpainter.h>
 
diff --git a/src/viewcontainer.cpp b/src/viewcontainer.cpp
index 49a4ff7..980eccb 100644
--- a/src/viewcontainer.cpp
+++ b/src/viewcontainer.cpp
@@ -16,8 +16,8 @@
 
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 #include <ktabwidget.h>
 #include <tqobjectlist.h>