Rename additional header files to avoid conflicts with KDE4

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 )

microbe/main.cpp

@@ -24,7 +24,7 @@
 
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqfile.h>
 
 #include <iostream>

microbe/microbe.cpp

@@ -25,7 +25,7 @@
 #include "pic14.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqfile.h>
 
 #include <iostream>

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>

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>

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> 
 

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 )

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");

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>
 

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 )

src/drawparts/dpline.cpp

@@ -15,7 +15,7 @@
 
 #include <cmath>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpainter.h>
 
 

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 )

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 )

src/drawparts/solidshape.cpp

@@ -14,7 +14,7 @@
 
 #include <cmath>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpainter.h>
 
 

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 )

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 )

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 )
 {

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 )

src/electronics/components/demultiplexer.cpp

@@ -14,7 +14,7 @@
 #include "libraryitem.h"
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <cmath>
 

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

src/electronics/components/discretelogic.cpp

@@ -15,7 +15,7 @@
 #include "libraryitem.h"
 #include "simulator.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpainter.h>
 
 

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 )

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] =

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 )

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 )

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>

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 )

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 )

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 )

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 )

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 )

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 )
 {

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 )

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 )

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>
 

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 )

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>
 

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 )

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 )

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

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

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 )

src/electronics/components/flipflop.cpp

@@ -16,7 +16,7 @@
 #include "simulator.h"
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpainter.h>
 
 

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 )

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 )

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 )
 {

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>
 

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>
 

src/electronics/components/meter.cpp

@@ -19,7 +19,7 @@
 #include "simulator.h"
 
 #include <cmath>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpainter.h>
 
 

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

src/electronics/components/multiplexer.cpp

@@ -14,7 +14,7 @@
 #include "libraryitem.h"
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <cmath>
 

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>

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>
 

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

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>

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 )
 {

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 )

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>

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>

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

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>

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 )

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>
 

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 )
 {

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 )
 {

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 )
 {

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 )
 {

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 )
 {

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 )
 {

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 )
 {

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 )
 {

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 )
 {

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>

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 )
 {

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 )
 {

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 )
 {

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 )
 {

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 )
 {

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 )
 {

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 )
 {

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 )
 {

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 )
 {

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 )
 {

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 )
 {

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 )
 {

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 )
 {

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;

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>

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>

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>

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>

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>
 
 

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>

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>

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>

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>

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>

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>

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>

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 )

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>

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>

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>

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>
 

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 )

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>

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>
 

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>
 

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>

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> 

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 )

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>
 

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>

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 )

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 )

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>

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>

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>

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>

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>
 

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 )

src/mechanics/chassiscircular2.cpp

@@ -12,7 +12,7 @@
 
 #include "libraryitem.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpainter.h>
 #include <tqwmatrix.h>
 

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 )

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>

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;

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;

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;

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;

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>

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 )

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>
 

src/variant.cpp

@@ -12,7 +12,7 @@
 #include "cnitem.h"
 
 #include <cmath>
-#include <klocale.h>
+#include <tdelocale.h>
 
 Variant::Variant( Type::Value type )
 	: TQObject()

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>
 

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>