diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:57:18 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:57:18 -0600 |
| commit | 958d14ea303abe33fce2c259c1000f18171e4229 (patch) | |
| tree | 61bc8236ab3aa4bc27ca205740322f8df50baff1 | |
| parent | b2de6514213d205907e8de3dd17f8eb80d868a4f (diff) | |
| download | tdegraphics-958d14ea303abe33fce2c259c1000f18171e4229.tar.gz tdegraphics-958d14ea303abe33fce2c259c1000f18171e4229.zip | |
Rename additional header files to avoid conflicts with KDE4
489 files changed, 703 insertions, 703 deletions
diff --git a/kamera/kcontrol/kamera.cpp b/kamera/kcontrol/kamera.cpp index 4ce4271c..53b17545 100644 --- a/kamera/kcontrol/kamera.cpp +++ b/kamera/kcontrol/kamera.cpp @@ -27,10 +27,10 @@ #include <ksimpleconfig.h> #include <tdeaction.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kiconview.h> #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdetoolbar.h> #include <tdepopupmenu.h> #include <kprotocolinfo.h> diff --git a/kamera/kcontrol/kameraconfigdialog.cpp b/kamera/kcontrol/kameraconfigdialog.cpp index bad19843..9806ff65 100644 --- a/kamera/kcontrol/kameraconfigdialog.cpp +++ b/kamera/kcontrol/kameraconfigdialog.cpp @@ -35,7 +35,7 @@ #include <tqtabwidget.h> #include <tqwhatsthis.h> -#include <klocale.h> +#include <tdelocale.h> #include "kameraconfigdialog.h" #include "kameraconfigdialog.moc" diff --git a/kamera/kcontrol/kameradevice.cpp b/kamera/kcontrol/kameradevice.cpp index d5d74b99..75db64a8 100644 --- a/kamera/kcontrol/kameradevice.cpp +++ b/kamera/kcontrol/kameradevice.cpp @@ -31,10 +31,10 @@ #include <tqlabel.h> #include <tqgrid.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <tdelistview.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdebug.h> #include "config.h" diff --git a/kamera/tdeioslave/kamera.cpp b/kamera/tdeioslave/kamera.cpp index 234e28dc..88228418 100644 --- a/kamera/tdeioslave/kamera.cpp +++ b/kamera/tdeioslave/kamera.cpp @@ -37,7 +37,7 @@ #include <kstandarddirs.h> #include <tdeconfig.h> #include <ksimpleconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <kprotocolinfo.h> #include <tdeio/slaveconfig.h> diff --git a/kcoloredit/colorselector.cpp b/kcoloredit/colorselector.cpp index ba041c4e..6dfbf08a 100644 --- a/kcoloredit/colorselector.cpp +++ b/kcoloredit/colorselector.cpp @@ -23,7 +23,7 @@ #include <tqlabel.h> #include <tqslider.h> #include <kseparator.h> -#include <klocale.h> +#include <tdelocale.h> #include "main.h" #include "imageselection.h" diff --git a/kcoloredit/gradientselection.cpp b/kcoloredit/gradientselection.cpp index 37ea901a..df0769d0 100644 --- a/kcoloredit/gradientselection.cpp +++ b/kcoloredit/gradientselection.cpp @@ -19,7 +19,7 @@ #include <tqframe.h> #include <tqradiobutton.h> #include <tqcolor.h> -#include <klocale.h> +#include <tdelocale.h> #include "main.h" #include "gradientselection.h" diff --git a/kcoloredit/kcolorchooser.cpp b/kcoloredit/kcolorchooser.cpp index 70a983f6..50b83f1a 100644 --- a/kcoloredit/kcolorchooser.cpp +++ b/kcoloredit/kcolorchooser.cpp @@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tdeapplication.h> #include <tdecmdlineargs.h> #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> #include "kcolordialog.h" diff --git a/kcoloredit/kcoloredit.cpp b/kcoloredit/kcoloredit.cpp index d5079fa6..f933bea9 100644 --- a/kcoloredit/kcoloredit.cpp +++ b/kcoloredit/kcoloredit.cpp @@ -22,10 +22,10 @@ // include files for KDE #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdefiledialog.h> -#include <kmenubar.h> -#include <klocale.h> +#include <tdemenubar.h> +#include <tdelocale.h> #include <kcolordialog.h> #include <tdeconfig.h> #include <kdebug.h> diff --git a/kcoloredit/kcoloreditdoc.cpp b/kcoloredit/kcoloreditdoc.cpp index b5823b1b..dac11879 100644 --- a/kcoloredit/kcoloreditdoc.cpp +++ b/kcoloredit/kcoloreditdoc.cpp @@ -22,8 +22,8 @@ #include <tqclipboard.h> // include files for KDE -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> // application specific includes #include "kcoloreditdoc.h" diff --git a/kcoloredit/kcoloreditview.cpp b/kcoloredit/kcoloreditview.cpp index b52296d7..ecc29b18 100644 --- a/kcoloredit/kcoloreditview.cpp +++ b/kcoloredit/kcoloreditview.cpp @@ -26,7 +26,7 @@ // include files for KDE #include <kseparator.h> -#include <klocale.h> +#include <tdelocale.h> // application specific includes #include "main.h" diff --git a/kcoloredit/loadpalettedlg.cpp b/kcoloredit/loadpalettedlg.cpp index ead23eff..057dbe7c 100644 --- a/kcoloredit/loadpalettedlg.cpp +++ b/kcoloredit/loadpalettedlg.cpp @@ -22,7 +22,7 @@ #include <tqstring.h> #include <tqstringlist.h> #include <tqpushbutton.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <kpalette.h> #include <tdefiledialog.h> diff --git a/kcoloredit/main.cpp b/kcoloredit/main.cpp index accb3f0c..ea1ec9d3 100644 --- a/kcoloredit/main.cpp +++ b/kcoloredit/main.cpp @@ -17,7 +17,7 @@ #include <tdecmdlineargs.h> #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include "kcoloredit.h" diff --git a/kcoloredit/palette.cpp b/kcoloredit/palette.cpp index 0c0a0747..53b8af82 100644 --- a/kcoloredit/palette.cpp +++ b/kcoloredit/palette.cpp @@ -19,9 +19,9 @@ #include <tqstringlist.h> #include <tqtextstream.h> #include <tqregexp.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include "main.h" #include "color.h" diff --git a/kcoloredit/paletteviewscrolledarea.cpp b/kcoloredit/paletteviewscrolledarea.cpp index b0524ebf..3a70aacc 100644 --- a/kcoloredit/paletteviewscrolledarea.cpp +++ b/kcoloredit/paletteviewscrolledarea.cpp @@ -25,7 +25,7 @@ #include <tqpen.h> #include <tqfontmetrics.h> #include <tqtimer.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kcolordrag.h> #include <tqscrollbar.h> diff --git a/kcoloredit/texteditselection.cpp b/kcoloredit/texteditselection.cpp index d32e054e..f1da81a1 100644 --- a/kcoloredit/texteditselection.cpp +++ b/kcoloredit/texteditselection.cpp @@ -19,7 +19,7 @@ #include <tqvalidator.h> #include <tqcolor.h> -#include <klocale.h> +#include <tdelocale.h> #include "main.h" #include "texteditselection.h" diff --git a/kdvi/TeXFontDefinition.cpp b/kdvi/TeXFontDefinition.cpp index 49ddcaa0..58d21f1b 100644 --- a/kdvi/TeXFontDefinition.cpp +++ b/kdvi/TeXFontDefinition.cpp @@ -2,7 +2,7 @@ #include <config.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqfile.h> #include "dviRenderer.h" diff --git a/kdvi/TeXFont_PFB.cpp b/kdvi/TeXFont_PFB.cpp index d2c74e27..a8d55c48 100644 --- a/kdvi/TeXFont_PFB.cpp +++ b/kdvi/TeXFont_PFB.cpp @@ -13,7 +13,7 @@ #include <config.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqimage.h> #include "fontpool.h" diff --git a/kdvi/TeXFont_PK.cpp b/kdvi/TeXFont_PK.cpp index 625e86d0..87d7de86 100644 --- a/kdvi/TeXFont_PK.cpp +++ b/kdvi/TeXFont_PK.cpp @@ -52,7 +52,7 @@ #include <config.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <math.h> #include <tqbitmap.h> #include <tqfile.h> diff --git a/kdvi/TeXFont_TFM.cpp b/kdvi/TeXFont_TFM.cpp index 456a27c3..987c0034 100644 --- a/kdvi/TeXFont_TFM.cpp +++ b/kdvi/TeXFont_TFM.cpp @@ -10,7 +10,7 @@ #include <config.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqdatastream.h> #include <tqfile.h> diff --git a/kdvi/dviFile.cpp b/kdvi/dviFile.cpp index 1b508367..d4c53dd2 100644 --- a/kdvi/dviFile.cpp +++ b/kdvi/dviFile.cpp @@ -52,8 +52,8 @@ #include <config.h> #include <kdebug.h> -#include <klocale.h> -#include <ktempfile.h> +#include <tdelocale.h> +#include <tdetempfile.h> #include <tqdir.h> #include <tqfileinfo.h> #include <stdlib.h> diff --git a/kdvi/dviRenderer.cpp b/kdvi/dviRenderer.cpp index ffc5a372..46a56980 100644 --- a/kdvi/dviRenderer.cpp +++ b/kdvi/dviRenderer.cpp @@ -29,15 +29,15 @@ #include <tqvbox.h> #include <tdeapplication.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kmimemagic.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kdebug.h> #include <keditcl.h> #include <tdefiledialog.h> #include <tdeio/job.h> #include <tdeio/netaccess.h> -#include <klocale.h> +#include <tdelocale.h> #include <kprinter.h> #include <kprocess.h> #include <kprogress.h> diff --git a/kdvi/dviRenderer_draw.cpp b/kdvi/dviRenderer_draw.cpp index 050396e9..74b5fd22 100644 --- a/kdvi/dviRenderer_draw.cpp +++ b/kdvi/dviRenderer_draw.cpp @@ -68,8 +68,8 @@ #include <stdlib.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kprocess.h> #include <tqpainter.h> #include <tqbitmap.h> diff --git a/kdvi/dviRenderer_export.cpp b/kdvi/dviRenderer_export.cpp index e5204a89..d6e15873 100644 --- a/kdvi/dviRenderer_export.cpp +++ b/kdvi/dviRenderer_export.cpp @@ -28,15 +28,15 @@ #include <stdlib.h> #include <tdeapplication.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdebug.h> #include <tdefiledialog.h> #include <tdeio/job.h> #include <tdeio/netaccess.h> -#include <klocale.h> +#include <tdelocale.h> #include <kprinter.h> #include <kprocess.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tqlabel.h> #include <tqpainter.h> diff --git a/kdvi/dviRenderer_prescan.cpp b/kdvi/dviRenderer_prescan.cpp index ea923130..84493dcc 100644 --- a/kdvi/dviRenderer_prescan.cpp +++ b/kdvi/dviRenderer_prescan.cpp @@ -19,7 +19,7 @@ #include "xdvi.h" #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kmimetype.h> #include <kprocess.h> #include <kprocio.h> diff --git a/kdvi/dviWidget.cpp b/kdvi/dviWidget.cpp index ded6e6cb..8b8545b6 100644 --- a/kdvi/dviWidget.cpp +++ b/kdvi/dviWidget.cpp @@ -11,7 +11,7 @@ #include <config.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "dviWidget.h" diff --git a/kdvi/fontpool.cpp b/kdvi/fontpool.cpp index a9d207eb..830d0f67 100644 --- a/kdvi/fontpool.cpp +++ b/kdvi/fontpool.cpp @@ -8,8 +8,8 @@ #include <kdebug.h> #include <kinstance.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kprocess.h> #include <kprocio.h> #include <math.h> diff --git a/kdvi/fontprogress.cpp b/kdvi/fontprogress.cpp index 07b61d91..7b7b8f3f 100644 --- a/kdvi/fontprogress.cpp +++ b/kdvi/fontprogress.cpp @@ -8,7 +8,7 @@ #include "fontprogress.h" #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kprocio.h> #include <kprogress.h> #include <tqapplication.h> diff --git a/kdvi/infodialog.cpp b/kdvi/infodialog.cpp index 0ec8f36a..4434109e 100644 --- a/kdvi/infodialog.cpp +++ b/kdvi/infodialog.cpp @@ -7,7 +7,7 @@ #include <kdebug.h> #include <tdeio/global.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqfile.h> #include <tqlabel.h> #include <tqlayout.h> diff --git a/kdvi/kdvi_multipage.cpp b/kdvi/kdvi_multipage.cpp index 382a5ae2..6a578873 100644 --- a/kdvi/kdvi_multipage.cpp +++ b/kdvi/kdvi_multipage.cpp @@ -7,11 +7,11 @@ #include <tdeconfigdialog.h> #include <kdebug.h> #include <tdefiledialog.h> -#include <kglobal.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdeglobal.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kstdaction.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <ktip.h> #include <tqtimer.h> diff --git a/kdvi/kdvi_multipage_texthandling.cpp b/kdvi/kdvi_multipage_texthandling.cpp index 495ed06f..f087f4b1 100644 --- a/kdvi/kdvi_multipage_texthandling.cpp +++ b/kdvi/kdvi_multipage_texthandling.cpp @@ -30,8 +30,8 @@ #include <kdebug.h> #include <keditcl.h> #include <tdefiledialog.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tqapplication.h> #include <tqprogressdialog.h> diff --git a/kdvi/main.cpp b/kdvi/main.cpp index c9c9b2d8..d96db4a2 100644 --- a/kdvi/main.cpp +++ b/kdvi/main.cpp @@ -6,7 +6,7 @@ #include <tdecmdlineargs.h> #include <kdebug.h> #include <kurl.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaboutdata.h> #include <tqdir.h> diff --git a/kdvi/optionDialogFontsWidget.cpp b/kdvi/optionDialogFontsWidget.cpp index 14a72ee2..39f7749d 100644 --- a/kdvi/optionDialogFontsWidget.cpp +++ b/kdvi/optionDialogFontsWidget.cpp @@ -11,7 +11,7 @@ #include <kcombobox.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqbuttongroup.h> #include <tqcheckbox.h> #include <tqtooltip.h> diff --git a/kdvi/optionDialogSpecialWidget.cpp b/kdvi/optionDialogSpecialWidget.cpp index 8b51c739..800a5d19 100644 --- a/kdvi/optionDialogSpecialWidget.cpp +++ b/kdvi/optionDialogSpecialWidget.cpp @@ -14,7 +14,7 @@ #include <tdeapplication.h> #include <kcombobox.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurllabel.h> #include <tqcheckbox.h> #include <tqlabel.h> diff --git a/kdvi/psgs.cpp b/kdvi/psgs.cpp index 7336d51f..7551a12f 100644 --- a/kdvi/psgs.cpp +++ b/kdvi/psgs.cpp @@ -9,10 +9,10 @@ #include <config.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kprocio.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kurl.h> #include <tqdir.h> #include <tqpainter.h> diff --git a/kdvi/special.cpp b/kdvi/special.cpp index 48c99ec8..760d849b 100644 --- a/kdvi/special.cpp +++ b/kdvi/special.cpp @@ -9,7 +9,7 @@ #include <config.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kmimetype.h> #include <kprocio.h> #include <tqdir.h> diff --git a/kdvi/util.cpp b/kdvi/util.cpp index 205b60c2..2942cf08 100644 --- a/kdvi/util.cpp +++ b/kdvi/util.cpp @@ -54,8 +54,8 @@ #include <stdlib.h> #include <kdebug.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include "dviRenderer.h" #include "xdvi.h" diff --git a/kdvi/vf.cpp b/kdvi/vf.cpp index 6e8f7a41..8532223f 100644 --- a/kdvi/vf.cpp +++ b/kdvi/vf.cpp @@ -26,7 +26,7 @@ #include <config.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/kfax/faxinput.cpp b/kfax/faxinput.cpp index 3f91f483..b0f7495f 100644 --- a/kfax/faxinput.cpp +++ b/kfax/faxinput.cpp @@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * #include <tqstring.h> #include <tqfile.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> void statusbarupdate(char* name,int width,int height,char* res); diff --git a/kfax/kfax.cpp b/kfax/kfax.cpp index dbe908fe..1d4b4b40 100644 --- a/kfax/kfax.cpp +++ b/kfax/kfax.cpp @@ -39,7 +39,7 @@ #include <tqpaintdevicemetrics.h> #include <tqbitmap.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaboutdata.h> #include <kstandarddirs.h> #include <kiconloader.h> @@ -47,12 +47,12 @@ #include <tdefilemetainfo.h> #include <tdestdaccel.h> #include <tdeconfig.h> -#include <kmenubar.h> -#include <kmessagebox.h> +#include <tdemenubar.h> +#include <tdemessagebox.h> #include <tdecmdlineargs.h> #include <tdeio/netaccess.h> #include <knotifyclient.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kstdaction.h> #include <kdebug.h> #include <kurldrag.h> diff --git a/kfax/kfax_printsettings.cpp b/kfax/kfax_printsettings.cpp index 5382c2e5..a05e4986 100644 --- a/kfax/kfax_printsettings.cpp +++ b/kfax/kfax_printsettings.cpp @@ -19,7 +19,7 @@ #include "kfax_printsettings.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqcheckbox.h> #include <tqlayout.h> #include <tqwhatsthis.h> diff --git a/kfax/options.cpp b/kfax/options.cpp index 2f162f7d..756eac62 100644 --- a/kfax/options.cpp +++ b/kfax/options.cpp @@ -28,7 +28,7 @@ #include <stdio.h> #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <tqdir.h> #include <tqprinter.h> diff --git a/kfax/viewfax.cpp b/kfax/viewfax.cpp index 45d059d1..09560320 100644 --- a/kfax/viewfax.cpp +++ b/kfax/viewfax.cpp @@ -44,7 +44,7 @@ #include <tqstring.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> #include "kfax.h" #include "faxexpand.h" diff --git a/kfaxview/faxrenderer.cpp b/kfaxview/faxrenderer.cpp index 0061d673..c2315908 100644 --- a/kfaxview/faxrenderer.cpp +++ b/kfaxview/faxrenderer.cpp @@ -20,9 +20,9 @@ #include <config.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqfileinfo.h> #include <tqpainter.h> diff --git a/kfaxview/libkfaximage/kfaximage.cpp b/kfaxview/libkfaximage/kfaximage.cpp index 1869aebb..b107f7a0 100644 --- a/kfaxview/libkfaximage/kfaximage.cpp +++ b/kfaxview/libkfaximage/kfaximage.cpp @@ -27,8 +27,8 @@ #include <tqimage.h> #include <tqfile.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kdebug.h> #include "faxexpand.h" diff --git a/kfaxview/main.cpp b/kfaxview/main.cpp index f47903b5..bfaa8f30 100644 --- a/kfaxview/main.cpp +++ b/kfaxview/main.cpp @@ -6,7 +6,7 @@ #include <tdecmdlineargs.h> #include <kdebug.h> #include <kurl.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaboutdata.h> #include <tqdir.h> diff --git a/kgamma/kcmkgamma/kgamma.cpp b/kgamma/kcmkgamma/kgamma.cpp index 729f249e..2d77e1f6 100644 --- a/kgamma/kcmkgamma/kgamma.cpp +++ b/kgamma/kcmkgamma/kgamma.cpp @@ -29,8 +29,8 @@ #include <kstandarddirs.h> #include <tdeconfig.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kprocess.h> #include <kdialog.h> #include <kgenericfactory.h> diff --git a/kghostview/infodialog.cpp b/kghostview/infodialog.cpp index 70826c11..e4a76006 100644 --- a/kghostview/infodialog.cpp +++ b/kghostview/infodialog.cpp @@ -24,7 +24,7 @@ #include <tqregexp.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstdguiitem.h> #include "infodialog.h" diff --git a/kghostview/kdscerrordialog.cpp b/kghostview/kdscerrordialog.cpp index 61245ed5..350acb4d 100644 --- a/kghostview/kdscerrordialog.cpp +++ b/kghostview/kdscerrordialog.cpp @@ -21,7 +21,7 @@ #include <tqtextedit.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kseparator.h> #include <kpushbutton.h> #include <kstdguiitem.h> diff --git a/kghostview/kgv_miniwidget.cpp b/kghostview/kgv_miniwidget.cpp index cb18e23c..94ca20bd 100644 --- a/kghostview/kgv_miniwidget.cpp +++ b/kghostview/kgv_miniwidget.cpp @@ -25,8 +25,8 @@ #include <kdebug.h> #include <kinstance.h> #include <tdeversion.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> // KLineEditDlg is depricated as of 3.2. use KInputDialog instead #if TDE_VERSION >= TDE_MAKE_VERSION(3,1,90) diff --git a/kghostview/kgv_view.cpp b/kghostview/kgv_view.cpp index 79da9b2d..af4e8380 100644 --- a/kghostview/kgv_view.cpp +++ b/kghostview/kgv_view.cpp @@ -28,14 +28,14 @@ #include <tdeconfig.h> #include <kdebug.h> #include <kdirwatch.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kiconloader.h> #include <kinstance.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdepopupmenu.h> #include <kstdaction.h> #include <tdestdaccel.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tdeio/scheduler.h> #include <tdeaboutdata.h> diff --git a/kghostview/kgvconfigdialog.cpp b/kghostview/kgvconfigdialog.cpp index 0982cc65..887c4811 100644 --- a/kghostview/kgvconfigdialog.cpp +++ b/kghostview/kgvconfigdialog.cpp @@ -23,11 +23,11 @@ #include <tdeconfig.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <kinstance.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kprocess.h> #include <kstandarddirs.h> #include <tdeconfigdialog.h> diff --git a/kghostview/kgvdocument.cpp b/kghostview/kgvdocument.cpp index 74adfd6a..1bc3fd40 100644 --- a/kghostview/kgvdocument.cpp +++ b/kghostview/kgvdocument.cpp @@ -25,13 +25,13 @@ #include <tdefiledialog.h> #include <kfilterdev.h> #include <kinstance.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kmimetype.h> #include <kprinter.h> #include <kprocess.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tdeio/netaccess.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include "configuration.h" diff --git a/kghostview/kgvshell.cpp b/kghostview/kgvshell.cpp index 78702ba6..753a4213 100644 --- a/kghostview/kgvshell.cpp +++ b/kghostview/kgvshell.cpp @@ -24,19 +24,19 @@ #include <tdefiledialog.h> #include <kiconloader.h> #include <klibloader.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <kstatusbar.h> #include <kstdaction.h> #include <tdestdaccel.h> -#include <ktempfile.h> -#include <kmenubar.h> +#include <tdetempfile.h> +#include <tdemenubar.h> #include <kedittoolbar.h> #include <kdebug.h> #include <kicontheme.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdepopupmenu.h> #include <tdeparts/componentfactory.h> diff --git a/kghostview/kpswidget.cpp b/kghostview/kpswidget.cpp index 71ab8b85..aae2f479 100644 --- a/kghostview/kpswidget.cpp +++ b/kghostview/kpswidget.cpp @@ -25,8 +25,8 @@ #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kprocess.h> #include "configuration.h" diff --git a/kghostview/logwindow.cpp b/kghostview/logwindow.cpp index 82e85a99..2e94e45a 100644 --- a/kghostview/logwindow.cpp +++ b/kghostview/logwindow.cpp @@ -20,9 +20,9 @@ #include <tqlabel.h> #include <tqvbox.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kurllabel.h> -#include <klocale.h> +#include <tdelocale.h> #include "logwindow.h" diff --git a/kghostview/main.cpp b/kghostview/main.cpp index 41bcabf9..bc91d6ad 100644 --- a/kghostview/main.cpp +++ b/kghostview/main.cpp @@ -21,7 +21,7 @@ #include <tdeaboutdata.h> #include <tdeapplication.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurl.h> #include "kgvshell.h" diff --git a/kghostview/martdelist.cpp b/kghostview/martdelist.cpp index 1f15e7d3..d8dc9b7b 100644 --- a/kghostview/martdelist.cpp +++ b/kghostview/martdelist.cpp @@ -26,8 +26,8 @@ #include <tqlabel.h> #include <tqwhatsthis.h> -#include <kglobalsettings.h> -#include <klocale.h> +#include <tdeglobalsettings.h> +#include <tdelocale.h> #include <kdebug.h> #include "kgv_miniwidget.h" diff --git a/kghostview/viewcontrol.cpp b/kghostview/viewcontrol.cpp index 84165e40..6c0cf0f5 100644 --- a/kghostview/viewcontrol.cpp +++ b/kghostview/viewcontrol.cpp @@ -20,7 +20,7 @@ #include "viewcontrol.h" #include "viewcontrol.moc" -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <kbuttonbox.h> #include <kseparator.h> diff --git a/kiconedit/kicon.cpp b/kiconedit/kicon.cpp index 9b99b113..296dc9a3 100644 --- a/kiconedit/kicon.cpp +++ b/kiconedit/kicon.cpp @@ -22,12 +22,12 @@ #include <tqimage.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdefiledialog.h> #include <tdeio/netaccess.h> #include <kimageio.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "kicon.h" #include "utils.h" diff --git a/kiconedit/kiconconfig.cpp b/kiconedit/kiconconfig.cpp index cb188501..d50fbc86 100644 --- a/kiconedit/kiconconfig.cpp +++ b/kiconedit/kiconconfig.cpp @@ -30,10 +30,10 @@ #include <tdeaccel.h> #include <kbuttonbox.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kcolorbutton.h> #include <tdefiledialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdebug.h> #include <kurlrequester.h> diff --git a/kiconedit/kiconedit.cpp b/kiconedit/kiconedit.cpp index e7bb711d..bec3af7f 100644 --- a/kiconedit/kiconedit.cpp +++ b/kiconedit/kiconedit.cpp @@ -24,8 +24,8 @@ #include <tdepopupmenu.h> #include <kstdaction.h> #include <tdeconfig.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kdebug.h> #include "kiconedit.h" diff --git a/kiconedit/kiconedit.h b/kiconedit/kiconedit.h index c6291c8c..7c6e74f0 100644 --- a/kiconedit/kiconedit.h +++ b/kiconedit/kiconedit.h @@ -27,7 +27,7 @@ #include <tdemainwindow.h> #include <kiconloader.h> -#include <kmenubar.h> +#include <tdemenubar.h> #include <kstatusbar.h> #include <tdetoolbar.h> #include <tdeaccel.h> diff --git a/kiconedit/kiconeditslots.cpp b/kiconedit/kiconeditslots.cpp index a25e2318..899a2b5d 100644 --- a/kiconedit/kiconeditslots.cpp +++ b/kiconedit/kiconeditslots.cpp @@ -22,8 +22,8 @@ #include <tqpainter.h> #include <kkeydialog.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kdebug.h> #include <kprinter.h> #include <kurldrag.h> diff --git a/kiconedit/kicongrid.cpp b/kiconedit/kicongrid.cpp index 28617657..0ed49f1e 100644 --- a/kiconedit/kicongrid.cpp +++ b/kiconedit/kicongrid.cpp @@ -32,8 +32,8 @@ #include <kiconloader.h> #include <kruler.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kdebug.h> #include "kresize.h" diff --git a/kiconedit/kicongrid.h b/kiconedit/kicongrid.h index eb604ae0..a88a78be 100644 --- a/kiconedit/kicongrid.h +++ b/kiconedit/kicongrid.h @@ -27,7 +27,7 @@ #include <tqpointarray.h> #include <tqframe.h> #include <kcommand.h> -#include <klocale.h> +#include <tdelocale.h> #include "kcolorgrid.h" diff --git a/kiconedit/knew.cpp b/kiconedit/knew.cpp index 58c97b4b..2536816f 100644 --- a/kiconedit/knew.cpp +++ b/kiconedit/knew.cpp @@ -25,8 +25,8 @@ #include <tqpushbutton.h> #include <tdeconfig.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <kdebug.h> #include <tdeapplication.h> diff --git a/kiconedit/kresize.cpp b/kiconedit/kresize.cpp index b2af86b6..b7007238 100644 --- a/kiconedit/kresize.cpp +++ b/kiconedit/kresize.cpp @@ -23,7 +23,7 @@ #include <tqlayout.h> #include <tqgroupbox.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include "kresize.h" diff --git a/kiconedit/main.cpp b/kiconedit/main.cpp index 93a8ce69..a9739af8 100644 --- a/kiconedit/main.cpp +++ b/kiconedit/main.cpp @@ -21,7 +21,7 @@ #include <stdlib.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> diff --git a/kiconedit/palettetoolbar.cpp b/kiconedit/palettetoolbar.cpp index eee9b87b..0e3520db 100644 --- a/kiconedit/palettetoolbar.cpp +++ b/kiconedit/palettetoolbar.cpp @@ -24,7 +24,7 @@ #include <tqwhatsthis.h> #include <tqpainter.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include "kiconcolors.h" diff --git a/kiconedit/utils.cpp b/kiconedit/utils.cpp index 8efeb547..efd50d88 100644 --- a/kiconedit/utils.cpp +++ b/kiconedit/utils.cpp @@ -20,7 +20,7 @@ */ #include <kimageio.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include "utils.h" diff --git a/kmrml/kmrml/algorithmdialog.cpp b/kmrml/kmrml/algorithmdialog.cpp index 7756d432..f2a0a089 100644 --- a/kmrml/kmrml/algorithmdialog.cpp +++ b/kmrml/kmrml/algorithmdialog.cpp @@ -27,7 +27,7 @@ #include <tqvbox.h> #include <tqvgroupbox.h> -#include <klocale.h> +#include <tdelocale.h> using namespace KMrml; diff --git a/kmrml/kmrml/kcontrol/indexer.cpp b/kmrml/kmrml/kcontrol/indexer.cpp index 2555ce6f..2392cfd5 100644 --- a/kmrml/kmrml/kcontrol/indexer.cpp +++ b/kmrml/kmrml/kcontrol/indexer.cpp @@ -20,8 +20,8 @@ #include <tqregexp.h> #include <kdebug.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kprocio.h> #include "indexer.h" diff --git a/kmrml/kmrml/kcontrol/indextest.cpp b/kmrml/kmrml/kcontrol/indextest.cpp index ac254b2b..cc816c0b 100644 --- a/kmrml/kmrml/kcontrol/indextest.cpp +++ b/kmrml/kmrml/kcontrol/indextest.cpp @@ -4,7 +4,7 @@ #include <tdeapplication.h> #include <tdeconfig.h> -#include <kglobal.h> +#include <tdeglobal.h> using namespace KMrmlConfig; diff --git a/kmrml/kmrml/kcontrol/kcmkmrml.cpp b/kmrml/kmrml/kcontrol/kcmkmrml.cpp index 03aa2bb4..e055a8bf 100644 --- a/kmrml/kmrml/kcontrol/kcmkmrml.cpp +++ b/kmrml/kmrml/kcontrol/kcmkmrml.cpp @@ -23,9 +23,9 @@ #include <tdeapplication.h> #include <kdebug.h> #include <kdialog.h> -#include <kglobal.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdeglobal.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kgenericfactory.h> #include <kstandarddirs.h> #include <kurllabel.h> diff --git a/kmrml/kmrml/kcontrol/mainpage.cpp b/kmrml/kmrml/kcontrol/mainpage.cpp index ee8fd88f..9ddd6bf9 100644 --- a/kmrml/kmrml/kcontrol/mainpage.cpp +++ b/kmrml/kmrml/kcontrol/mainpage.cpp @@ -26,10 +26,10 @@ #include <kcombobox.h> #include <kdialog.h> #include <keditlistbox.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <klineedit.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <knuminput.h> #include <kprogress.h> #include <kurlrequester.h> diff --git a/kmrml/kmrml/lib/kmrml_config.cpp b/kmrml/kmrml/lib/kmrml_config.cpp index c37e0fec..912658fd 100644 --- a/kmrml/kmrml/lib/kmrml_config.cpp +++ b/kmrml/kmrml/lib/kmrml_config.cpp @@ -22,7 +22,7 @@ #include <tdeconfig.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kprocess.h> #include <kstandarddirs.h> diff --git a/kmrml/kmrml/mrml.cpp b/kmrml/kmrml/mrml.cpp index 19560cec..8c49f009 100644 --- a/kmrml/kmrml/mrml.cpp +++ b/kmrml/kmrml/mrml.cpp @@ -27,9 +27,9 @@ #include <tdeconfig.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kinstance.h> -#include <klocale.h> +#include <tdelocale.h> #include <mrml_utils.h> diff --git a/kmrml/kmrml/mrml_part.cpp b/kmrml/kmrml/mrml_part.cpp index ab2731d0..a35814cf 100644 --- a/kmrml/kmrml/mrml_part.cpp +++ b/kmrml/kmrml/mrml_part.cpp @@ -33,17 +33,17 @@ #include <tdeconfig.h> #include <kdatastream.h> #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kinstance.h> #include <tdeio/job.h> #include <tdeio/jobclasses.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <knuminput.h> #include <kprotocolinfo.h> #include <tdeparts/genericfactory.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <mrml_utils.h> diff --git a/kmrml/kmrml/mrml_view.cpp b/kmrml/kmrml/mrml_view.cpp index 6b7ed49c..07c4ac46 100644 --- a/kmrml/kmrml/mrml_view.cpp +++ b/kmrml/kmrml/mrml_view.cpp @@ -25,7 +25,7 @@ #include <kcursor.h> #include <kdatastream.h> -#include <klocale.h> +#include <tdelocale.h> #include <kcombobox.h> #include <kmimetype.h> #include <kurl.h> diff --git a/kmrml/kmrml/mrmlsearch.cpp b/kmrml/kmrml/mrmlsearch.cpp index 13efb411..9bdb85cf 100644 --- a/kmrml/kmrml/mrmlsearch.cpp +++ b/kmrml/kmrml/mrmlsearch.cpp @@ -33,7 +33,7 @@ #include <tqfile.h> #include <tqstring.h> #include <tdeconfig.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kinstance.h> #include <kurl.h> diff --git a/kmrml/kmrml/server/watcher.cpp b/kmrml/kmrml/server/watcher.cpp index 8b524929..67f0c69a 100644 --- a/kmrml/kmrml/server/watcher.cpp +++ b/kmrml/kmrml/server/watcher.cpp @@ -21,8 +21,8 @@ #include <tdeapplication.h> #include <kdebug.h> #include <tdeversion.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include "watcher.h" diff --git a/kolourpaint/kolourpaint.cpp b/kolourpaint/kolourpaint.cpp index 55cf59dc..2a464b72 100644 --- a/kolourpaint/kolourpaint.cpp +++ b/kolourpaint/kolourpaint.cpp @@ -34,7 +34,7 @@ #include <tdecmdlineargs.h> #include <kdebug.h> #include <kimageio.h> -#include <klocale.h> +#include <tdelocale.h> // for srand #include <stdlib.h> diff --git a/kolourpaint/kpcommandhistory.cpp b/kolourpaint/kpcommandhistory.cpp index a192eac1..118f2280 100644 --- a/kolourpaint/kpcommandhistory.cpp +++ b/kolourpaint/kpcommandhistory.cpp @@ -39,7 +39,7 @@ #include <tdeapplication.h> #include <tdeconfig.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdepopupmenu.h> #include <tdestdaccel.h> #include <kstdaction.h> diff --git a/kolourpaint/kpdocument.cpp b/kolourpaint/kpdocument.cpp index 060f19eb..018dbb9c 100644 --- a/kolourpaint/kpdocument.cpp +++ b/kolourpaint/kpdocument.cpp @@ -46,14 +46,14 @@ #include <tqwmatrix.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kimageio.h> #include <tdeio/netaccess.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kmimetype.h> #include <ksavefile.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kpcolor.h> #include <kpcolortoolbar.h> diff --git a/kolourpaint/kpdocumentsaveoptions.cpp b/kolourpaint/kpdocumentsaveoptions.cpp index b617c469..2113bffa 100644 --- a/kolourpaint/kpdocumentsaveoptions.cpp +++ b/kolourpaint/kpdocumentsaveoptions.cpp @@ -35,7 +35,7 @@ #include <tdeconfig.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kpdefs.h> diff --git a/kolourpaint/kpdocumentsaveoptionswidget.cpp b/kolourpaint/kpdocumentsaveoptionswidget.cpp index d3a6d422..21b8f11e 100644 --- a/kolourpaint/kpdocumentsaveoptionswidget.cpp +++ b/kolourpaint/kpdocumentsaveoptionswidget.cpp @@ -42,9 +42,9 @@ #include <kdebug.h> #include <kdialog.h> #include <kdialogbase.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kimageio.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <kpushbutton.h> diff --git a/kolourpaint/kpmainwindow.cpp b/kolourpaint/kpmainwindow.cpp index ea00194d..24a45054 100644 --- a/kolourpaint/kpmainwindow.cpp +++ b/kolourpaint/kpmainwindow.cpp @@ -37,8 +37,8 @@ #include <tdeapplication.h> #include <tdeconfig.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kurldrag.h> #include <kpcolortoolbar.h> diff --git a/kolourpaint/kpmainwindow_edit.cpp b/kolourpaint/kpmainwindow_edit.cpp index 3b20417f..61cb7319 100644 --- a/kolourpaint/kpmainwindow_edit.cpp +++ b/kolourpaint/kpmainwindow_edit.cpp @@ -37,8 +37,8 @@ #include <tdeaction.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kstdaction.h> #include <kpcommandhistory.h> diff --git a/kolourpaint/kpmainwindow_file.cpp b/kolourpaint/kpmainwindow_file.cpp index ef602955..bc408f2c 100644 --- a/kolourpaint/kpmainwindow_file.cpp +++ b/kolourpaint/kpmainwindow_file.cpp @@ -44,8 +44,8 @@ #include <kimagefilepreview.h> #include <kimageio.h> #include <tdeio/netaccess.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kprinter.h> #include <tdestdaccel.h> #include <kstdaction.h> diff --git a/kolourpaint/kpmainwindow_help.cpp b/kolourpaint/kpmainwindow_help.cpp index d60bf3dd..e8c9da7a 100644 --- a/kolourpaint/kpmainwindow_help.cpp +++ b/kolourpaint/kpmainwindow_help.cpp @@ -36,7 +36,7 @@ #include <kdebug.h> #include <kdialogbase.h> #include <krun.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeshortcut.h> #include <kptool.h> diff --git a/kolourpaint/kpmainwindow_image.cpp b/kolourpaint/kpmainwindow_image.cpp index 525f474d..cb3bca73 100644 --- a/kolourpaint/kpmainwindow_image.cpp +++ b/kolourpaint/kpmainwindow_image.cpp @@ -36,8 +36,8 @@ #include <tdeapplication.h> #include <tdeconfig.h> #include <kdebug.h> -#include <klocale.h> -#include <kmenubar.h> +#include <tdelocale.h> +#include <tdemenubar.h> #include <kpcolor.h> #include <kpdefs.h> diff --git a/kolourpaint/kpmainwindow_settings.cpp b/kolourpaint/kpmainwindow_settings.cpp index 5c4c33db..b3a7448e 100644 --- a/kolourpaint/kpmainwindow_settings.cpp +++ b/kolourpaint/kpmainwindow_settings.cpp @@ -34,8 +34,8 @@ #include <kdebug.h> #include <kedittoolbar.h> #include <kkeydialog.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kstdaction.h> #include <kpdefs.h> diff --git a/kolourpaint/kpmainwindow_statusbar.cpp b/kolourpaint/kpmainwindow_statusbar.cpp index bc1bc296..b46dd658 100644 --- a/kolourpaint/kpmainwindow_statusbar.cpp +++ b/kolourpaint/kpmainwindow_statusbar.cpp @@ -34,7 +34,7 @@ #include <tqstring.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstatusbar.h> #include <kpdefs.h> diff --git a/kolourpaint/kpmainwindow_text.cpp b/kolourpaint/kpmainwindow_text.cpp index a76ec58d..c96413be 100644 --- a/kolourpaint/kpmainwindow_text.cpp +++ b/kolourpaint/kpmainwindow_text.cpp @@ -33,7 +33,7 @@ #include <tdeconfig.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpcolortoolbar.h> #include <kpdefs.h> diff --git a/kolourpaint/kpmainwindow_tools.cpp b/kolourpaint/kpmainwindow_tools.cpp index e8c25a30..50bd74ed 100644 --- a/kolourpaint/kpmainwindow_tools.cpp +++ b/kolourpaint/kpmainwindow_tools.cpp @@ -31,7 +31,7 @@ #include <tdeapplication.h> #include <tdeconfig.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpcolortoolbar.h> #include <kpcommandhistory.h> diff --git a/kolourpaint/kpmainwindow_view.cpp b/kolourpaint/kpmainwindow_view.cpp index d700f427..f76b6183 100644 --- a/kolourpaint/kpmainwindow_view.cpp +++ b/kolourpaint/kpmainwindow_view.cpp @@ -38,7 +38,7 @@ #include <tdeapplication.h> #include <tdeconfig.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstdaction.h> #include <kpdefs.h> diff --git a/kolourpaint/kpselection.cpp b/kolourpaint/kpselection.cpp index c5381d7d..2728f3cb 100644 --- a/kolourpaint/kpselection.cpp +++ b/kolourpaint/kpselection.cpp @@ -37,7 +37,7 @@ #include <tqwmatrix.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpcolorsimilaritydialog.h> #include <kpdefs.h> diff --git a/kolourpaint/kpthumbnail.cpp b/kolourpaint/kpthumbnail.cpp index a1de8556..dbf6ff01 100644 --- a/kolourpaint/kpthumbnail.cpp +++ b/kolourpaint/kpthumbnail.cpp @@ -35,7 +35,7 @@ #include <tqtimer.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpdefs.h> #include <kpdocument.h> diff --git a/kolourpaint/kptool.cpp b/kolourpaint/kptool.cpp index 7018c68f..fea1cf58 100644 --- a/kolourpaint/kptool.cpp +++ b/kolourpaint/kptool.cpp @@ -44,8 +44,8 @@ #include <tdeapplication.h> #include <kdebug.h> #include <kiconloader.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kpcolor.h> #include <kpcolortoolbar.h> diff --git a/kolourpaint/kpviewscrollablecontainer.cpp b/kolourpaint/kpviewscrollablecontainer.cpp index 80e9d9e7..50d6ec9c 100644 --- a/kolourpaint/kpviewscrollablecontainer.cpp +++ b/kolourpaint/kpviewscrollablecontainer.cpp @@ -36,7 +36,7 @@ #include <tqtimer.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpdefs.h> #include <kppixmapfx.h> diff --git a/kolourpaint/patches/color_eraser_speedup.diff b/kolourpaint/patches/color_eraser_speedup.diff index 5e1ff7b7..d57ece28 100644 --- a/kolourpaint/patches/color_eraser_speedup.diff +++ b/kolourpaint/patches/color_eraser_speedup.diff @@ -34,7 +34,7 @@ diff -u -p -r1.9 kptoolpen.cpp +#include <qregion.h> #include <kdebug.h> - #include <klocale.h> + #include <tdelocale.h> @@ -416,31 +417,28 @@ void kpToolPen::draw (const QPoint &this rect = neededRect (rect, m_brushPixmap [m_mouseButton].width ()); diff --git a/kolourpaint/pixmapfx/kpcoloreffect.cpp b/kolourpaint/pixmapfx/kpcoloreffect.cpp index 85ba5927..99ba5142 100644 --- a/kolourpaint/pixmapfx/kpcoloreffect.cpp +++ b/kolourpaint/pixmapfx/kpcoloreffect.cpp @@ -32,7 +32,7 @@ #include <tqpixmap.h> #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpdefs.h> #include <kpdocument.h> diff --git a/kolourpaint/pixmapfx/kpeffectbalance.cpp b/kolourpaint/pixmapfx/kpeffectbalance.cpp index c5aaa30e..a6b0a7ac 100644 --- a/kolourpaint/pixmapfx/kpeffectbalance.cpp +++ b/kolourpaint/pixmapfx/kpeffectbalance.cpp @@ -42,7 +42,7 @@ #include <kcombobox.h> #include <kdebug.h> #include <kimageeffect.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <kppixmapfx.h> diff --git a/kolourpaint/pixmapfx/kpeffectblursharpen.cpp b/kolourpaint/pixmapfx/kpeffectblursharpen.cpp index e1feaaa3..000b2114 100644 --- a/kolourpaint/pixmapfx/kpeffectblursharpen.cpp +++ b/kolourpaint/pixmapfx/kpeffectblursharpen.cpp @@ -38,7 +38,7 @@ #include <kdebug.h> #include <kimageeffect.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <kpmainwindow.h> diff --git a/kolourpaint/pixmapfx/kpeffectemboss.cpp b/kolourpaint/pixmapfx/kpeffectemboss.cpp index 0783021d..87cb7d14 100644 --- a/kolourpaint/pixmapfx/kpeffectemboss.cpp +++ b/kolourpaint/pixmapfx/kpeffectemboss.cpp @@ -39,7 +39,7 @@ #include <kdebug.h> #include <kimageeffect.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <kpmainwindow.h> diff --git a/kolourpaint/pixmapfx/kpeffectflatten.cpp b/kolourpaint/pixmapfx/kpeffectflatten.cpp index c870b5da..51d74381 100644 --- a/kolourpaint/pixmapfx/kpeffectflatten.cpp +++ b/kolourpaint/pixmapfx/kpeffectflatten.cpp @@ -40,9 +40,9 @@ #include <tdeconfig.h> #include <kdialog.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kimageeffect.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpdefs.h> #include <kppixmapfx.h> diff --git a/kolourpaint/pixmapfx/kpeffectinvert.cpp b/kolourpaint/pixmapfx/kpeffectinvert.cpp index ad05d013..d6229aca 100644 --- a/kolourpaint/pixmapfx/kpeffectinvert.cpp +++ b/kolourpaint/pixmapfx/kpeffectinvert.cpp @@ -36,7 +36,7 @@ #include <tqpixmap.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kppixmapfx.h> diff --git a/kolourpaint/pixmapfx/kpeffectreducecolors.cpp b/kolourpaint/pixmapfx/kpeffectreducecolors.cpp index 83dd997d..910e78ac 100644 --- a/kolourpaint/pixmapfx/kpeffectreducecolors.cpp +++ b/kolourpaint/pixmapfx/kpeffectreducecolors.cpp @@ -38,7 +38,7 @@ #include <tqradiobutton.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kppixmapfx.h> diff --git a/kolourpaint/pixmapfx/kpeffectsdialog.cpp b/kolourpaint/pixmapfx/kpeffectsdialog.cpp index 27f66d08..c23c028f 100644 --- a/kolourpaint/pixmapfx/kpeffectsdialog.cpp +++ b/kolourpaint/pixmapfx/kpeffectsdialog.cpp @@ -40,7 +40,7 @@ #include <kcombobox.h> #include <tdeconfig.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpdefs.h> #include <kpdocument.h> diff --git a/kolourpaint/pixmapfx/kppixmapfx.cpp b/kolourpaint/pixmapfx/kppixmapfx.cpp index d037758f..ac5fca44 100644 --- a/kolourpaint/pixmapfx/kppixmapfx.cpp +++ b/kolourpaint/pixmapfx/kppixmapfx.cpp @@ -45,8 +45,8 @@ #include <tdeconfig.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kpcolor.h> #include <kpdefs.h> diff --git a/kolourpaint/tools/kptoolairspray.cpp b/kolourpaint/tools/kptoolairspray.cpp index 0bf50b12..dc2b4a23 100644 --- a/kolourpaint/tools/kptoolairspray.cpp +++ b/kolourpaint/tools/kptoolairspray.cpp @@ -40,7 +40,7 @@ #include <tqtimer.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpcommandhistory.h> #include <kpdefs.h> diff --git a/kolourpaint/tools/kptoolautocrop.cpp b/kolourpaint/tools/kptoolautocrop.cpp index c294b1d0..97e7ed15 100644 --- a/kolourpaint/tools/kptoolautocrop.cpp +++ b/kolourpaint/tools/kptoolautocrop.cpp @@ -52,8 +52,8 @@ #include <tqpainter.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kpcolortoolbar.h> #include <kpcommandhistory.h> diff --git a/kolourpaint/tools/kptoolbrush.cpp b/kolourpaint/tools/kptoolbrush.cpp index a5122805..eb913fac 100644 --- a/kolourpaint/tools/kptoolbrush.cpp +++ b/kolourpaint/tools/kptoolbrush.cpp @@ -26,7 +26,7 @@ */ -#include <klocale.h> +#include <tdelocale.h> #include <kptoolbrush.h> kpToolBrush::kpToolBrush (kpMainWindow *mainWindow) diff --git a/kolourpaint/tools/kptoolclear.cpp b/kolourpaint/tools/kptoolclear.cpp index 7b1a775b..96f1af1f 100644 --- a/kolourpaint/tools/kptoolclear.cpp +++ b/kolourpaint/tools/kptoolclear.cpp @@ -31,7 +31,7 @@ #include <tqpixmap.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpdefs.h> #include <kpdocument.h> diff --git a/kolourpaint/tools/kptoolcolorpicker.cpp b/kolourpaint/tools/kptoolcolorpicker.cpp index d02a9572..b70cb0bc 100644 --- a/kolourpaint/tools/kptoolcolorpicker.cpp +++ b/kolourpaint/tools/kptoolcolorpicker.cpp @@ -36,7 +36,7 @@ #include <tqpoint.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpcolortoolbar.h> #include <kpcommandhistory.h> diff --git a/kolourpaint/tools/kptoolcolorwasher.cpp b/kolourpaint/tools/kptoolcolorwasher.cpp index 27679276..9298b654 100644 --- a/kolourpaint/tools/kptoolcolorwasher.cpp +++ b/kolourpaint/tools/kptoolcolorwasher.cpp @@ -26,7 +26,7 @@ */ -#include <klocale.h> +#include <tdelocale.h> #include <kptoolcolorwasher.h> kpToolColorWasher::kpToolColorWasher (kpMainWindow *mainWindow) diff --git a/kolourpaint/tools/kptoolconverttograyscale.cpp b/kolourpaint/tools/kptoolconverttograyscale.cpp index 7fe544f2..0bc94e44 100644 --- a/kolourpaint/tools/kptoolconverttograyscale.cpp +++ b/kolourpaint/tools/kptoolconverttograyscale.cpp @@ -29,7 +29,7 @@ #include <tqapplication.h> #include <tqpixmap.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpdefs.h> #include <kpdocument.h> diff --git a/kolourpaint/tools/kptoolcrop.cpp b/kolourpaint/tools/kptoolcrop.cpp index ac1967e5..930ad888 100644 --- a/kolourpaint/tools/kptoolcrop.cpp +++ b/kolourpaint/tools/kptoolcrop.cpp @@ -33,7 +33,7 @@ #include <tqpixmap.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpcolor.h> #include <kpcommandhistory.h> diff --git a/kolourpaint/tools/kptoolcurve.cpp b/kolourpaint/tools/kptoolcurve.cpp index 65424026..e8a9752e 100644 --- a/kolourpaint/tools/kptoolcurve.cpp +++ b/kolourpaint/tools/kptoolcurve.cpp @@ -28,7 +28,7 @@ #include <kptoolcurve.h> -#include <klocale.h> +#include <tdelocale.h> kpToolCurve::kpToolCurve (kpMainWindow *mainWindow) diff --git a/kolourpaint/tools/kptoolellipse.cpp b/kolourpaint/tools/kptoolellipse.cpp index 0f52a6ce..8aefd19f 100644 --- a/kolourpaint/tools/kptoolellipse.cpp +++ b/kolourpaint/tools/kptoolellipse.cpp @@ -26,7 +26,7 @@ */ -#include <klocale.h> +#include <tdelocale.h> #include <kptoolellipse.h> kpToolEllipse::kpToolEllipse (kpMainWindow *mainWindow) diff --git a/kolourpaint/tools/kptoolellipticalselection.cpp b/kolourpaint/tools/kptoolellipticalselection.cpp index 353fea9f..dcb20f85 100644 --- a/kolourpaint/tools/kptoolellipticalselection.cpp +++ b/kolourpaint/tools/kptoolellipticalselection.cpp @@ -28,7 +28,7 @@ #include <kptoolellipticalselection.h> -#include <klocale.h> +#include <tdelocale.h> kpToolEllipticalSelection::kpToolEllipticalSelection (kpMainWindow *mainWindow) diff --git a/kolourpaint/tools/kptooleraser.cpp b/kolourpaint/tools/kptooleraser.cpp index 7349f01c..d74609b2 100644 --- a/kolourpaint/tools/kptooleraser.cpp +++ b/kolourpaint/tools/kptooleraser.cpp @@ -26,7 +26,7 @@ */ -#include <klocale.h> +#include <tdelocale.h> #include <kptooleraser.h> kpToolEraser::kpToolEraser (kpMainWindow *mainWindow) diff --git a/kolourpaint/tools/kptoolflip.cpp b/kolourpaint/tools/kptoolflip.cpp index 88c81b8e..49aed85f 100644 --- a/kolourpaint/tools/kptoolflip.cpp +++ b/kolourpaint/tools/kptoolflip.cpp @@ -34,7 +34,7 @@ #include <tqvbuttongroup.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpdefs.h> #include <kpdocument.h> diff --git a/kolourpaint/tools/kptoolfloodfill.cpp b/kolourpaint/tools/kptoolfloodfill.cpp index 51e35707..5a59cd5b 100644 --- a/kolourpaint/tools/kptoolfloodfill.cpp +++ b/kolourpaint/tools/kptoolfloodfill.cpp @@ -37,7 +37,7 @@ #include <tqpixmap.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpcommandhistory.h> #include <kpdefs.h> diff --git a/kolourpaint/tools/kptoolfreeformselection.cpp b/kolourpaint/tools/kptoolfreeformselection.cpp index 6beab422..af4983ce 100644 --- a/kolourpaint/tools/kptoolfreeformselection.cpp +++ b/kolourpaint/tools/kptoolfreeformselection.cpp @@ -28,7 +28,7 @@ #include <kptoolfreeformselection.h> -#include <klocale.h> +#include <tdelocale.h> kpToolFreeFormSelection::kpToolFreeFormSelection (kpMainWindow *mainWindow) diff --git a/kolourpaint/tools/kptoolline.cpp b/kolourpaint/tools/kptoolline.cpp index e9cf57dd..07787e59 100644 --- a/kolourpaint/tools/kptoolline.cpp +++ b/kolourpaint/tools/kptoolline.cpp @@ -28,7 +28,7 @@ #include <kptoolline.h> -#include <klocale.h> +#include <tdelocale.h> kpToolLine::kpToolLine (kpMainWindow *mainWindow) diff --git a/kolourpaint/tools/kptoolpen.cpp b/kolourpaint/tools/kptoolpen.cpp index 5a601a83..387f4bb7 100644 --- a/kolourpaint/tools/kptoolpen.cpp +++ b/kolourpaint/tools/kptoolpen.cpp @@ -38,7 +38,7 @@ #endif #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpcolor.h> #include <kpcommandhistory.h> diff --git a/kolourpaint/tools/kptoolpolygon.cpp b/kolourpaint/tools/kptoolpolygon.cpp index 634a8ea3..00a70b02 100644 --- a/kolourpaint/tools/kptoolpolygon.cpp +++ b/kolourpaint/tools/kptoolpolygon.cpp @@ -44,7 +44,7 @@ #include <tqvbuttongroup.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpcommandhistory.h> #include <kpdocument.h> diff --git a/kolourpaint/tools/kptoolpolyline.cpp b/kolourpaint/tools/kptoolpolyline.cpp index aa388ef4..ade5e67b 100644 --- a/kolourpaint/tools/kptoolpolyline.cpp +++ b/kolourpaint/tools/kptoolpolyline.cpp @@ -28,7 +28,7 @@ #include <kptoolpolyline.h> -#include <klocale.h> +#include <tdelocale.h> kpToolPolyline::kpToolPolyline (kpMainWindow *mainWindow) diff --git a/kolourpaint/tools/kptoolpreviewdialog.cpp b/kolourpaint/tools/kptoolpreviewdialog.cpp index 30e223e3..65afb587 100644 --- a/kolourpaint/tools/kptoolpreviewdialog.cpp +++ b/kolourpaint/tools/kptoolpreviewdialog.cpp @@ -36,7 +36,7 @@ #include <tqpushbutton.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpcolor.h> #include <kpdocument.h> diff --git a/kolourpaint/tools/kptoolrectangle.cpp b/kolourpaint/tools/kptoolrectangle.cpp index a0699d7b..9e5883ea 100644 --- a/kolourpaint/tools/kptoolrectangle.cpp +++ b/kolourpaint/tools/kptoolrectangle.cpp @@ -34,7 +34,7 @@ #include <tqpainter.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpcolor.h> #include <kpcommandhistory.h> diff --git a/kolourpaint/tools/kptoolrectselection.cpp b/kolourpaint/tools/kptoolrectselection.cpp index 4c5b2b78..44a4cb08 100644 --- a/kolourpaint/tools/kptoolrectselection.cpp +++ b/kolourpaint/tools/kptoolrectselection.cpp @@ -28,7 +28,7 @@ #include <kptoolrectselection.h> -#include <klocale.h> +#include <tdelocale.h> kpToolRectSelection::kpToolRectSelection (kpMainWindow *mainWindow) diff --git a/kolourpaint/tools/kptoolresizescale.cpp b/kolourpaint/tools/kptoolresizescale.cpp index d0bcf731..3ced0735 100644 --- a/kolourpaint/tools/kptoolresizescale.cpp +++ b/kolourpaint/tools/kptoolresizescale.cpp @@ -54,10 +54,10 @@ #include <kcombobox.h> #include <tdeconfig.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconeffect.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <kpdefs.h> diff --git a/kolourpaint/tools/kptoolrotate.cpp b/kolourpaint/tools/kptoolrotate.cpp index 5def33ca..28e05d3e 100644 --- a/kolourpaint/tools/kptoolrotate.cpp +++ b/kolourpaint/tools/kptoolrotate.cpp @@ -42,7 +42,7 @@ #include <kdebug.h> #include <kiconloader.h> #include <knuminput.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpdefs.h> #include <kpdocument.h> diff --git a/kolourpaint/tools/kptoolroundedrectangle.cpp b/kolourpaint/tools/kptoolroundedrectangle.cpp index 0c4c6b6d..d8a62fb8 100644 --- a/kolourpaint/tools/kptoolroundedrectangle.cpp +++ b/kolourpaint/tools/kptoolroundedrectangle.cpp @@ -26,7 +26,7 @@ */ -#include <klocale.h> +#include <tdelocale.h> #include <kptoolroundedrectangle.h> kpToolRoundedRectangle::kpToolRoundedRectangle (kpMainWindow *mainWindow) diff --git a/kolourpaint/tools/kptoolselection.cpp b/kolourpaint/tools/kptoolselection.cpp index 5a4d7237..8fbdee55 100644 --- a/kolourpaint/tools/kptoolselection.cpp +++ b/kolourpaint/tools/kptoolselection.cpp @@ -39,7 +39,7 @@ #include <tqtimer.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpcommandhistory.h> #include <kpdefs.h> diff --git a/kolourpaint/tools/kptoolskew.cpp b/kolourpaint/tools/kptoolskew.cpp index eec804d7..230db783 100644 --- a/kolourpaint/tools/kptoolskew.cpp +++ b/kolourpaint/tools/kptoolskew.cpp @@ -40,7 +40,7 @@ #include <kdebug.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <kpdefs.h> diff --git a/kolourpaint/tools/kptooltext.cpp b/kolourpaint/tools/kptooltext.cpp index 352715ed..58955b3c 100644 --- a/kolourpaint/tools/kptooltext.cpp +++ b/kolourpaint/tools/kptooltext.cpp @@ -33,7 +33,7 @@ #include <tqvaluevector.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpcommandhistory.h> #include <kpdocument.h> diff --git a/kolourpaint/views/kpunzoomedthumbnailview.cpp b/kolourpaint/views/kpunzoomedthumbnailview.cpp index de7dfa0f..59b91f85 100644 --- a/kolourpaint/views/kpunzoomedthumbnailview.cpp +++ b/kolourpaint/views/kpunzoomedthumbnailview.cpp @@ -32,7 +32,7 @@ #include <kpunzoomedthumbnailview.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpdocument.h> #include <kpviewmanager.h> diff --git a/kolourpaint/views/kpzoomedthumbnailview.cpp b/kolourpaint/views/kpzoomedthumbnailview.cpp index b2315a9f..87f5bde8 100644 --- a/kolourpaint/views/kpzoomedthumbnailview.cpp +++ b/kolourpaint/views/kpzoomedthumbnailview.cpp @@ -32,7 +32,7 @@ #include <kpzoomedthumbnailview.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpdocument.h> #include <kpviewmanager.h> diff --git a/kolourpaint/widgets/kpcolorsimilaritycube.cpp b/kolourpaint/widgets/kpcolorsimilaritycube.cpp index 4d06d46e..60299475 100644 --- a/kolourpaint/widgets/kpcolorsimilaritycube.cpp +++ b/kolourpaint/widgets/kpcolorsimilaritycube.cpp @@ -37,7 +37,7 @@ #include <tqwhatsthis.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpcolor.h> #include <kpcolorsimilaritydialog.h> diff --git a/kolourpaint/widgets/kpcolorsimilaritydialog.cpp b/kolourpaint/widgets/kpcolorsimilaritydialog.cpp index d71ac501..f55f9d14 100644 --- a/kolourpaint/widgets/kpcolorsimilaritydialog.cpp +++ b/kolourpaint/widgets/kpcolorsimilaritydialog.cpp @@ -33,7 +33,7 @@ #include <tqlayout.h> #include <tqpushbutton.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <kpcolorsimilaritycube.h> diff --git a/kolourpaint/widgets/kpcolortoolbar.cpp b/kolourpaint/widgets/kpcolortoolbar.cpp index bdc4877b..d3bb51e1 100644 --- a/kolourpaint/widgets/kpcolortoolbar.cpp +++ b/kolourpaint/widgets/kpcolortoolbar.cpp @@ -46,7 +46,7 @@ #include <tdeconfig.h> #include <kdebug.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpcolorsimilaritydialog.h> #include <kpdefs.h> diff --git a/kolourpaint/widgets/kpsqueezedtextlabel.cpp b/kolourpaint/widgets/kpsqueezedtextlabel.cpp index 0aaea034..eefda7f0 100644 --- a/kolourpaint/widgets/kpsqueezedtextlabel.cpp +++ b/kolourpaint/widgets/kpsqueezedtextlabel.cpp @@ -35,7 +35,7 @@ #include <tqstring.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> kpSqueezedTextLabel::kpSqueezedTextLabel (TQWidget *parent, const char *name) diff --git a/kolourpaint/widgets/kptooltoolbar.cpp b/kolourpaint/widgets/kptooltoolbar.cpp index b0d5e93b..6e559fa8 100644 --- a/kolourpaint/widgets/kptooltoolbar.cpp +++ b/kolourpaint/widgets/kptooltoolbar.cpp @@ -41,7 +41,7 @@ #include <tdeconfig.h> #include <kdebug.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kicontheme.h> #include <kpdefs.h> diff --git a/kolourpaint/widgets/kptoolwidgetbrush.cpp b/kolourpaint/widgets/kptoolwidgetbrush.cpp index 57986b63..3d1f5999 100644 --- a/kolourpaint/widgets/kptoolwidgetbrush.cpp +++ b/kolourpaint/widgets/kptoolwidgetbrush.cpp @@ -35,7 +35,7 @@ #include <tqpainter.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpdefs.h> diff --git a/kolourpaint/widgets/kptoolwidgeterasersize.cpp b/kolourpaint/widgets/kptoolwidgeterasersize.cpp index 90167fd2..ac469b6e 100644 --- a/kolourpaint/widgets/kptoolwidgeterasersize.cpp +++ b/kolourpaint/widgets/kptoolwidgeterasersize.cpp @@ -34,7 +34,7 @@ #include <tqpainter.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpcolor.h> #include <kptool.h> diff --git a/kolourpaint/widgets/kptoolwidgetfillstyle.cpp b/kolourpaint/widgets/kptoolwidgetfillstyle.cpp index a87714c5..d13ae932 100644 --- a/kolourpaint/widgets/kptoolwidgetfillstyle.cpp +++ b/kolourpaint/widgets/kptoolwidgetfillstyle.cpp @@ -35,7 +35,7 @@ #include <tqpainter.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpcolor.h> #include <kpdefs.h> diff --git a/kolourpaint/widgets/kptoolwidgetlinewidth.cpp b/kolourpaint/widgets/kptoolwidgetlinewidth.cpp index 2ac9e39c..18d8870c 100644 --- a/kolourpaint/widgets/kptoolwidgetlinewidth.cpp +++ b/kolourpaint/widgets/kptoolwidgetlinewidth.cpp @@ -31,7 +31,7 @@ #include <tqbitmap.h> #include <tqpainter.h> -#include <klocale.h> +#include <tdelocale.h> static int lineWidths [] = {1, 2, 3, 5, 8}; diff --git a/kolourpaint/widgets/kptoolwidgetopaqueortransparent.cpp b/kolourpaint/widgets/kptoolwidgetopaqueortransparent.cpp index 4cd5b6f6..1b3a4d1d 100644 --- a/kolourpaint/widgets/kptoolwidgetopaqueortransparent.cpp +++ b/kolourpaint/widgets/kptoolwidgetopaqueortransparent.cpp @@ -32,7 +32,7 @@ #include <kdebug.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> kpToolWidgetOpaqueOrTransparent::kpToolWidgetOpaqueOrTransparent (TQWidget *parent, const char *name) diff --git a/kolourpaint/widgets/kptoolwidgetspraycansize.cpp b/kolourpaint/widgets/kptoolwidgetspraycansize.cpp index 24569a21..d435c72b 100644 --- a/kolourpaint/widgets/kptoolwidgetspraycansize.cpp +++ b/kolourpaint/widgets/kptoolwidgetspraycansize.cpp @@ -37,7 +37,7 @@ #include <kdebug.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kppixmapfx.h> diff --git a/kooka/imageselectline.cpp b/kooka/imageselectline.cpp index c037a958..71135dc2 100644 --- a/kooka/imageselectline.cpp +++ b/kooka/imageselectline.cpp @@ -32,7 +32,7 @@ #include <tqlabel.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurl.h> #include <kurlcombobox.h> #include <tdefiledialog.h> diff --git a/kooka/img_saver.cpp b/kooka/img_saver.cpp index 162cf3a2..8eb12701 100644 --- a/kooka/img_saver.cpp +++ b/kooka/img_saver.cpp @@ -30,19 +30,19 @@ #include <unistd.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeconfig.h> #include <kdialog.h> #include <kimageio.h> #include <kseparator.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kdebug.h> #include <tdeio/jobclasses.h> #include <tdeio/file.h> #include <tdeio/job.h> #include <tdeio/netaccess.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kinputdialog.h> #include <tqdir.h> diff --git a/kooka/imgnamecombo.cpp b/kooka/imgnamecombo.cpp index 3b954f79..14e261a2 100644 --- a/kooka/imgnamecombo.cpp +++ b/kooka/imgnamecombo.cpp @@ -32,7 +32,7 @@ #include <kcombobox.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdefiletreebranch.h> #include "imgnamecombo.h" diff --git a/kooka/imgprintdialog.cpp b/kooka/imgprintdialog.cpp index dd346b3c..a0182457 100644 --- a/kooka/imgprintdialog.cpp +++ b/kooka/imgprintdialog.cpp @@ -25,7 +25,7 @@ ***************************************************************************/ #include "imgprintdialog.h" -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <kdialog.h> diff --git a/kooka/kocrbase.cpp b/kooka/kocrbase.cpp index 85f932fe..6cc012b3 100644 --- a/kooka/kocrbase.cpp +++ b/kooka/kocrbase.cpp @@ -33,12 +33,12 @@ #include <tdeapplication.h> #include <tdeconfig.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kanimwidget.h> #include <kseparator.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kactivelabel.h> #include <tqhbox.h> #include <tqvbox.h> diff --git a/kooka/kocrgocr.cpp b/kooka/kocrgocr.cpp index f2eb41b6..8f1ba019 100644 --- a/kooka/kocrgocr.cpp +++ b/kooka/kocrgocr.cpp @@ -33,12 +33,12 @@ #include <tdeapplication.h> #include <tdeconfig.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kanimwidget.h> #include <kseparator.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "resource.h" #include "ksaneocr.h" // TODO: Really needed? diff --git a/kooka/kocrkadmos.cpp b/kooka/kocrkadmos.cpp index bc1b6def..0862f73b 100644 --- a/kooka/kocrkadmos.cpp +++ b/kooka/kocrkadmos.cpp @@ -37,12 +37,12 @@ #include <tdeapplication.h> #include <tdeconfig.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kanimwidget.h> #include <kseparator.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "resource.h" #include "ksaneocr.h" // TODO: Really needed? diff --git a/kooka/kocrocrad.cpp b/kooka/kocrocrad.cpp index ad4b39cd..2e824fae 100644 --- a/kooka/kocrocrad.cpp +++ b/kooka/kocrocrad.cpp @@ -34,12 +34,12 @@ #include <tdeapplication.h> #include <tdeconfig.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kanimwidget.h> #include <kseparator.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kurlrequester.h> #include <kprocess.h> diff --git a/kooka/kooka.cpp b/kooka/kooka.cpp index 5c08f69b..bdc99ee5 100644 --- a/kooka/kooka.cpp +++ b/kooka/kooka.cpp @@ -36,11 +36,11 @@ #include <tqpainter.h> #include <tqpaintdevicemetrics.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kdebug.h> #include <kiconloader.h> -#include <kmenubar.h> +#include <tdemenubar.h> #include <tdeaccel.h> #include <tdeio/netaccess.h> #include <tdefiledialog.h> @@ -51,7 +51,7 @@ #include <kurlrequesterdlg.h> #include <tqstrlist.h> #include <kedittoolbar.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdockwidget.h> #include <tdeparts/partmanager.h> #include <tdestdaccel.h> diff --git a/kooka/kookapref.cpp b/kooka/kookapref.cpp index 32477e67..d170840d 100644 --- a/kooka/kookapref.cpp +++ b/kooka/kookapref.cpp @@ -28,7 +28,7 @@ #include "kookapref.h" #include "img_saver.h" -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <tdeconfig.h> #include <kdebug.h> @@ -50,7 +50,7 @@ #include "kscanslider.h" #include "ksaneocr.h" -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tqbuttongroup.h> #include <tqradiobutton.h> #include <kurlrequester.h> diff --git a/kooka/kookaprint.cpp b/kooka/kookaprint.cpp index 829cd8a5..2a8cdfba 100644 --- a/kooka/kookaprint.cpp +++ b/kooka/kookaprint.cpp @@ -32,7 +32,7 @@ #include <tqfontmetrics.h> #include "imgprintdialog.h" #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> KookaPrint::KookaPrint( KPrinter *printer ) :TQObject(), diff --git a/kooka/kookaview.cpp b/kooka/kookaview.cpp index 21f670b9..98b49ef7 100644 --- a/kooka/kookaview.cpp +++ b/kooka/kookaview.cpp @@ -63,8 +63,8 @@ #include <kdebug.h> #include <ktrader.h> #include <klibloader.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <keditcl.h> #include <kled.h> #include <kcombobox.h> diff --git a/kooka/ksaneocr.cpp b/kooka/ksaneocr.cpp index efcb76d6..89660b53 100644 --- a/kooka/ksaneocr.cpp +++ b/kooka/ksaneocr.cpp @@ -27,10 +27,10 @@ /* $Id$ */ #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeconfig.h> #include <tdeapplication.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kprocess.h> #include <stdlib.h> #include <tdespell.h> @@ -56,7 +56,7 @@ #include <tqtimer.h> #include <tqregexp.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqpaintdevice.h> #include <tqpainter.h> #include <tqpen.h> diff --git a/kooka/main.cpp b/kooka/main.cpp index 48b32420..67caed2c 100644 --- a/kooka/main.cpp +++ b/kooka/main.cpp @@ -33,8 +33,8 @@ #include <dcopclient.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kimageio.h> #include <kiconloader.h> #include <kdebug.h> diff --git a/kooka/ocrresedit.cpp b/kooka/ocrresedit.cpp index 3ea563cc..8b65c398 100644 --- a/kooka/ocrresedit.cpp +++ b/kooka/ocrresedit.cpp @@ -29,7 +29,7 @@ #include "ocrword.h" #include <kdebug.h> #include <tdefiledialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqfile.h> #include <tqtextstream.h> diff --git a/kooka/scanpackager.cpp b/kooka/scanpackager.cpp index 22339e78..22f9b06a 100644 --- a/kooka/scanpackager.cpp +++ b/kooka/scanpackager.cpp @@ -40,7 +40,7 @@ #include <tqpopupmenu.h> #include <tqdict.h> #include <tqpixmap.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tqfiledialog.h> #include <tqstringlist.h> #include <tqheader.h> @@ -57,8 +57,8 @@ #include <tdefiledialog.h> #include <kurl.h> #include <kdebug.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <tdeio/global.h> #include <tdeio/progressbase.h> #include <tdeio/netaccess.h> diff --git a/kooka/thumbview.cpp b/kooka/thumbview.cpp index f202778f..4f5c1d7a 100644 --- a/kooka/thumbview.cpp +++ b/kooka/thumbview.cpp @@ -36,7 +36,7 @@ #include <tdefileiconview.h> #include <tdefiletreeviewitem.h> #include <kimageeffect.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> #include <kprogress.h> diff --git a/kpdf/conf/dlgperformance.ui.h b/kpdf/conf/dlgperformance.ui.h index 4d6062b6..402cba52 100644 --- a/kpdf/conf/dlgperformance.ui.h +++ b/kpdf/conf/dlgperformance.ui.h @@ -7,7 +7,7 @@ * (at your option) any later version. * ***************************************************************************/ -#include <klocale.h> +#include <tdelocale.h> // The purpose of this file is only to display a sort of descriptive text // when the user clicks on each memory profile. diff --git a/kpdf/conf/preferencesdialog.cpp b/kpdf/conf/preferencesdialog.cpp index a6e1979a..7a308b27 100644 --- a/kpdf/conf/preferencesdialog.cpp +++ b/kpdf/conf/preferencesdialog.cpp @@ -7,7 +7,7 @@ * (at your option) any later version. * ***************************************************************************/ -#include <klocale.h> +#include <tdelocale.h> // single config pages #include "dlggeneral.h" diff --git a/kpdf/core/document.cpp b/kpdf/core/document.cpp index d00b5d97..8b5a1d4f 100644 --- a/kpdf/core/document.cpp +++ b/kpdf/core/document.cpp @@ -19,9 +19,9 @@ #include <tqmap.h> #include <kdebug.h> #include <kimageio.h> -#include <klocale.h> +#include <tdelocale.h> #include <kfinddialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeapplication.h> #include <kuserprofile.h> #include <krun.h> diff --git a/kpdf/core/generator_pdf/generator_pdf.cpp b/kpdf/core/generator_pdf/generator_pdf.cpp index 0b29a624..a357d9ff 100644 --- a/kpdf/core/generator_pdf/generator_pdf.cpp +++ b/kpdf/core/generator_pdf/generator_pdf.cpp @@ -18,12 +18,12 @@ #include <tqvariant.h> #include <tdeapplication.h> #include <tdelistview.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpassdlg.h> #include <tdewallet.h> #include <kprinter.h> -#include <ktempfile.h> -#include <kmessagebox.h> +#include <tdetempfile.h> +#include <tdemessagebox.h> #include <kdebug.h> // xpdf includes diff --git a/kpdf/core/link.cpp b/kpdf/core/link.cpp index fd4aa141..6fe65f12 100644 --- a/kpdf/core/link.cpp +++ b/kpdf/core/link.cpp @@ -10,7 +10,7 @@ // local includes #include "link.h" -#include <klocale.h> +#include <tdelocale.h> KPDFLink::~KPDFLink() { diff --git a/kpdf/part.cpp b/kpdf/part.cpp index 2c600317..f7ad73c9 100644 --- a/kpdf/part.cpp +++ b/kpdf/part.cpp @@ -45,7 +45,7 @@ #include <tdeparts/genericfactory.h> #include <kurldrag.h> #include <tdefiledialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kfinddialog.h> #include <knuminput.h> #include <kiconloader.h> @@ -54,7 +54,7 @@ #include <tdepopupmenu.h> #include <kprocess.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <ktrader.h> #include <kxmlguiclient.h> #include <kxmlguifactory.h> diff --git a/kpdf/shell/main.cpp b/kpdf/shell/main.cpp index 09ba5613..b159e79e 100644 --- a/kpdf/shell/main.cpp +++ b/kpdf/shell/main.cpp @@ -16,7 +16,7 @@ #include <tdeapplication.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> static const char description[] = I18N_NOOP("kpdf, a kde pdf viewer based on xpdf"); diff --git a/kpdf/shell/shell.cpp b/kpdf/shell/shell.cpp index 6e85080d..209f8760 100644 --- a/kpdf/shell/shell.cpp +++ b/kpdf/shell/shell.cpp @@ -25,12 +25,12 @@ #include <kedittoolbar.h> #include <tdefiledialog.h> #include <klibloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstdaction.h> #include <kurl.h> #include <kdebug.h> -#include <klocale.h> -#include <kmenubar.h> +#include <tdelocale.h> +#include <tdemenubar.h> #include <tdeparts/componentfactory.h> #include <tdeio/netaccess.h> #include <tdemainwindowiface.h> diff --git a/kpdf/ui/pageview.cpp b/kpdf/ui/pageview.cpp index a385bf93..76a85771 100644 --- a/kpdf/ui/pageview.cpp +++ b/kpdf/ui/pageview.cpp @@ -33,7 +33,7 @@ #include <tdestdaccel.h> #include <tdeactioncollection.h> #include <tdepopupmenu.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdefiledialog.h> #include <kimageeffect.h> #include <kimageio.h> diff --git a/kpdf/ui/presentationwidget.cpp b/kpdf/ui/presentationwidget.cpp index 2928d387..a21bb499 100644 --- a/kpdf/ui/presentationwidget.cpp +++ b/kpdf/ui/presentationwidget.cpp @@ -20,10 +20,10 @@ #include <kcursor.h> #include <tdetoolbar.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kimageeffect.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <twin.h> // system includes diff --git a/kpdf/ui/propertiesdialog.cpp b/kpdf/ui/propertiesdialog.cpp index 79203666..d63f0339 100644 --- a/kpdf/ui/propertiesdialog.cpp +++ b/kpdf/ui/propertiesdialog.cpp @@ -11,9 +11,9 @@ #include <tqlayout.h> #include <tqlabel.h> #include <tdelistview.h> -#include <klocale.h> +#include <tdelocale.h> #include <ksqueezedtextlabel.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> // local includes #include "propertiesdialog.h" diff --git a/kpdf/ui/searchwidget.cpp b/kpdf/ui/searchwidget.cpp index 35f61dd3..8fcbfe22 100644 --- a/kpdf/ui/searchwidget.cpp +++ b/kpdf/ui/searchwidget.cpp @@ -13,7 +13,7 @@ #include <tqtimer.h> #include <tdeaction.h> #include <tdeactioncollection.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <klineedit.h> #include <tdepopupmenu.h> diff --git a/kpdf/ui/thumbnaillist.cpp b/kpdf/ui/thumbnaillist.cpp index ab25704f..b443daa5 100644 --- a/kpdf/ui/thumbnaillist.cpp +++ b/kpdf/ui/thumbnaillist.cpp @@ -10,7 +10,7 @@ // qt/kde includes #include <tqtimer.h> #include <tqpainter.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurl.h> #include <kurldrag.h> #include <tdeaction.h> diff --git a/kpdf/ui/toc.cpp b/kpdf/ui/toc.cpp index 8e2f9531..00ac8eaf 100644 --- a/kpdf/ui/toc.cpp +++ b/kpdf/ui/toc.cpp @@ -10,7 +10,7 @@ // qt/kde includes #include <tqheader.h> #include <tqvariant.h> -#include <klocale.h> +#include <tdelocale.h> // local includes #include "toc.h" diff --git a/kpovmodeler/main.cpp b/kpovmodeler/main.cpp index d9789b65..d060308c 100644 --- a/kpovmodeler/main.cpp +++ b/kpovmodeler/main.cpp @@ -16,7 +16,7 @@ **************************************************************************/ -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> #include <tdeaboutdata.h> #include <tdeapplication.h> diff --git a/kpovmodeler/pmaddcommand.cpp b/kpovmodeler/pmaddcommand.cpp index b8d4ea49..b94ee4ba 100644 --- a/kpovmodeler/pmaddcommand.cpp +++ b/kpovmodeler/pmaddcommand.cpp @@ -24,7 +24,7 @@ #include "pmrecursiveobjectiterator.h" #include "pmmemento.h" -#include <klocale.h> +#include <tdelocale.h> PMAddCommand::PMAddCommand( PMObject* obj, PMObject* parent, PMObject* after ) : PMCommand( i18n( "Add New %1" ).arg( obj->description( ) ) ) diff --git a/kpovmodeler/pmbicubicpatch.cpp b/kpovmodeler/pmbicubicpatch.cpp index 2c1c99dd..4167f662 100644 --- a/kpovmodeler/pmbicubicpatch.cpp +++ b/kpovmodeler/pmbicubicpatch.cpp @@ -25,7 +25,7 @@ #include "pm3dcontrolpoint.h" #include "pmmath.h" -#include <klocale.h> +#include <tdelocale.h> const double c_defaultPatchSize = 6.0; const int c_defaultPatchType = 0; diff --git a/kpovmodeler/pmbicubicpatchedit.cpp b/kpovmodeler/pmbicubicpatchedit.cpp index 8dff49b0..e3a46e36 100644 --- a/kpovmodeler/pmbicubicpatchedit.cpp +++ b/kpovmodeler/pmbicubicpatchedit.cpp @@ -27,7 +27,7 @@ #include <tqlabel.h> #include <tqcombobox.h> #include <tqcheckbox.h> -#include <klocale.h> +#include <tdelocale.h> PMBicubicPatchEdit::PMBicubicPatchEdit( TQWidget* parent, const char* name ) : Base( parent, name ) diff --git a/kpovmodeler/pmblendmapmodifiers.cpp b/kpovmodeler/pmblendmapmodifiers.cpp index 9d26419e..226acf5c 100644 --- a/kpovmodeler/pmblendmapmodifiers.cpp +++ b/kpovmodeler/pmblendmapmodifiers.cpp @@ -22,7 +22,7 @@ #include "pmvector.h" #include "pmenumproperty.h" -#include <klocale.h> +#include <tdelocale.h> PMDefinePropertyClass( PMBlendMapModifiers, PMBlendMapModifiersProperty ); PMDefineEnumPropertyClass( PMBlendMapModifiers, diff --git a/kpovmodeler/pmblendmapmodifiersedit.cpp b/kpovmodeler/pmblendmapmodifiersedit.cpp index ab3634c8..b523925d 100644 --- a/kpovmodeler/pmblendmapmodifiersedit.cpp +++ b/kpovmodeler/pmblendmapmodifiersedit.cpp @@ -32,8 +32,8 @@ #include <tqcheckbox.h> #include <tqpushbutton.h> #include <ktabctl.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kdialog.h> #include <tdefiledialog.h> diff --git a/kpovmodeler/pmblob.cpp b/kpovmodeler/pmblob.cpp index 6621cadf..3a493165 100644 --- a/kpovmodeler/pmblob.cpp +++ b/kpovmodeler/pmblob.cpp @@ -22,7 +22,7 @@ #include "pmblobedit.h" #include "pmmemento.h" -#include <klocale.h> +#include <tdelocale.h> const double c_defaultThreshold = 0.5; bool c_defaultSturm = false; diff --git a/kpovmodeler/pmblobcylinder.cpp b/kpovmodeler/pmblobcylinder.cpp index d166a6a3..d6dc5840 100644 --- a/kpovmodeler/pmblobcylinder.cpp +++ b/kpovmodeler/pmblobcylinder.cpp @@ -26,7 +26,7 @@ #include "pmdistancecontrolpoint.h" #include "pmblobcylinderedit.h" -#include <klocale.h> +#include <tdelocale.h> PMDefinePropertyClass( PMBlobCylinder, PMBlobCylinderProperty ); diff --git a/kpovmodeler/pmblobcylinderedit.cpp b/kpovmodeler/pmblobcylinderedit.cpp index 34910df0..2a88096f 100644 --- a/kpovmodeler/pmblobcylinderedit.cpp +++ b/kpovmodeler/pmblobcylinderedit.cpp @@ -23,7 +23,7 @@ #include <tqlayout.h> #include <tqlabel.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqcheckbox.h> PMBlobCylinderEdit::PMBlobCylinderEdit( TQWidget* parent, const char* name ) diff --git a/kpovmodeler/pmblobedit.cpp b/kpovmodeler/pmblobedit.cpp index a38d9639..93ec707f 100644 --- a/kpovmodeler/pmblobedit.cpp +++ b/kpovmodeler/pmblobedit.cpp @@ -23,7 +23,7 @@ #include <tqlayout.h> #include <tqlabel.h> #include <tqcheckbox.h> -#include <klocale.h> +#include <tdelocale.h> PMBlobEdit::PMBlobEdit( TQWidget* parent, const char* name ) : Base( parent, name ) diff --git a/kpovmodeler/pmblobsphere.cpp b/kpovmodeler/pmblobsphere.cpp index cbcd33a4..4699ddb1 100644 --- a/kpovmodeler/pmblobsphere.cpp +++ b/kpovmodeler/pmblobsphere.cpp @@ -24,7 +24,7 @@ #include "pmdistancecontrolpoint.h" #include "pmdefaults.h" -#include <klocale.h> +#include <tdelocale.h> PMDefinePropertyClass( PMBlobSphere, PMBlobSphereProperty ); diff --git a/kpovmodeler/pmblobsphereedit.cpp b/kpovmodeler/pmblobsphereedit.cpp index ba4e226b..0d79d8ff 100644 --- a/kpovmodeler/pmblobsphereedit.cpp +++ b/kpovmodeler/pmblobsphereedit.cpp @@ -22,7 +22,7 @@ #include <tqlayout.h> #include <tqlabel.h> -#include <klocale.h> +#include <tdelocale.h> PMBlobSphereEdit::PMBlobSphereEdit( TQWidget* parent, const char* name ) : Base( parent, name ) diff --git a/kpovmodeler/pmboundedby.cpp b/kpovmodeler/pmboundedby.cpp index 5cc66e55..67c55962 100644 --- a/kpovmodeler/pmboundedby.cpp +++ b/kpovmodeler/pmboundedby.cpp @@ -21,7 +21,7 @@ #include "pmxmlhelper.h" #include "pmmemento.h" -#include <klocale.h> +#include <tdelocale.h> PMDefinePropertyClass( PMBoundedBy, PMBoundedByProperty ); diff --git a/kpovmodeler/pmboundedbyedit.cpp b/kpovmodeler/pmboundedbyedit.cpp index 8a41fa52..ec83a243 100644 --- a/kpovmodeler/pmboundedbyedit.cpp +++ b/kpovmodeler/pmboundedbyedit.cpp @@ -21,7 +21,7 @@ #include <tqlayout.h> #include <tqlabel.h> -#include <klocale.h> +#include <tdelocale.h> PMBoundedByEdit::PMBoundedByEdit( TQWidget* parent, const char* name ) : Base( parent, name ) diff --git a/kpovmodeler/pmbox.cpp b/kpovmodeler/pmbox.cpp index 155ebc68..56977043 100644 --- a/kpovmodeler/pmbox.cpp +++ b/kpovmodeler/pmbox.cpp @@ -24,7 +24,7 @@ #include "pmviewstructure.h" #include "pm3dcontrolpoint.h" -#include <klocale.h> +#include <tdelocale.h> const double defaultBoxSize = 0.5; const PMVector corner1Default = PMVector( -defaultBoxSize, -defaultBoxSize, -defaultBoxSize ); diff --git a/kpovmodeler/pmboxedit.cpp b/kpovmodeler/pmboxedit.cpp index 6b6a2f2a..91c09f53 100644 --- a/kpovmodeler/pmboxedit.cpp +++ b/kpovmodeler/pmboxedit.cpp @@ -22,7 +22,7 @@ #include <tqlayout.h> #include <tqlabel.h> -#include <klocale.h> +#include <tdelocale.h> PMBoxEdit::PMBoxEdit( TQWidget* parent, const char* name ) : Base( parent, name ) diff --git a/kpovmodeler/pmbumpmap.cpp b/kpovmodeler/pmbumpmap.cpp index 21fb29a3..7c8903a2 100644 --- a/kpovmodeler/pmbumpmap.cpp +++ b/kpovmodeler/pmbumpmap.cpp @@ -26,7 +26,7 @@ #include "pmmemento.h" #include "pmenumproperty.h" -#include <klocale.h> +#include <tdelocale.h> const PMBumpMap::PMBitmapType bitmapTypeDefault = PMBumpMap::BitmapSys; const char *const bitmapFileDefault = 0; diff --git a/kpovmodeler/pmbumpmapedit.cpp b/kpovmodeler/pmbumpmapedit.cpp index cdf14a44..10cb65f9 100644 --- a/kpovmodeler/pmbumpmapedit.cpp +++ b/kpovmodeler/pmbumpmapedit.cpp @@ -32,8 +32,8 @@ #include <tqpushbutton.h> #include <tqtooltip.h> #include <ktabctl.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kdialog.h> #include <tdefiledialog.h> #include <kiconloader.h> diff --git a/kpovmodeler/pmcamera.cpp b/kpovmodeler/pmcamera.cpp index ca37f751..76483b77 100644 --- a/kpovmodeler/pmcamera.cpp +++ b/kpovmodeler/pmcamera.cpp @@ -26,7 +26,7 @@ #include "pmvectorcontrolpoint.h" #include "pmenumproperty.h" -#include <klocale.h> +#include <tdelocale.h> PMDefinePropertyClass( PMCamera, PMCameraProperty ); PMDefineEnumPropertyClass( PMCamera, PMCamera::CameraType, diff --git a/kpovmodeler/pmcameraedit.cpp b/kpovmodeler/pmcameraedit.cpp index 253d38b5..4ac2528d 100644 --- a/kpovmodeler/pmcameraedit.cpp +++ b/kpovmodeler/pmcameraedit.cpp @@ -26,8 +26,8 @@ #include <tqcombobox.h> #include <tqcheckbox.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> PMCameraEdit::PMCameraEdit( TQWidget* parent, const char* name ) diff --git a/kpovmodeler/pmclippedby.cpp b/kpovmodeler/pmclippedby.cpp index 24ea4e46..515b2635 100644 --- a/kpovmodeler/pmclippedby.cpp +++ b/kpovmodeler/pmclippedby.cpp @@ -21,7 +21,7 @@ #include "pmxmlhelper.h" #include "pmmemento.h" -#include <klocale.h> +#include <tdelocale.h> PMDefinePropertyClass( PMClippedBy, PMClippedByProperty ); diff --git a/kpovmodeler/pmclippedbyedit.cpp b/kpovmodeler/pmclippedbyedit.cpp index 8afa0285..29e2fd1d 100644 --- a/kpovmodeler/pmclippedbyedit.cpp +++ b/kpovmodeler/pmclippedbyedit.cpp @@ -21,7 +21,7 @@ #include <tqlayout.h> #include <tqlabel.h> -#include <klocale.h> +#include <tdelocale.h> PMClippedByEdit::PMClippedByEdit( TQWidget* parent, const char* name ) : Base( parent, name ) diff --git a/kpovmodeler/pmcoloredit.cpp b/kpovmodeler/pmcoloredit.cpp index f34ee47d..0a12dc23 100644 --- a/kpovmodeler/pmcoloredit.cpp +++ b/kpovmodeler/pmcoloredit.cpp @@ -18,7 +18,7 @@ #include "pmcoloredit.h" #include "pmlineedits.h" #include <kcolorbutton.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqlabel.h> #include <tqlayout.h> #include <tqcolor.h> diff --git a/kpovmodeler/pmcolorsettings.cpp b/kpovmodeler/pmcolorsettings.cpp index c0dafa37..a537cf9d 100644 --- a/kpovmodeler/pmcolorsettings.cpp +++ b/kpovmodeler/pmcolorsettings.cpp @@ -23,7 +23,7 @@ #include <tqlayout.h> #include <tqlabel.h> #include <kcolorbutton.h> -#include <klocale.h> +#include <tdelocale.h> PMColorSettings::PMColorSettings( TQWidget* parent, const char* name ) : PMSettingsDialogPage( parent, name ) diff --git a/kpovmodeler/pmcomment.cpp b/kpovmodeler/pmcomment.cpp index 90c817fd..05c2d74b 100644 --- a/kpovmodeler/pmcomment.cpp +++ b/kpovmodeler/pmcomment.cpp @@ -23,7 +23,7 @@ #include "pmmemento.h" #include <tqtextstream.h> -#include <klocale.h> +#include <tdelocale.h> PMDefinePropertyClass( PMComment, PMCommentProperty ); diff --git a/kpovmodeler/pmcommentedit.cpp b/kpovmodeler/pmcommentedit.cpp index 2fd58468..e57f9cea 100644 --- a/kpovmodeler/pmcommentedit.cpp +++ b/kpovmodeler/pmcommentedit.cpp @@ -21,7 +21,7 @@ #include <tqlayout.h> #include <tqmultilineedit.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> PMCommentEdit::PMCommentEdit( TQWidget* parent, const char* name ) : Base( parent, name ) diff --git a/kpovmodeler/pmcone.cpp b/kpovmodeler/pmcone.cpp index c6fd719e..4a956d81 100644 --- a/kpovmodeler/pmcone.cpp +++ b/kpovmodeler/pmcone.cpp @@ -28,7 +28,7 @@ #include "pmdistancecontrolpoint.h" #include "pmconeedit.h" -#include <klocale.h> +#include <tdelocale.h> const double defaultConeRadius1 = 0.0; diff --git a/kpovmodeler/pmconeedit.cpp b/kpovmodeler/pmconeedit.cpp index 9969e4d7..c02b2d40 100644 --- a/kpovmodeler/pmconeedit.cpp +++ b/kpovmodeler/pmconeedit.cpp @@ -23,7 +23,7 @@ #include <tqlayout.h> #include <tqlabel.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqcheckbox.h> PMConeEdit::PMConeEdit( TQWidget* parent, const char* name ) diff --git a/kpovmodeler/pmcsg.cpp b/kpovmodeler/pmcsg.cpp index 0ac7e58a..06ccfdce 100644 --- a/kpovmodeler/pmcsg.cpp +++ b/kpovmodeler/pmcsg.cpp @@ -18,7 +18,7 @@ #include "pmcsg.h" -#include <klocale.h> +#include <tdelocale.h> #include "pmxmlhelper.h" #include "pmcsgedit.h" #include "pmmemento.h" diff --git a/kpovmodeler/pmcsgedit.cpp b/kpovmodeler/pmcsgedit.cpp index 114e22f6..cf7757b2 100644 --- a/kpovmodeler/pmcsgedit.cpp +++ b/kpovmodeler/pmcsgedit.cpp @@ -22,7 +22,7 @@ #include <tqlayout.h> #include <tqlabel.h> #include <tqcombobox.h> -#include <klocale.h> +#include <tdelocale.h> PMCSGEdit::PMCSGEdit( TQWidget* parent, const char* name ) : Base( parent, name ) diff --git a/kpovmodeler/pmcylinder.cpp b/kpovmodeler/pmcylinder.cpp index 358cb542..a3604b83 100644 --- a/kpovmodeler/pmcylinder.cpp +++ b/kpovmodeler/pmcylinder.cpp @@ -26,7 +26,7 @@ #include "pm3dcontrolpoint.h" #include "pmdefaults.h" -#include <klocale.h> +#include <tdelocale.h> #include "pmdistancecontrolpoint.h" diff --git a/kpovmodeler/pmcylinderedit.cpp b/kpovmodeler/pmcylinderedit.cpp index b15a0d16..63be4505 100644 --- a/kpovmodeler/pmcylinderedit.cpp +++ b/kpovmodeler/pmcylinderedit.cpp @@ -23,7 +23,7 @@ #include <tqlayout.h> #include <tqlabel.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqcheckbox.h> PMCylinderEdit::PMCylinderEdit( TQWidget* parent, const char* name ) diff --git a/kpovmodeler/pmdatachangecommand.cpp b/kpovmodeler/pmdatachangecommand.cpp index 99ac75d3..68fe2352 100644 --- a/kpovmodeler/pmdatachangecommand.cpp +++ b/kpovmodeler/pmdatachangecommand.cpp @@ -20,7 +20,7 @@ #include "pmcommandmanager.h" #include "pmmemento.h" #include "pmobject.h" -#include <klocale.h> +#include <tdelocale.h> PMDataChangeCommand::PMDataChangeCommand( PMMemento* memento ) : PMCommand( ) diff --git a/kpovmodeler/pmdeclare.cpp b/kpovmodeler/pmdeclare.cpp index 3f290e2f..3e5171f1 100644 --- a/kpovmodeler/pmdeclare.cpp +++ b/kpovmodeler/pmdeclare.cpp @@ -23,7 +23,7 @@ #include "pmpart.h" #include <tqvaluelist.h> -#include <klocale.h> +#include <tdelocale.h> PMDefinePropertyClass( PMDeclare, PMDeclareProperty ); diff --git a/kpovmodeler/pmdeclareedit.cpp b/kpovmodeler/pmdeclareedit.cpp index a5086c15..e0b3bab5 100644 --- a/kpovmodeler/pmdeclareedit.cpp +++ b/kpovmodeler/pmdeclareedit.cpp @@ -30,8 +30,8 @@ #include <tqpushbutton.h> #include <tqlistbox.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> PMDeclareEdit::PMDeclareEdit( TQWidget* parent, const char* name ) : Base( parent, name ) diff --git a/kpovmodeler/pmdeletecommand.cpp b/kpovmodeler/pmdeletecommand.cpp index 2a8650f1..ca97ad9d 100644 --- a/kpovmodeler/pmdeletecommand.cpp +++ b/kpovmodeler/pmdeletecommand.cpp @@ -22,8 +22,8 @@ #include "pmrecursiveobjectiterator.h" #include "pmmemento.h" -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tqptrdict.h> PMDeleteCommand::PMDeleteCommand( PMObject* obj ) diff --git a/kpovmodeler/pmdensity.cpp b/kpovmodeler/pmdensity.cpp index 3935b6be..02213200 100644 --- a/kpovmodeler/pmdensity.cpp +++ b/kpovmodeler/pmdensity.cpp @@ -21,7 +21,7 @@ #include "pmmemento.h" #include "pmdensityedit.h" -#include <klocale.h> +#include <tdelocale.h> PMMetaObject* PMDensity::s_pMetaObject = 0; PMObject* createNewDensity( PMPart* part ) diff --git a/kpovmodeler/pmdensityedit.cpp b/kpovmodeler/pmdensityedit.cpp index 407a4f80..a807500a 100644 --- a/kpovmodeler/pmdensityedit.cpp +++ b/kpovmodeler/pmdensityedit.cpp @@ -22,7 +22,7 @@ #include <tqlayout.h> #include <tqlabel.h> -#include <klocale.h> +#include <tdelocale.h> PMDensityEdit::PMDensityEdit( TQWidget* parent, const char* name ) diff --git a/kpovmodeler/pmdetailobjectedit.cpp b/kpovmodeler/pmdetailobjectedit.cpp index 661cd892..c2c1fdeb 100644 --- a/kpovmodeler/pmdetailobjectedit.cpp +++ b/kpovmodeler/pmdetailobjectedit.cpp @@ -21,7 +21,7 @@ #include <tqcheckbox.h> #include <tqlabel.h> #include <tqcombobox.h> -#include <klocale.h> +#include <tdelocale.h> PMDetailObjectEdit::PMDetailObjectEdit( TQWidget* parent, const char* name ) : Base( parent, name ) diff --git a/kpovmodeler/pmdialogeditbase.cpp b/kpovmodeler/pmdialogeditbase.cpp index 73bec441..45b5c828 100644 --- a/kpovmodeler/pmdialogeditbase.cpp +++ b/kpovmodeler/pmdialogeditbase.cpp @@ -27,8 +27,8 @@ #include <tqptrdict.h> #include <kdialog.h> #include <tdeconfig.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include "pmpart.h" #include "pmdefaults.h" diff --git a/kpovmodeler/pmdialogview.cpp b/kpovmodeler/pmdialogview.cpp index 6a2c1455..ef106343 100644 --- a/kpovmodeler/pmdialogview.cpp +++ b/kpovmodeler/pmdialogview.cpp @@ -25,8 +25,8 @@ #include "pmpart.h" #include "pmdocumentationmap.h" -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kdialog.h> #include <kprocess.h> #include <kiconloader.h> diff --git a/kpovmodeler/pmdisc.cpp b/kpovmodeler/pmdisc.cpp index bda89579..79243f22 100644 --- a/kpovmodeler/pmdisc.cpp +++ b/kpovmodeler/pmdisc.cpp @@ -28,7 +28,7 @@ #include "pm3dcontrolpoint.h" #include "pmdefaults.h" -#include <klocale.h> +#include <tdelocale.h> #include "pmdiscedit.h" diff --git a/kpovmodeler/pmdiscedit.cpp b/kpovmodeler/pmdiscedit.cpp index 0197a806..b41d8106 100644 --- a/kpovmodeler/pmdiscedit.cpp +++ b/kpovmodeler/pmdiscedit.cpp @@ -24,8 +24,8 @@ #include <tqlayout.h> #include <tqlabel.h> #include <tqpushbutton.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> PMDiscEdit::PMDiscEdit( TQWidget* parent, const char* name ) : Base( parent, name ) diff --git a/kpovmodeler/pmdockwidget.cpp b/kpovmodeler/pmdockwidget.cpp index a8850184..7c0775ef 100644 --- a/kpovmodeler/pmdockwidget.cpp +++ b/kpovmodeler/pmdockwidget.cpp @@ -31,7 +31,7 @@ #ifndef NO_KDE2 #include <tdeconfig.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdetoolbar.h> #include <tdepopupmenu.h> #include <twin.h> diff --git a/kpovmodeler/pmerrordialog.cpp b/kpovmodeler/pmerrordialog.cpp index f2b4ee62..0fdb6f5f 100644 --- a/kpovmodeler/pmerrordialog.cpp +++ b/kpovmodeler/pmerrordialog.cpp @@ -19,7 +19,7 @@ #include "pmerrordialog.h" #include "pmerrorflags.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqlabel.h> #include <tqtextedit.h> diff --git a/kpovmodeler/pmfactory.cpp b/kpovmodeler/pmfactory.cpp index 06d744b6..667f0612 100644 --- a/kpovmodeler/pmfactory.cpp +++ b/kpovmodeler/pmfactory.cpp @@ -16,7 +16,7 @@ **************************************************************************/ -#include <klocale.h> +#include <tdelocale.h> #include <kinstance.h> #include <tdeaboutdata.h> diff --git a/kpovmodeler/pmfinish.cpp b/kpovmodeler/pmfinish.cpp index 52bd92c8..88ae4cde 100644 --- a/kpovmodeler/pmfinish.cpp +++ b/kpovmodeler/pmfinish.cpp @@ -21,7 +21,7 @@ #include "pmmemento.h" #include "pmfinishedit.h" -#include <klocale.h> +#include <tdelocale.h> const PMColor ambientColorDefault = PMColor( 0.0, 0.0, 0.0, 0.0, 0.0 ); const double diffuseDefault = 0.6; diff --git a/kpovmodeler/pmfinishedit.cpp b/kpovmodeler/pmfinishedit.cpp index 38766f94..6a60510f 100644 --- a/kpovmodeler/pmfinishedit.cpp +++ b/kpovmodeler/pmfinishedit.cpp @@ -25,7 +25,7 @@ #include <tqlayout.h> #include <tqlabel.h> #include <tqcheckbox.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> diff --git a/kpovmodeler/pmfog.cpp b/kpovmodeler/pmfog.cpp index 6af4a2cb..2ef46930 100644 --- a/kpovmodeler/pmfog.cpp +++ b/kpovmodeler/pmfog.cpp @@ -21,7 +21,7 @@ #include "pmfogedit.h" #include "pmvector.h" -#include <klocale.h> +#include <tdelocale.h> const int fogTypeDefault = 1; const double distanceDefault = 0.0; diff --git a/kpovmodeler/pmfogedit.cpp b/kpovmodeler/pmfogedit.cpp index ec9880c1..f6c15c1f 100644 --- a/kpovmodeler/pmfogedit.cpp +++ b/kpovmodeler/pmfogedit.cpp @@ -26,8 +26,8 @@ #include <tqlabel.h> #include <tqcheckbox.h> #include <tqcombobox.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kdialog.h> PMFogEdit::PMFogEdit( TQWidget* parent, const char* name ) diff --git a/kpovmodeler/pmglobalphotons.cpp b/kpovmodeler/pmglobalphotons.cpp index ddf32258..d239b027 100644 --- a/kpovmodeler/pmglobalphotons.cpp +++ b/kpovmodeler/pmglobalphotons.cpp @@ -22,7 +22,7 @@ #include "pmenumproperty.h" #include "pmglobalphotonsedit.h" -#include <klocale.h> +#include <tdelocale.h> const double spacingDefault = 0.01; const int countDefault = 20000; diff --git a/kpovmodeler/pmglobalphotonsedit.cpp b/kpovmodeler/pmglobalphotonsedit.cpp index 5a4a5572..a65c9def 100644 --- a/kpovmodeler/pmglobalphotonsedit.cpp +++ b/kpovmodeler/pmglobalphotonsedit.cpp @@ -24,9 +24,9 @@ #include <tqlabel.h> #include <tqcheckbox.h> #include <tqcombobox.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> PMGlobalPhotonsEdit::PMGlobalPhotonsEdit( TQWidget* parent, const char* name ) diff --git a/kpovmodeler/pmglobalsettings.cpp b/kpovmodeler/pmglobalsettings.cpp index efa7db36..1fd6f68d 100644 --- a/kpovmodeler/pmglobalsettings.cpp +++ b/kpovmodeler/pmglobalsettings.cpp @@ -22,7 +22,7 @@ #include "pmglobalsettingsedit.h" #include "pmenumproperty.h" -#include <klocale.h> +#include <tdelocale.h> const double adcBailoutDefault = 1.0 / 255.0; const PMColor ambientLightDefault = PMColor( 1.0, 1.0, 1.0, 0.0, 0.0 ); diff --git a/kpovmodeler/pmglobalsettingsedit.cpp b/kpovmodeler/pmglobalsettingsedit.cpp index 7c8eddad..d2c7779c 100644 --- a/kpovmodeler/pmglobalsettingsedit.cpp +++ b/kpovmodeler/pmglobalsettingsedit.cpp @@ -25,9 +25,9 @@ #include <tqlabel.h> #include <tqcheckbox.h> #include <tqcombobox.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> PMGlobalSettingsEdit::PMGlobalSettingsEdit( TQWidget* parent, const char* name ) : Base( parent, name ) diff --git a/kpovmodeler/pmglview.cpp b/kpovmodeler/pmglview.cpp index 615ff417..1114e3d7 100644 --- a/kpovmodeler/pmglview.cpp +++ b/kpovmodeler/pmglview.cpp @@ -40,7 +40,7 @@ #include <tdeaction.h> #include <tdeconfig.h> #include <kstaticdeleter.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kdialog.h> diff --git a/kpovmodeler/pmgraphicalobjectedit.cpp b/kpovmodeler/pmgraphicalobjectedit.cpp index c623c51f..0db70b77 100644 --- a/kpovmodeler/pmgraphicalobjectedit.cpp +++ b/kpovmodeler/pmgraphicalobjectedit.cpp @@ -23,7 +23,7 @@ #include <tqlayout.h> #include <tqlabel.h> #include <tqspinbox.h> -#include <klocale.h> +#include <tdelocale.h> const int c_minValue = -1000; const int c_maxValue = 1000; diff --git a/kpovmodeler/pmgridsettings.cpp b/kpovmodeler/pmgridsettings.cpp index 04bdbdd3..a08ad9a3 100644 --- a/kpovmodeler/pmgridsettings.cpp +++ b/kpovmodeler/pmgridsettings.cpp @@ -26,7 +26,7 @@ #include <tqgroupbox.h> #include <tqlabel.h> #include <kcolorbutton.h> -#include <klocale.h> +#include <tdelocale.h> PMGridSettings::PMGridSettings( TQWidget* parent, const char* name ) : PMSettingsDialogPage( parent, name ) diff --git a/kpovmodeler/pmheightfield.cpp b/kpovmodeler/pmheightfield.cpp index 6806437a..789205a5 100644 --- a/kpovmodeler/pmheightfield.cpp +++ b/kpovmodeler/pmheightfield.cpp @@ -26,7 +26,7 @@ #include "pmenumproperty.h" #include "pmdefaults.h" -#include <klocale.h> +#include <tdelocale.h> const PMHeightField::HeightFieldType c_defaultType = PMHeightField::HFgif; const TQString c_defaultTypeText = TQString( "gif" ); diff --git a/kpovmodeler/pmheightfieldedit.cpp b/kpovmodeler/pmheightfieldedit.cpp index 851d6200..337ec6f2 100644 --- a/kpovmodeler/pmheightfieldedit.cpp +++ b/kpovmodeler/pmheightfieldedit.cpp @@ -27,7 +27,7 @@ #include <tqlineedit.h> #include <tqpushbutton.h> #include <tqslider.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <tdefiledialog.h> diff --git a/kpovmodeler/pmimagemap.cpp b/kpovmodeler/pmimagemap.cpp index 5f28c49a..927e9cd3 100644 --- a/kpovmodeler/pmimagemap.cpp +++ b/kpovmodeler/pmimagemap.cpp @@ -26,7 +26,7 @@ #include "pmmemento.h" #include "pmenumproperty.h" -#include <klocale.h> +#include <tdelocale.h> const PMImageMap::PMBitmapType bitmapTypeDefault = PMImageMap::BitmapSys; const char *const bitmapFileDefault = 0; diff --git a/kpovmodeler/pmimagemapedit.cpp b/kpovmodeler/pmimagemapedit.cpp index c2d7ff88..9ba8627d 100644 --- a/kpovmodeler/pmimagemapedit.cpp +++ b/kpovmodeler/pmimagemapedit.cpp @@ -32,8 +32,8 @@ #include <tqpushbutton.h> #include <tqtooltip.h> #include <ktabctl.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kdialog.h> #include <tdefiledialog.h> #include <kiconloader.h> diff --git a/kpovmodeler/pminserterrordialog.cpp b/kpovmodeler/pminserterrordialog.cpp index 9dd7867a..3a300ba5 100644 --- a/kpovmodeler/pminserterrordialog.cpp +++ b/kpovmodeler/pminserterrordialog.cpp @@ -17,7 +17,7 @@ #include "pminserterrordialog.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqlabel.h> #include <tqlistbox.h> #include <tqvbox.h> diff --git a/kpovmodeler/pminsertpopup.cpp b/kpovmodeler/pminsertpopup.cpp index bcd24720..a8de051e 100644 --- a/kpovmodeler/pminsertpopup.cpp +++ b/kpovmodeler/pminsertpopup.cpp @@ -17,7 +17,7 @@ #include "pminsertpopup.h" -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <tqcursor.h> diff --git a/kpovmodeler/pminterior.cpp b/kpovmodeler/pminterior.cpp index 53a69f79..b9666fac 100644 --- a/kpovmodeler/pminterior.cpp +++ b/kpovmodeler/pminterior.cpp @@ -21,7 +21,7 @@ #include "pmmemento.h" #include "pminterioredit.h" -#include <klocale.h> +#include <tdelocale.h> const double iorDefault = 1.0; const double causticsDefault = 0.0; diff --git a/kpovmodeler/pminterioredit.cpp b/kpovmodeler/pminterioredit.cpp index 4b8b2381..c4c792d1 100644 --- a/kpovmodeler/pminterioredit.cpp +++ b/kpovmodeler/pminterioredit.cpp @@ -24,7 +24,7 @@ #include <tqlayout.h> #include <tqlabel.h> #include <tqcheckbox.h> -#include <klocale.h> +#include <tdelocale.h> PMInteriorEdit::PMInteriorEdit( TQWidget* parent, const char* name ) diff --git a/kpovmodeler/pminteriortexture.cpp b/kpovmodeler/pminteriortexture.cpp index 92950050..8e65f769 100644 --- a/kpovmodeler/pminteriortexture.cpp +++ b/kpovmodeler/pminteriortexture.cpp @@ -21,7 +21,7 @@ #include "pmmemento.h" #include "pminteriortextureedit.h" -#include <klocale.h> +#include <tdelocale.h> PMMetaObject* PMInteriorTexture::s_pMetaObject = 0; PMObject* createNewInteriorTexture( PMPart* part ) diff --git a/kpovmodeler/pminteriortextureedit.cpp b/kpovmodeler/pminteriortextureedit.cpp index 73f1e7e9..a5b1cc4b 100644 --- a/kpovmodeler/pminteriortextureedit.cpp +++ b/kpovmodeler/pminteriortextureedit.cpp @@ -22,7 +22,7 @@ #include <tqlayout.h> #include <tqlabel.h> -#include <klocale.h> +#include <tdelocale.h> PMInteriorTextureEdit::PMInteriorTextureEdit( TQWidget* parent, const char* name ) diff --git a/kpovmodeler/pmisosurface.cpp b/kpovmodeler/pmisosurface.cpp index c32c0683..dd873aa6 100644 --- a/kpovmodeler/pmisosurface.cpp +++ b/kpovmodeler/pmisosurface.cpp @@ -23,7 +23,7 @@ #include "pmmemento.h" #include "pmviewstructure.h" -#include <klocale.h> +#include <tdelocale.h> const PMIsoSurface::ContainedByType c_defaultContainedBy = PMIsoSurface::Box; const PMVector c_defaultCorner1 = PMVector( -1, -1, -1 ); diff --git a/kpovmodeler/pmisosurfaceedit.cpp b/kpovmodeler/pmisosurfaceedit.cpp index 752331b6..60c501ea 100644 --- a/kpovmodeler/pmisosurfaceedit.cpp +++ b/kpovmodeler/pmisosurfaceedit.cpp @@ -26,7 +26,7 @@ #include <tqlineedit.h> #include <tqcombobox.h> #include <tqcheckbox.h> -#include <klocale.h> +#include <tdelocale.h> PMIsoSurfaceEdit::PMIsoSurfaceEdit( TQWidget* parent, const char* name ) : Base( parent, name ) diff --git a/kpovmodeler/pmjuliafractal.cpp b/kpovmodeler/pmjuliafractal.cpp index 5929a058..1e0959fc 100644 --- a/kpovmodeler/pmjuliafractal.cpp +++ b/kpovmodeler/pmjuliafractal.cpp @@ -25,7 +25,7 @@ #include "pm3dcontrolpoint.h" #include "pmenumproperty.h" -#include <klocale.h> +#include <tdelocale.h> const PMVector c_defaultJuliaParameter = PMVector( -0.083, 0.0, -0.83, -0.025 ); const PMVector c_defaultSliceNormal = PMVector( 0.0, 0.0, 0.0, 1.0 ); diff --git a/kpovmodeler/pmjuliafractaledit.cpp b/kpovmodeler/pmjuliafractaledit.cpp index 4f595b0e..373bbf0c 100644 --- a/kpovmodeler/pmjuliafractaledit.cpp +++ b/kpovmodeler/pmjuliafractaledit.cpp @@ -24,8 +24,8 @@ #include <tqlayout.h> #include <tqlabel.h> #include <tqcombobox.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> PMJuliaFractalEdit::PMJuliaFractalEdit( TQWidget* parent, const char* name ) : Base( parent, name ) diff --git a/kpovmodeler/pmlathe.cpp b/kpovmodeler/pmlathe.cpp index 9f6a00ff..9020fc94 100644 --- a/kpovmodeler/pmlathe.cpp +++ b/kpovmodeler/pmlathe.cpp @@ -29,7 +29,7 @@ #include "pmenumproperty.h" #include "pmobjectaction.h" -#include <klocale.h> +#include <tdelocale.h> const int defaultNumberOfPoints = 4; const PMVector defaultPoint[defaultNumberOfPoints] = diff --git a/kpovmodeler/pmlatheedit.cpp b/kpovmodeler/pmlatheedit.cpp index e90a4397..1e1879f1 100644 --- a/kpovmodeler/pmlatheedit.cpp +++ b/kpovmodeler/pmlatheedit.cpp @@ -28,10 +28,10 @@ #include <tqcombobox.h> #include <tqcheckbox.h> #include <tqpushbutton.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> PMLatheEdit::PMLatheEdit( TQWidget* parent, const char* name ) : Base( parent, name ) diff --git a/kpovmodeler/pmlayoutsettings.cpp b/kpovmodeler/pmlayoutsettings.cpp index c379e0b3..5e719ac9 100644 --- a/kpovmodeler/pmlayoutsettings.cpp +++ b/kpovmodeler/pmlayoutsettings.cpp @@ -28,8 +28,8 @@ #include <tqpushbutton.h> #include <tqlabel.h> #include <tqgroupbox.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> PMLayoutSettings::PMLayoutSettings( TQWidget* parent, const char* name ) : PMSettingsDialogPage( parent, name ) diff --git a/kpovmodeler/pmlibrarybrowser.cpp b/kpovmodeler/pmlibrarybrowser.cpp index 71d5b89d..0e4d75a8 100644 --- a/kpovmodeler/pmlibrarybrowser.cpp +++ b/kpovmodeler/pmlibrarybrowser.cpp @@ -27,11 +27,11 @@ #include <tdeio/job.h> #include <kurl.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdialog.h> -#include <kdiroperator.h> +#include <tdediroperator.h> #include <kiconloader.h> #include <kinputdialog.h> diff --git a/kpovmodeler/pmlibraryentrypreview.cpp b/kpovmodeler/pmlibraryentrypreview.cpp index 86ea01e4..75256512 100644 --- a/kpovmodeler/pmlibraryentrypreview.cpp +++ b/kpovmodeler/pmlibraryentrypreview.cpp @@ -34,9 +34,9 @@ #include <tqdragobject.h> #include <kurl.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdefiledialog.h> PMLibraryEntryPreview::PMLibraryEntryPreview( TQWidget* parent ) : diff --git a/kpovmodeler/pmlibraryhandle.cpp b/kpovmodeler/pmlibraryhandle.cpp index 8ba0f387..cfdaaefe 100644 --- a/kpovmodeler/pmlibraryhandle.cpp +++ b/kpovmodeler/pmlibraryhandle.cpp @@ -27,8 +27,8 @@ #include <tqtextstream.h> #include <tqimage.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include "pmdebug.h" diff --git a/kpovmodeler/pmlibraryhandleedit.cpp b/kpovmodeler/pmlibraryhandleedit.cpp index 17620df2..8a0febc8 100644 --- a/kpovmodeler/pmlibraryhandleedit.cpp +++ b/kpovmodeler/pmlibraryhandleedit.cpp @@ -25,9 +25,9 @@ #include <tqlayout.h> #include <tqlabel.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdefiledialog.h> #include "pmlineedits.h" diff --git a/kpovmodeler/pmlibraryiconview.cpp b/kpovmodeler/pmlibraryiconview.cpp index 78f13cef..1f953225 100644 --- a/kpovmodeler/pmlibraryiconview.cpp +++ b/kpovmodeler/pmlibraryiconview.cpp @@ -25,8 +25,8 @@ #include <kurl.h> #include <tdeio/job.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <stdlib.h> diff --git a/kpovmodeler/pmlibrarymanager.cpp b/kpovmodeler/pmlibrarymanager.cpp index 4429a88b..aee3be6a 100644 --- a/kpovmodeler/pmlibrarymanager.cpp +++ b/kpovmodeler/pmlibrarymanager.cpp @@ -19,7 +19,7 @@ #include <tdeconfig.h> #include <kstandarddirs.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tqfile.h> #include <tqdir.h> diff --git a/kpovmodeler/pmlibraryobjectsearch.cpp b/kpovmodeler/pmlibraryobjectsearch.cpp index c8a48601..e3fee426 100644 --- a/kpovmodeler/pmlibraryobjectsearch.cpp +++ b/kpovmodeler/pmlibraryobjectsearch.cpp @@ -30,7 +30,7 @@ #include <tqframe.h> #include <kurl.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> #include <tdelistview.h> diff --git a/kpovmodeler/pmlight.cpp b/kpovmodeler/pmlight.cpp index 554a09c2..deedd30d 100644 --- a/kpovmodeler/pmlight.cpp +++ b/kpovmodeler/pmlight.cpp @@ -27,7 +27,7 @@ #include "pmmatrix.h" #include "pmenumproperty.h" -#include <klocale.h> +#include <tdelocale.h> const PMVector locationDefault = PMVector( 0, 0, 0 ); const PMColor colorDefault = PMColor( 1.0, 1.0, 1.0 ); diff --git a/kpovmodeler/pmlightedit.cpp b/kpovmodeler/pmlightedit.cpp index e652d0a2..7448c48b 100644 --- a/kpovmodeler/pmlightedit.cpp +++ b/kpovmodeler/pmlightedit.cpp @@ -27,7 +27,7 @@ #include <tqcombobox.h> #include <tqcheckbox.h> -#include <klocale.h> +#include <tdelocale.h> PMLightEdit::PMLightEdit( TQWidget* parent, const char* name ) : Base( parent, name ) diff --git a/kpovmodeler/pmlightgroup.cpp b/kpovmodeler/pmlightgroup.cpp index acf655e4..9c71b85f 100644 --- a/kpovmodeler/pmlightgroup.cpp +++ b/kpovmodeler/pmlightgroup.cpp @@ -18,7 +18,7 @@ #include "pmlightgroup.h" -#include <klocale.h> +#include <tdelocale.h> #include "pmxmlhelper.h" #include "pmlightgroupedit.h" #include "pmmemento.h" diff --git a/kpovmodeler/pmlightgroupedit.cpp b/kpovmodeler/pmlightgroupedit.cpp index c1e21024..5f66c54b 100644 --- a/kpovmodeler/pmlightgroupedit.cpp +++ b/kpovmodeler/pmlightgroupedit.cpp @@ -22,7 +22,7 @@ #include <tqlayout.h> #include <tqlabel.h> #include <tqcheckbox.h> -#include <klocale.h> +#include <tdelocale.h> PMLightGroupEdit::PMLightGroupEdit( TQWidget* parent, const char* name ) : Base( parent, name ) diff --git a/kpovmodeler/pmlineedits.cpp b/kpovmodeler/pmlineedits.cpp index 19391338..d64f5aaa 100644 --- a/kpovmodeler/pmlineedits.cpp +++ b/kpovmodeler/pmlineedits.cpp @@ -16,8 +16,8 @@ **************************************************************************/ #include "pmlineedits.h" -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> PMFloatEdit::PMFloatEdit( TQWidget* parent, const char* name /*= 0*/ ) : TQLineEdit( parent, name ) diff --git a/kpovmodeler/pmlinkedit.cpp b/kpovmodeler/pmlinkedit.cpp index 8ebca5c6..c2418f3b 100644 --- a/kpovmodeler/pmlinkedit.cpp +++ b/kpovmodeler/pmlinkedit.cpp @@ -19,7 +19,7 @@ #include <tqlineedit.h> #include <tqlabel.h> #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> #include <kpushbutton.h> #include <kstdguiitem.h> diff --git a/kpovmodeler/pmlistpattern.cpp b/kpovmodeler/pmlistpattern.cpp index 721369d2..7ed9afee 100644 --- a/kpovmodeler/pmlistpattern.cpp +++ b/kpovmodeler/pmlistpattern.cpp @@ -24,7 +24,7 @@ #include "pmmemento.h" #include "pmenumproperty.h" -#include <klocale.h> +#include <tdelocale.h> PMDefinePropertyClass( PMListPattern, PMListPatternProperty ); PMDefineEnumPropertyClass( PMListPattern, PMListPattern::PMListType, diff --git a/kpovmodeler/pmlistpatternedit.cpp b/kpovmodeler/pmlistpatternedit.cpp index dec87cb7..10c0fd24 100644 --- a/kpovmodeler/pmlistpatternedit.cpp +++ b/kpovmodeler/pmlistpatternedit.cpp @@ -27,8 +27,8 @@ #include <tqlabel.h> #include "pmlineedits.h" #include <ktabctl.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> PMListPatternEdit::PMListPatternEdit( TQWidget* parent, const char* name ) diff --git a/kpovmodeler/pmlookslike.cpp b/kpovmodeler/pmlookslike.cpp index 270292e2..179f218f 100644 --- a/kpovmodeler/pmlookslike.cpp +++ b/kpovmodeler/pmlookslike.cpp @@ -21,7 +21,7 @@ #include "pmmemento.h" #include "pmnamedobjectedit.h" -#include <klocale.h> +#include <tdelocale.h> PMMetaObject* PMLooksLike::s_pMetaObject = 0; PMObject* createNewLooksLike( PMPart* part ) diff --git a/kpovmodeler/pmmaterial.cpp b/kpovmodeler/pmmaterial.cpp index 66f11f94..c40fe1ba 100644 --- a/kpovmodeler/pmmaterial.cpp +++ b/kpovmodeler/pmmaterial.cpp @@ -21,7 +21,7 @@ #include "pmmemento.h" #include "pmmaterialedit.h" -#include <klocale.h> +#include <tdelocale.h> PMMetaObject* PMMaterial::s_pMetaObject = 0; PMObject* createNewMaterial( PMPart* part ) diff --git a/kpovmodeler/pmmaterialedit.cpp b/kpovmodeler/pmmaterialedit.cpp index f03fcd43..48c7a6ff 100644 --- a/kpovmodeler/pmmaterialedit.cpp +++ b/kpovmodeler/pmmaterialedit.cpp @@ -22,7 +22,7 @@ #include <tqlayout.h> #include <tqlabel.h> -#include <klocale.h> +#include <tdelocale.h> PMMaterialEdit::PMMaterialEdit( TQWidget* parent, const char* name ) diff --git a/kpovmodeler/pmmaterialmap.cpp b/kpovmodeler/pmmaterialmap.cpp index 28b2c849..be9f7645 100644 --- a/kpovmodeler/pmmaterialmap.cpp +++ b/kpovmodeler/pmmaterialmap.cpp @@ -24,7 +24,7 @@ #include "pmmemento.h" #include "pmenumproperty.h" -#include <klocale.h> +#include <tdelocale.h> const PMMaterialMap::PMBitmapType bitmapTypeDefault = PMMaterialMap::BitmapSys; const char *const bitmapFileDefault = 0; diff --git a/kpovmodeler/pmmaterialmapedit.cpp b/kpovmodeler/pmmaterialmapedit.cpp index 8ec346dd..0c3423ab 100644 --- a/kpovmodeler/pmmaterialmapedit.cpp +++ b/kpovmodeler/pmmaterialmapedit.cpp @@ -32,8 +32,8 @@ #include <tqpushbutton.h> #include <tqtooltip.h> #include <ktabctl.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kdialog.h> #include <tdefiledialog.h> #include <kiconloader.h> diff --git a/kpovmodeler/pmmedia.cpp b/kpovmodeler/pmmedia.cpp index c5e32d6e..226ce728 100644 --- a/kpovmodeler/pmmedia.cpp +++ b/kpovmodeler/pmmedia.cpp @@ -22,7 +22,7 @@ #include "pmmediaedit.h" #include "pmcolor.h" -#include <klocale.h> +#include <tdelocale.h> const int methodDefault = 1; const int intervalsDefault = 10; diff --git a/kpovmodeler/pmmediaedit.cpp b/kpovmodeler/pmmediaedit.cpp index f89f7d10..75d99688 100644 --- a/kpovmodeler/pmmediaedit.cpp +++ b/kpovmodeler/pmmediaedit.cpp @@ -25,8 +25,8 @@ #include <tqlabel.h> #include <tqcheckbox.h> #include <tqcombobox.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kdialog.h> PMMediaEdit::PMMediaEdit( TQWidget* parent, const char* name ) diff --git a/kpovmodeler/pmmesh.cpp b/kpovmodeler/pmmesh.cpp index d143edf4..6e5d9673 100644 --- a/kpovmodeler/pmmesh.cpp +++ b/kpovmodeler/pmmesh.cpp @@ -18,7 +18,7 @@ #include "pmmesh.h" -#include <klocale.h> +#include <tdelocale.h> #include "pmxmlhelper.h" #include "pmmeshedit.h" #include "pmmemento.h" diff --git a/kpovmodeler/pmmeshedit.cpp b/kpovmodeler/pmmeshedit.cpp index 6ddf9679..4bab8877 100644 --- a/kpovmodeler/pmmeshedit.cpp +++ b/kpovmodeler/pmmeshedit.cpp @@ -23,7 +23,7 @@ #include <tqlayout.h> #include <tqcheckbox.h> -#include <klocale.h> +#include <tdelocale.h> PMMeshEdit::PMMeshEdit( TQWidget* parent, const char* name ) : Base( parent, name ) diff --git a/kpovmodeler/pmmovecommand.cpp b/kpovmodeler/pmmovecommand.cpp index bb75b0e4..769cad7d 100644 --- a/kpovmodeler/pmmovecommand.cpp +++ b/kpovmodeler/pmmovecommand.cpp @@ -26,7 +26,7 @@ #include "pmmemento.h" #include "pmdebug.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqptrdict.h> PMMoveCommand::PMMoveCommand( PMObject* obj, PMObject* parent, PMObject* after ) diff --git a/kpovmodeler/pmnamedobjectedit.cpp b/kpovmodeler/pmnamedobjectedit.cpp index 8f590982..07107dd0 100644 --- a/kpovmodeler/pmnamedobjectedit.cpp +++ b/kpovmodeler/pmnamedobjectedit.cpp @@ -22,7 +22,7 @@ #include <tqlayout.h> #include <tqlineedit.h> #include <tqlabel.h> -#include <klocale.h> +#include <tdelocale.h> PMNamedObjectEdit::PMNamedObjectEdit( TQWidget* parent, const char* name ) : Base( parent, name ) diff --git a/kpovmodeler/pmnormal.cpp b/kpovmodeler/pmnormal.cpp index 722a8fc4..05ec9bcd 100644 --- a/kpovmodeler/pmnormal.cpp +++ b/kpovmodeler/pmnormal.cpp @@ -23,7 +23,7 @@ #include "pmlistpattern.h" #include "pmpattern.h" -#include <klocale.h> +#include <tdelocale.h> const double bumpSizeDefault = 0.0; const double accuracyDefault = 0.02; diff --git a/kpovmodeler/pmnormaledit.cpp b/kpovmodeler/pmnormaledit.cpp index 68d6f1f3..92a9d46d 100644 --- a/kpovmodeler/pmnormaledit.cpp +++ b/kpovmodeler/pmnormaledit.cpp @@ -24,7 +24,7 @@ #include <tqlayout.h> #include <tqlabel.h> #include <tqcheckbox.h> -#include <klocale.h> +#include <tdelocale.h> PMNormalEdit::PMNormalEdit( TQWidget* parent, const char* name ) diff --git a/kpovmodeler/pmobjectlibrarysettings.cpp b/kpovmodeler/pmobjectlibrarysettings.cpp index 6dd1488c..822f18f1 100644 --- a/kpovmodeler/pmobjectlibrarysettings.cpp +++ b/kpovmodeler/pmobjectlibrarysettings.cpp @@ -28,9 +28,9 @@ #include <tqgroupbox.h> #include <tqlabel.h> #include <tqpushbutton.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdefiledialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> PMObjectLibrarySettings::PMObjectLibrarySettings( TQWidget* parent, const char* name ) diff --git a/kpovmodeler/pmobjectlink.cpp b/kpovmodeler/pmobjectlink.cpp index 559d3fe4..ee93f707 100644 --- a/kpovmodeler/pmobjectlink.cpp +++ b/kpovmodeler/pmobjectlink.cpp @@ -26,7 +26,7 @@ #include "pmmemento.h" #include "pmxmlhelper.h" -#include <klocale.h> +#include <tdelocale.h> PMDefinePropertyClass( PMObjectLink, PMObjectLinkProperty ); diff --git a/kpovmodeler/pmobjectselect.cpp b/kpovmodeler/pmobjectselect.cpp index fcfbb3f5..dd5e4892 100644 --- a/kpovmodeler/pmobjectselect.cpp +++ b/kpovmodeler/pmobjectselect.cpp @@ -17,7 +17,7 @@ #include "pmobjectselect.h" #include "pmfactory.h" -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> PMListBoxObject::PMListBoxObject( TQListBox* listbox, PMObject* obj, diff --git a/kpovmodeler/pmobjectsettings.cpp b/kpovmodeler/pmobjectsettings.cpp index 411b0a49..5290bdc7 100644 --- a/kpovmodeler/pmobjectsettings.cpp +++ b/kpovmodeler/pmobjectsettings.cpp @@ -41,7 +41,7 @@ #include <tqcheckbox.h> #include <tqgroupbox.h> #include <tqlabel.h> -#include <klocale.h> +#include <tdelocale.h> PMObjectSettings::PMObjectSettings( TQWidget* parent, const char* name ) diff --git a/kpovmodeler/pmopenglsettings.cpp b/kpovmodeler/pmopenglsettings.cpp index 9c125c32..06ee143a 100644 --- a/kpovmodeler/pmopenglsettings.cpp +++ b/kpovmodeler/pmopenglsettings.cpp @@ -23,7 +23,7 @@ #include <tqlayout.h> #include <tqcheckbox.h> #include <tqlabel.h> -#include <klocale.h> +#include <tdelocale.h> PMOpenGLSettings::PMOpenGLSettings( TQWidget* parent, const char* name ) : PMSettingsDialogPage( parent, name ) diff --git a/kpovmodeler/pmoutputdevice.cpp b/kpovmodeler/pmoutputdevice.cpp index abad0e36..06d1e0aa 100644 --- a/kpovmodeler/pmoutputdevice.cpp +++ b/kpovmodeler/pmoutputdevice.cpp @@ -19,7 +19,7 @@ #include "pmoutputdevice.h" #include "pmpovrayformat.h" #include <tqtextstream.h> -#include <klocale.h> +#include <tdelocale.h> unsigned int PMOutputDevice::s_indentOffset = 3; bool PMOutputDevice::s_bracketBehindType = true; diff --git a/kpovmodeler/pmpalettevalueedit.cpp b/kpovmodeler/pmpalettevalueedit.cpp index 84a98e83..d8cd0e24 100644 --- a/kpovmodeler/pmpalettevalueedit.cpp +++ b/kpovmodeler/pmpalettevalueedit.cpp @@ -30,8 +30,8 @@ #include <tqpushbutton.h> #include <tqtooltip.h> #include <ktabctl.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kdialog.h> #include <tdefiledialog.h> diff --git a/kpovmodeler/pmparser.cpp b/kpovmodeler/pmparser.cpp index 5920c448..ef921734 100644 --- a/kpovmodeler/pmparser.cpp +++ b/kpovmodeler/pmparser.cpp @@ -20,7 +20,7 @@ #include <tqstring.h> #include <tqbuffer.h> -#include <klocale.h> +#include <tdelocale.h> #include "pmpart.h" #include "pmdeclare.h" diff --git a/kpovmodeler/pmpart.cpp b/kpovmodeler/pmpart.cpp index 11e8b0a3..8198a9d7 100644 --- a/kpovmodeler/pmpart.cpp +++ b/kpovmodeler/pmpart.cpp @@ -35,8 +35,8 @@ #include <tdeconfig.h> #include <kstdaction.h> #include <tdeaction.h> -#include <kmessagebox.h> -#include <ktempfile.h> +#include <tdemessagebox.h> +#include <tdetempfile.h> #include <tdeio/netaccess.h> #include <kstandarddirs.h> #include <kfilterdev.h> diff --git a/kpovmodeler/pmpart.h b/kpovmodeler/pmpart.h index 28fd6f36..e8926874 100644 --- a/kpovmodeler/pmpart.h +++ b/kpovmodeler/pmpart.h @@ -33,8 +33,8 @@ #include <tqstringlist.h> #include <tqptrlist.h> #include <tqvaluelist.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include "pmobject.h" #include "pmcommandmanager.h" diff --git a/kpovmodeler/pmpattern.cpp b/kpovmodeler/pmpattern.cpp index 2d60e9ce..5ee25eb4 100644 --- a/kpovmodeler/pmpattern.cpp +++ b/kpovmodeler/pmpattern.cpp @@ -25,7 +25,7 @@ #include "pmmemento.h" #include "pmenumproperty.h" -#include <klocale.h> +#include <tdelocale.h> const PMPattern::PMPatternType patternTypeDefault = PMPattern::PatternAgate; const double agateTurbulenceDefault = 0.5; diff --git a/kpovmodeler/pmpatternedit.cpp b/kpovmodeler/pmpatternedit.cpp index 13c39c21..5581a00b 100644 --- a/kpovmodeler/pmpatternedit.cpp +++ b/kpovmodeler/pmpatternedit.cpp @@ -32,8 +32,8 @@ #include <tqcheckbox.h> #include <tqpushbutton.h> #include <ktabctl.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kdialog.h> #include <tdefiledialog.h> #include <kiconloader.h> diff --git a/kpovmodeler/pmphotons.cpp b/kpovmodeler/pmphotons.cpp index cce7665b..a0eaeb96 100644 --- a/kpovmodeler/pmphotons.cpp +++ b/kpovmodeler/pmphotons.cpp @@ -21,7 +21,7 @@ #include "pmmemento.h" #include "pmphotonsedit.h" -#include <klocale.h> +#include <tdelocale.h> const double spacingMultiDefault = 1.0; diff --git a/kpovmodeler/pmphotonsedit.cpp b/kpovmodeler/pmphotonsedit.cpp index a2fde9a2..612800f9 100644 --- a/kpovmodeler/pmphotonsedit.cpp +++ b/kpovmodeler/pmphotonsedit.cpp @@ -23,9 +23,9 @@ #include <tqlayout.h> #include <tqlabel.h> #include <tqcheckbox.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> PMPhotonsEdit::PMPhotonsEdit( TQWidget* parent, const char* name ) diff --git a/kpovmodeler/pmpigment.cpp b/kpovmodeler/pmpigment.cpp index be37cfb1..66107a8a 100644 --- a/kpovmodeler/pmpigment.cpp +++ b/kpovmodeler/pmpigment.cpp @@ -21,7 +21,7 @@ #include "pmmemento.h" #include "pmpigmentedit.h" -#include <klocale.h> +#include <tdelocale.h> PMDefinePropertyClass( PMPigment, PMPigmentProperty ); diff --git a/kpovmodeler/pmpigmentedit.cpp b/kpovmodeler/pmpigmentedit.cpp index 16bfab2c..e7318830 100644 --- a/kpovmodeler/pmpigmentedit.cpp +++ b/kpovmodeler/pmpigmentedit.cpp @@ -22,7 +22,7 @@ #include <tqlayout.h> #include <tqcheckbox.h> -#include <klocale.h> +#include <tdelocale.h> PMPigmentEdit::PMPigmentEdit( TQWidget* parent, const char* name ) diff --git a/kpovmodeler/pmplane.cpp b/kpovmodeler/pmplane.cpp index db7af35a..577a3036 100644 --- a/kpovmodeler/pmplane.cpp +++ b/kpovmodeler/pmplane.cpp @@ -25,7 +25,7 @@ #include "pmplanenormalcontrolpoint.h" #include "pmdefaults.h" -#include <klocale.h> +#include <tdelocale.h> #include "pmplaneedit.h" diff --git a/kpovmodeler/pmplaneedit.cpp b/kpovmodeler/pmplaneedit.cpp index 13e28aab..ada9c3f3 100644 --- a/kpovmodeler/pmplaneedit.cpp +++ b/kpovmodeler/pmplaneedit.cpp @@ -25,8 +25,8 @@ #include <tqlabel.h> #include <tqpushbutton.h> #include <tqcheckbox.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> PMPlaneEdit::PMPlaneEdit( TQWidget* parent, const char* name ) : Base( parent, name ) diff --git a/kpovmodeler/pmpluginsettings.cpp b/kpovmodeler/pmpluginsettings.cpp index 901bac94..0d06000c 100644 --- a/kpovmodeler/pmpluginsettings.cpp +++ b/kpovmodeler/pmpluginsettings.cpp @@ -23,7 +23,7 @@ #include <tqgroupbox.h> #include <tqlistview.h> #include <tqpushbutton.h> -#include <klocale.h> +#include <tdelocale.h> class PMPluginListViewItem : public TQListViewItem { diff --git a/kpovmodeler/pmpolynom.cpp b/kpovmodeler/pmpolynom.cpp index e44044c5..ececea2a 100644 --- a/kpovmodeler/pmpolynom.cpp +++ b/kpovmodeler/pmpolynom.cpp @@ -22,7 +22,7 @@ #include "pmxmlhelper.h" #include "pmmemento.h" -#include <klocale.h> +#include <tdelocale.h> const double c_defaultCoefficients[10] = { // Hyperboloid_Y diff --git a/kpovmodeler/pmpolynomedit.cpp b/kpovmodeler/pmpolynomedit.cpp index e0e3bebc..e0e3a24c 100644 --- a/kpovmodeler/pmpolynomedit.cpp +++ b/kpovmodeler/pmpolynomedit.cpp @@ -26,7 +26,7 @@ #include <tqcheckbox.h> #include <tqspinbox.h> #include <tqlabel.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> PMPolynomEdit::PMPolynomEdit( TQWidget* parent, const char* name ) diff --git a/kpovmodeler/pmpovray31format.cpp b/kpovmodeler/pmpovray31format.cpp index dc2bb54e..1fd6af10 100644 --- a/kpovmodeler/pmpovray31format.cpp +++ b/kpovmodeler/pmpovray31format.cpp @@ -21,7 +21,7 @@ #include "pmpovrayparser.h" #include "pmoutputdevice.h" -#include <klocale.h> +#include <tdelocale.h> PMPovray31Format::PMPovray31Format( ) : PMPovrayFormat( ) diff --git a/kpovmodeler/pmpovray35format.cpp b/kpovmodeler/pmpovray35format.cpp index 438eb261..abbe7648 100644 --- a/kpovmodeler/pmpovray35format.cpp +++ b/kpovmodeler/pmpovray35format.cpp @@ -21,7 +21,7 @@ #include "pmpovrayparser.h" #include "pmoutputdevice.h" -#include <klocale.h> +#include <tdelocale.h> PMPovray35Format::PMPovray35Format( ) : PMPovray31Format( ) diff --git a/kpovmodeler/pmpovraymatrix.cpp b/kpovmodeler/pmpovraymatrix.cpp index d51610f1..1b661ab9 100644 --- a/kpovmodeler/pmpovraymatrix.cpp +++ b/kpovmodeler/pmpovraymatrix.cpp @@ -22,7 +22,7 @@ #include "pmxmlhelper.h" #include "pmmemento.h" -#include <klocale.h> +#include <tdelocale.h> PMDefinePropertyClass( PMPovrayMatrix, PMPovrayMatrixProperty ); diff --git a/kpovmodeler/pmpovraymatrixedit.cpp b/kpovmodeler/pmpovraymatrixedit.cpp index 1e0f7833..e7a41368 100644 --- a/kpovmodeler/pmpovraymatrixedit.cpp +++ b/kpovmodeler/pmpovraymatrixedit.cpp @@ -22,7 +22,7 @@ #include <tqlayout.h> #include <tqlabel.h> -#include <klocale.h> +#include <tdelocale.h> PMPovrayMatrixEdit::PMPovrayMatrixEdit( TQWidget* parent, const char* name ) diff --git a/kpovmodeler/pmpovrayoutputwidget.cpp b/kpovmodeler/pmpovrayoutputwidget.cpp index 7ac52131..2154cce4 100644 --- a/kpovmodeler/pmpovrayoutputwidget.cpp +++ b/kpovmodeler/pmpovrayoutputwidget.cpp @@ -20,8 +20,8 @@ #include <tqtextedit.h> #include <tqlayout.h> -#include <klocale.h> -#include <kglobalsettings.h> +#include <tdelocale.h> +#include <tdeglobalsettings.h> #include <tdeconfig.h> #include <kpushbutton.h> #include <kstdguiitem.h> diff --git a/kpovmodeler/pmpovrayparser.cpp b/kpovmodeler/pmpovrayparser.cpp index c8cdd84f..606ea381 100644 --- a/kpovmodeler/pmpovrayparser.cpp +++ b/kpovmodeler/pmpovrayparser.cpp @@ -18,7 +18,7 @@ #include "pmpovrayparser.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqvaluelist.h> #include "pmpart.h" diff --git a/kpovmodeler/pmpovrayrenderwidget.cpp b/kpovmodeler/pmpovrayrenderwidget.cpp index be8e2d0a..cc5564d4 100644 --- a/kpovmodeler/pmpovrayrenderwidget.cpp +++ b/kpovmodeler/pmpovrayrenderwidget.cpp @@ -21,11 +21,11 @@ #include "pmdragwidget.h" #include <kprocess.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <kurl.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tqcolor.h> #include <tqpainter.h> #include <tqtextstream.h> diff --git a/kpovmodeler/pmpovraysettings.cpp b/kpovmodeler/pmpovraysettings.cpp index 40153ce8..17094996 100644 --- a/kpovmodeler/pmpovraysettings.cpp +++ b/kpovmodeler/pmpovraysettings.cpp @@ -30,9 +30,9 @@ #include <tqcombobox.h> #include <tqgroupbox.h> #include <tqlabel.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdefiledialog.h> PMPovraySettings::PMPovraySettings( TQWidget* parent, const char* name ) diff --git a/kpovmodeler/pmpovraywidget.cpp b/kpovmodeler/pmpovraywidget.cpp index c28b48b9..ac1162c2 100644 --- a/kpovmodeler/pmpovraywidget.cpp +++ b/kpovmodeler/pmpovraywidget.cpp @@ -20,13 +20,13 @@ #include "pmpovrayoutputwidget.h" #include "pmshell.h" -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kimageio.h> #include <tdefiledialog.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tdeio/netaccess.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kpushbutton.h> #include <kstdguiitem.h> diff --git a/kpovmodeler/pmpreviewsettings.cpp b/kpovmodeler/pmpreviewsettings.cpp index 700c19ee..556ae12d 100644 --- a/kpovmodeler/pmpreviewsettings.cpp +++ b/kpovmodeler/pmpreviewsettings.cpp @@ -26,8 +26,8 @@ #include <tqlabel.h> #include <tqcheckbox.h> #include <kcolorbutton.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> PMPreviewSettings::PMPreviewSettings( TQWidget* parent, const char* name ) : PMSettingsDialogPage( parent, name ) diff --git a/kpovmodeler/pmprism.cpp b/kpovmodeler/pmprism.cpp index 81417ba3..34f19284 100644 --- a/kpovmodeler/pmprism.cpp +++ b/kpovmodeler/pmprism.cpp @@ -30,7 +30,7 @@ #include "pmenumproperty.h" #include "pmobjectaction.h" -#include <klocale.h> +#include <tdelocale.h> const int defaultNumberOfPoints = 6; const PMVector defaultPoint[defaultNumberOfPoints] = diff --git a/kpovmodeler/pmprismedit.cpp b/kpovmodeler/pmprismedit.cpp index e5cf8615..04a2df94 100644 --- a/kpovmodeler/pmprismedit.cpp +++ b/kpovmodeler/pmprismedit.cpp @@ -29,10 +29,10 @@ #include <tqcombobox.h> #include <tqcheckbox.h> #include <tqpushbutton.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> PMPrismEdit::PMPrismEdit( TQWidget* parent, const char* name ) : Base( parent, name ) diff --git a/kpovmodeler/pmprojectedthrough.cpp b/kpovmodeler/pmprojectedthrough.cpp index 96c0c00a..f9fb87e2 100644 --- a/kpovmodeler/pmprojectedthrough.cpp +++ b/kpovmodeler/pmprojectedthrough.cpp @@ -21,7 +21,7 @@ #include "pmmemento.h" #include "pmnamedobjectedit.h" -#include <klocale.h> +#include <tdelocale.h> PMMetaObject* PMProjectedThrough::s_pMetaObject = 0; PMObject* createNewProjectedThrough( PMPart* part ) diff --git a/kpovmodeler/pmprototypemanager.cpp b/kpovmodeler/pmprototypemanager.cpp index ac8f5140..375248e6 100644 --- a/kpovmodeler/pmprototypemanager.cpp +++ b/kpovmodeler/pmprototypemanager.cpp @@ -18,7 +18,7 @@ #include "pmprototypemanager.h" #include "pmallobjects.h" -#include <klocale.h> +#include <tdelocale.h> PMPrototypeManager::PMPrototypeManager( PMPart* part ) : m_metaDict( 43 ) diff --git a/kpovmodeler/pmquickcolor.cpp b/kpovmodeler/pmquickcolor.cpp index 25fc7aff..73a0104a 100644 --- a/kpovmodeler/pmquickcolor.cpp +++ b/kpovmodeler/pmquickcolor.cpp @@ -24,7 +24,7 @@ #include "pmquickcoloredit.h" #include "pmmemento.h" -#include <klocale.h> +#include <tdelocale.h> const PMColor colorDefault = PMColor( 1.0, 1.0, 1.0, 0.0, 0.0 ); diff --git a/kpovmodeler/pmquickcoloredit.cpp b/kpovmodeler/pmquickcoloredit.cpp index cb86c0c0..ba54311e 100644 --- a/kpovmodeler/pmquickcoloredit.cpp +++ b/kpovmodeler/pmquickcoloredit.cpp @@ -23,7 +23,7 @@ #include <tqlayout.h> #include <tqlabel.h> -#include <klocale.h> +#include <tdelocale.h> PMQuickColorEdit::PMQuickColorEdit( TQWidget* parent, const char* name ) diff --git a/kpovmodeler/pmradiosity.cpp b/kpovmodeler/pmradiosity.cpp index 86d36e74..fe711417 100644 --- a/kpovmodeler/pmradiosity.cpp +++ b/kpovmodeler/pmradiosity.cpp @@ -21,7 +21,7 @@ #include "pmmemento.h" #include "pmradiosityedit.h" -#include <klocale.h> +#include <tdelocale.h> const double adcBailoutDefault = 0.01; const double brightnessDefault = 1.0; diff --git a/kpovmodeler/pmradiosityedit.cpp b/kpovmodeler/pmradiosityedit.cpp index 97494ff8..670c2c04 100644 --- a/kpovmodeler/pmradiosityedit.cpp +++ b/kpovmodeler/pmradiosityedit.cpp @@ -23,9 +23,9 @@ #include <tqlayout.h> #include <tqlabel.h> #include <tqcheckbox.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> PMRadiosityEdit::PMRadiosityEdit( TQWidget* parent, const char* name ) diff --git a/kpovmodeler/pmrainbow.cpp b/kpovmodeler/pmrainbow.cpp index 1fd9e8ca..84ca60eb 100644 --- a/kpovmodeler/pmrainbow.cpp +++ b/kpovmodeler/pmrainbow.cpp @@ -22,7 +22,7 @@ #include "pmrainbowedit.h" #include "pmvector.h" -#include <klocale.h> +#include <tdelocale.h> PMMetaObject* PMRainbow::s_pMetaObject = 0; PMObject* createNewRainbow( PMPart* part ) diff --git a/kpovmodeler/pmrainbowedit.cpp b/kpovmodeler/pmrainbowedit.cpp index 7765f720..a347e442 100644 --- a/kpovmodeler/pmrainbowedit.cpp +++ b/kpovmodeler/pmrainbowedit.cpp @@ -26,8 +26,8 @@ #include <tqlayout.h> #include <tqcheckbox.h> #include <tqlabel.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> PMRainbowEdit::PMRainbowEdit( TQWidget* parent, const char* name ) diff --git a/kpovmodeler/pmraw.cpp b/kpovmodeler/pmraw.cpp index 31d7ec1a..7f381335 100644 --- a/kpovmodeler/pmraw.cpp +++ b/kpovmodeler/pmraw.cpp @@ -22,7 +22,7 @@ #include "pmrawedit.h" #include "pmmemento.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqtextstream.h> PMDefinePropertyClass( PMRaw, PMRawProperty ); diff --git a/kpovmodeler/pmrawedit.cpp b/kpovmodeler/pmrawedit.cpp index 5720d615..f1d88516 100644 --- a/kpovmodeler/pmrawedit.cpp +++ b/kpovmodeler/pmrawedit.cpp @@ -22,8 +22,8 @@ #include <tqlayout.h> #include <tqlabel.h> #include <tqmultilineedit.h> -#include <kglobalsettings.h> -#include <klocale.h> +#include <tdeglobalsettings.h> +#include <tdelocale.h> PMRawEdit::PMRawEdit( TQWidget* parent, const char* name ) : Base( parent, name ) diff --git a/kpovmodeler/pmrendermanager.cpp b/kpovmodeler/pmrendermanager.cpp index 746f64b9..17fe56ff 100644 --- a/kpovmodeler/pmrendermanager.cpp +++ b/kpovmodeler/pmrendermanager.cpp @@ -36,7 +36,7 @@ #include <tqimage.h> #include <tqpainter.h> #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <time.h> #include <stdio.h> diff --git a/kpovmodeler/pmrendermode.cpp b/kpovmodeler/pmrendermode.cpp index 8ef8d207..b2a752f8 100644 --- a/kpovmodeler/pmrendermode.cpp +++ b/kpovmodeler/pmrendermode.cpp @@ -16,7 +16,7 @@ **************************************************************************/ #include "pmrendermode.h" -#include <klocale.h> +#include <tdelocale.h> #include "pmxmlhelper.h" diff --git a/kpovmodeler/pmrendermodesdialog.cpp b/kpovmodeler/pmrendermodesdialog.cpp index 346f2219..1452e606 100644 --- a/kpovmodeler/pmrendermodesdialog.cpp +++ b/kpovmodeler/pmrendermodesdialog.cpp @@ -28,9 +28,9 @@ #include <tqlabel.h> #include <tqcombobox.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdefiledialog.h> #include "pmlineedits.h" diff --git a/kpovmodeler/pmrotate.cpp b/kpovmodeler/pmrotate.cpp index 5a432c91..5a1db2bd 100644 --- a/kpovmodeler/pmrotate.cpp +++ b/kpovmodeler/pmrotate.cpp @@ -23,7 +23,7 @@ #include "pmmemento.h" #include "pmrotatecontrolpoint.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqdom.h> const PMVector rotateDefault = PMVector( 0, 0, 0 ); diff --git a/kpovmodeler/pmrotatecontrolpoint.cpp b/kpovmodeler/pmrotatecontrolpoint.cpp index b612b4c9..1a9bbc54 100644 --- a/kpovmodeler/pmrotatecontrolpoint.cpp +++ b/kpovmodeler/pmrotatecontrolpoint.cpp @@ -19,7 +19,7 @@ #include "pmmath.h" #include "pmdebug.h" -#include <klocale.h> +#include <tdelocale.h> #include <math.h> const double precision = 0.1; diff --git a/kpovmodeler/pmrotateedit.cpp b/kpovmodeler/pmrotateedit.cpp index 2ad5f06e..d0d366d4 100644 --- a/kpovmodeler/pmrotateedit.cpp +++ b/kpovmodeler/pmrotateedit.cpp @@ -21,7 +21,7 @@ #include "pmvectoredit.h" #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> PMRotateEdit::PMRotateEdit( TQWidget* parent, const char* name ) diff --git a/kpovmodeler/pmscale.cpp b/kpovmodeler/pmscale.cpp index af8245b8..22c9833d 100644 --- a/kpovmodeler/pmscale.cpp +++ b/kpovmodeler/pmscale.cpp @@ -23,7 +23,7 @@ #include "pmxmlhelper.h" #include "pmmemento.h" -#include <klocale.h> +#include <tdelocale.h> const PMVector scaleDefault = PMVector( 0, 0, 0 ); diff --git a/kpovmodeler/pmscalecontrolpoint.cpp b/kpovmodeler/pmscalecontrolpoint.cpp index c6def808..71410f60 100644 --- a/kpovmodeler/pmscalecontrolpoint.cpp +++ b/kpovmodeler/pmscalecontrolpoint.cpp @@ -19,7 +19,7 @@ #include "pmmath.h" #include "pmdebug.h" -#include <klocale.h> +#include <tdelocale.h> #include <math.h> const double precision = 0.001; diff --git a/kpovmodeler/pmscaleedit.cpp b/kpovmodeler/pmscaleedit.cpp index 24f3a471..4e94dcf2 100644 --- a/kpovmodeler/pmscaleedit.cpp +++ b/kpovmodeler/pmscaleedit.cpp @@ -21,7 +21,7 @@ #include "pmvectoredit.h" #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> PMScaleEdit::PMScaleEdit( TQWidget* parent, const char* name ) diff --git a/kpovmodeler/pmscanner.cpp b/kpovmodeler/pmscanner.cpp index c90c9728..a220a072 100644 --- a/kpovmodeler/pmscanner.cpp +++ b/kpovmodeler/pmscanner.cpp @@ -18,7 +18,7 @@ #include <ctype.h> #include <stdlib.h> -#include <klocale.h> +#include <tdelocale.h> #include "pmdebug.h" #include "pmscanner.h" diff --git a/kpovmodeler/pmscene.cpp b/kpovmodeler/pmscene.cpp index cd6593cd..45ef9a5e 100644 --- a/kpovmodeler/pmscene.cpp +++ b/kpovmodeler/pmscene.cpp @@ -17,7 +17,7 @@ #include "pmscene.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqdom.h> #include "pmxmlhelper.h" #include "pmdocumentformat.h" diff --git a/kpovmodeler/pmserializer.cpp b/kpovmodeler/pmserializer.cpp index 2f58d0c1..38c9f7c4 100644 --- a/kpovmodeler/pmserializer.cpp +++ b/kpovmodeler/pmserializer.cpp @@ -19,7 +19,7 @@ #include "pmerrorflags.h" #include "pmdebug.h" -#include <klocale.h> +#include <tdelocale.h> unsigned int PMSerializer::s_maxErrors = 30; unsigned int PMSerializer::s_maxWarnings = 50; diff --git a/kpovmodeler/pmsettingsdialog.cpp b/kpovmodeler/pmsettingsdialog.cpp index 4bb6c568..08f0cb3c 100644 --- a/kpovmodeler/pmsettingsdialog.cpp +++ b/kpovmodeler/pmsettingsdialog.cpp @@ -34,7 +34,7 @@ #include <tqvbox.h> #include <tqlistview.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <kiconloader.h> diff --git a/kpovmodeler/pmshell.cpp b/kpovmodeler/pmshell.cpp index 28c4251d..7b96e066 100644 --- a/kpovmodeler/pmshell.cpp +++ b/kpovmodeler/pmshell.cpp @@ -15,13 +15,13 @@ * * **************************************************************************/ -#include <klocale.h> +#include <tdelocale.h> #include <khelpmenu.h> #include <kstdaction.h> #include <tdeaction.h> #include <kstatusbar.h> #include <tdefiledialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kiconloader.h> #include <kedittoolbar.h> #include <kkeydialog.h> diff --git a/kpovmodeler/pmskysphere.cpp b/kpovmodeler/pmskysphere.cpp index a31cc475..84a2e199 100644 --- a/kpovmodeler/pmskysphere.cpp +++ b/kpovmodeler/pmskysphere.cpp @@ -22,7 +22,7 @@ #include "pmskysphereedit.h" #include "pmdebug.h" -#include <klocale.h> +#include <tdelocale.h> PMMetaObject* PMSkySphere::s_pMetaObject = 0; PMObject* createNewSkySphere( PMPart* part ) diff --git a/kpovmodeler/pmskysphereedit.cpp b/kpovmodeler/pmskysphereedit.cpp index 4a1590b2..ef45f2ea 100644 --- a/kpovmodeler/pmskysphereedit.cpp +++ b/kpovmodeler/pmskysphereedit.cpp @@ -22,7 +22,7 @@ #include <tqlayout.h> #include <tqlabel.h> -#include <klocale.h> +#include <tdelocale.h> PMSkySphereEdit::PMSkySphereEdit( TQWidget* parent, const char* name ) diff --git a/kpovmodeler/pmslope.cpp b/kpovmodeler/pmslope.cpp index 1d2d2977..571cc25c 100644 --- a/kpovmodeler/pmslope.cpp +++ b/kpovmodeler/pmslope.cpp @@ -21,7 +21,7 @@ #include "pmslopeedit.h" #include "pmmemento.h" -#include <klocale.h> +#include <tdelocale.h> const double heightDefault = 0; const double slopeDefault = 0; diff --git a/kpovmodeler/pmslopeedit.cpp b/kpovmodeler/pmslopeedit.cpp index 63b0ee44..16930e02 100644 --- a/kpovmodeler/pmslopeedit.cpp +++ b/kpovmodeler/pmslopeedit.cpp @@ -25,7 +25,7 @@ #include <tqlabel.h> #include <tqcombobox.h> #include <tqcheckbox.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> diff --git a/kpovmodeler/pmsolidcolor.cpp b/kpovmodeler/pmsolidcolor.cpp index dd50d030..7b0d650b 100644 --- a/kpovmodeler/pmsolidcolor.cpp +++ b/kpovmodeler/pmsolidcolor.cpp @@ -22,7 +22,7 @@ #include "pmsolidcoloredit.h" #include "pmmemento.h" -#include <klocale.h> +#include <tdelocale.h> const PMColor colorDefault = PMColor( 0.0, 0.0, 0.0, 0.0, 0.0 ); diff --git a/kpovmodeler/pmsolidcoloredit.cpp b/kpovmodeler/pmsolidcoloredit.cpp index 3eb326c4..52e27f73 100644 --- a/kpovmodeler/pmsolidcoloredit.cpp +++ b/kpovmodeler/pmsolidcoloredit.cpp @@ -22,7 +22,7 @@ #include <tqlayout.h> #include <tqlabel.h> -#include <klocale.h> +#include <tdelocale.h> PMSolidColorEdit::PMSolidColorEdit( TQWidget* parent, const char* name ) diff --git a/kpovmodeler/pmsolidobjectedit.cpp b/kpovmodeler/pmsolidobjectedit.cpp index 4a1a2205..98c4c7ca 100644 --- a/kpovmodeler/pmsolidobjectedit.cpp +++ b/kpovmodeler/pmsolidobjectedit.cpp @@ -21,7 +21,7 @@ #include <tqcheckbox.h> #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> PMSolidObjectEdit::PMSolidObjectEdit( TQWidget* parent, const char* name ) : Base( parent, name ) diff --git a/kpovmodeler/pmsor.cpp b/kpovmodeler/pmsor.cpp index 2ede8b8a..6ba20568 100644 --- a/kpovmodeler/pmsor.cpp +++ b/kpovmodeler/pmsor.cpp @@ -28,7 +28,7 @@ #include "pmdefaults.h" #include "pmobjectaction.h" -#include <klocale.h> +#include <tdelocale.h> const int defaultNumberOfPoints = 4; const PMVector defaultPoint[defaultNumberOfPoints] = diff --git a/kpovmodeler/pmsoredit.cpp b/kpovmodeler/pmsoredit.cpp index 127015df..03179ea2 100644 --- a/kpovmodeler/pmsoredit.cpp +++ b/kpovmodeler/pmsoredit.cpp @@ -27,10 +27,10 @@ #include <tqcombobox.h> #include <tqcheckbox.h> #include <tqpushbutton.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> PMSurfaceOfRevolutionEdit::PMSurfaceOfRevolutionEdit( TQWidget* parent, const char* name ) : Base( parent, name ) diff --git a/kpovmodeler/pmsphere.cpp b/kpovmodeler/pmsphere.cpp index cca385c9..c5f65b56 100644 --- a/kpovmodeler/pmsphere.cpp +++ b/kpovmodeler/pmsphere.cpp @@ -26,7 +26,7 @@ #include "pmdistancecontrolpoint.h" #include "pmdefaults.h" -#include <klocale.h> +#include <tdelocale.h> /** default param for the sphere */ const double c_defaultRadius = 0.5; diff --git a/kpovmodeler/pmsphereedit.cpp b/kpovmodeler/pmsphereedit.cpp index c12f95bd..31406d5e 100644 --- a/kpovmodeler/pmsphereedit.cpp +++ b/kpovmodeler/pmsphereedit.cpp @@ -24,7 +24,7 @@ #include <tqlayout.h> #include <tqlabel.h> -#include <klocale.h> +#include <tdelocale.h> PMSphereEdit::PMSphereEdit( TQWidget* parent, const char* name ) : Base( parent, name ) diff --git a/kpovmodeler/pmspheresweep.cpp b/kpovmodeler/pmspheresweep.cpp index 9660335e..8f8e7d0a 100644 --- a/kpovmodeler/pmspheresweep.cpp +++ b/kpovmodeler/pmspheresweep.cpp @@ -31,7 +31,7 @@ #include "pmpoint.h" #include "pmmatrix.h" -#include <klocale.h> +#include <tdelocale.h> const int defaultNumberOfPoints = 2; const PMVector defaultPoint[defaultNumberOfPoints] = diff --git a/kpovmodeler/pmspheresweepedit.cpp b/kpovmodeler/pmspheresweepedit.cpp index 9798a304..06ae4ec1 100644 --- a/kpovmodeler/pmspheresweepedit.cpp +++ b/kpovmodeler/pmspheresweepedit.cpp @@ -29,10 +29,10 @@ #include <tqcombobox.h> #include <tqcheckbox.h> #include <tqpushbutton.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> PMSphereSweepEdit::PMSphereSweepEdit( TQWidget* parent, const char* name ) : Base( parent, name ) diff --git a/kpovmodeler/pmsqe.cpp b/kpovmodeler/pmsqe.cpp index 61279251..327e4e81 100644 --- a/kpovmodeler/pmsqe.cpp +++ b/kpovmodeler/pmsqe.cpp @@ -25,7 +25,7 @@ #include "pmdefaults.h" #include "pmmath.h" -#include <klocale.h> +#include <tdelocale.h> const double c_defaultEastWestExponent = 1.0; const double c_defaultNorthSouthExponent = 1.0; diff --git a/kpovmodeler/pmsqeedit.cpp b/kpovmodeler/pmsqeedit.cpp index 377b552b..f802b22f 100644 --- a/kpovmodeler/pmsqeedit.cpp +++ b/kpovmodeler/pmsqeedit.cpp @@ -22,7 +22,7 @@ #include <tqlayout.h> #include <tqlabel.h> -#include <klocale.h> +#include <tdelocale.h> PMSuperquadricEllipsoidEdit::PMSuperquadricEllipsoidEdit( TQWidget* parent, const char* name ) : Base( parent, name ) diff --git a/kpovmodeler/pmtext.cpp b/kpovmodeler/pmtext.cpp index 9410228d..b26372e4 100644 --- a/kpovmodeler/pmtext.cpp +++ b/kpovmodeler/pmtext.cpp @@ -26,7 +26,7 @@ #include "pmtruetypecache.h" #include "pmdefaults.h" -#include <klocale.h> +#include <tdelocale.h> const TQString c_defaultFont = TQString( "" ); const TQString c_defaultText = TQString( "" ); diff --git a/kpovmodeler/pmtextedit.cpp b/kpovmodeler/pmtextedit.cpp index 2ea76346..e26d35e2 100644 --- a/kpovmodeler/pmtextedit.cpp +++ b/kpovmodeler/pmtextedit.cpp @@ -25,7 +25,7 @@ #include <tqlabel.h> #include <tqlineedit.h> #include <tqpushbutton.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <tdefiledialog.h> diff --git a/kpovmodeler/pmtexture.cpp b/kpovmodeler/pmtexture.cpp index a40da8cb..33279731 100644 --- a/kpovmodeler/pmtexture.cpp +++ b/kpovmodeler/pmtexture.cpp @@ -21,7 +21,7 @@ #include "pmmemento.h" #include "pmtextureedit.h" -#include <klocale.h> +#include <tdelocale.h> PMDefinePropertyClass( PMTexture, PMTextureProperty ); diff --git a/kpovmodeler/pmtexturebase.cpp b/kpovmodeler/pmtexturebase.cpp index a49b103f..db81b8cd 100644 --- a/kpovmodeler/pmtexturebase.cpp +++ b/kpovmodeler/pmtexturebase.cpp @@ -26,7 +26,7 @@ #include "pmmemento.h" #include "pmxmlhelper.h" -#include <klocale.h> +#include <tdelocale.h> PMDefinePropertyClass( PMTextureBase, PMTextureBaseProperty ); diff --git a/kpovmodeler/pmtexturebaseedit.cpp b/kpovmodeler/pmtexturebaseedit.cpp index 0768adc1..ad68341d 100644 --- a/kpovmodeler/pmtexturebaseedit.cpp +++ b/kpovmodeler/pmtexturebaseedit.cpp @@ -22,7 +22,7 @@ #include <tqlayout.h> #include <tqlabel.h> -#include <klocale.h> +#include <tdelocale.h> PMTextureBaseEdit::PMTextureBaseEdit( TQWidget* parent, const char* name ) diff --git a/kpovmodeler/pmtextureedit.cpp b/kpovmodeler/pmtextureedit.cpp index 768cc3cc..59ae2908 100644 --- a/kpovmodeler/pmtextureedit.cpp +++ b/kpovmodeler/pmtextureedit.cpp @@ -22,7 +22,7 @@ #include <tqlayout.h> #include <tqcheckbox.h> -#include <klocale.h> +#include <tdelocale.h> PMTextureEdit::PMTextureEdit( TQWidget* parent, const char* name ) diff --git a/kpovmodeler/pmtexturemap.cpp b/kpovmodeler/pmtexturemap.cpp index 1ab0c3a4..ed9a2f7b 100644 --- a/kpovmodeler/pmtexturemap.cpp +++ b/kpovmodeler/pmtexturemap.cpp @@ -23,7 +23,7 @@ #include "pmmapmemento.h" #include <tqtextstream.h> -#include <klocale.h> +#include <tdelocale.h> class PMValueProperty : public PMPropertyBase { diff --git a/kpovmodeler/pmtexturemapedit.cpp b/kpovmodeler/pmtexturemapedit.cpp index 2efa7708..ad5545d8 100644 --- a/kpovmodeler/pmtexturemapedit.cpp +++ b/kpovmodeler/pmtexturemapedit.cpp @@ -22,8 +22,8 @@ #include <tqlayout.h> #include <tqlabel.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> PMTextureMapEdit::PMTextureMapEdit( TQWidget* parent, const char* name ) diff --git a/kpovmodeler/pmtorus.cpp b/kpovmodeler/pmtorus.cpp index 5e5be5ea..f48c4c11 100644 --- a/kpovmodeler/pmtorus.cpp +++ b/kpovmodeler/pmtorus.cpp @@ -26,7 +26,7 @@ #include "pmdistancecontrolpoint.h" #include "pmdefaults.h" -#include <klocale.h> +#include <tdelocale.h> /** default param for the Torus */ const double c_defaultminorRadius = 0.25; diff --git a/kpovmodeler/pmtorusedit.cpp b/kpovmodeler/pmtorusedit.cpp index e47301b9..596297bf 100644 --- a/kpovmodeler/pmtorusedit.cpp +++ b/kpovmodeler/pmtorusedit.cpp @@ -22,7 +22,7 @@ #include <tqlayout.h> #include <tqlabel.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqcheckbox.h> diff --git a/kpovmodeler/pmtranslate.cpp b/kpovmodeler/pmtranslate.cpp index a0a09b7b..391511b3 100644 --- a/kpovmodeler/pmtranslate.cpp +++ b/kpovmodeler/pmtranslate.cpp @@ -23,7 +23,7 @@ #include "pmmemento.h" #include "pmtranslatecontrolpoint.h" -#include <klocale.h> +#include <tdelocale.h> const PMVector moveDefault = PMVector( 0.0, 0.0, 0.0 ); diff --git a/kpovmodeler/pmtranslatecontrolpoint.cpp b/kpovmodeler/pmtranslatecontrolpoint.cpp index 857e3af9..f153ccd9 100644 --- a/kpovmodeler/pmtranslatecontrolpoint.cpp +++ b/kpovmodeler/pmtranslatecontrolpoint.cpp @@ -18,7 +18,7 @@ #include "pmtranslatecontrolpoint.h" #include "pmmath.h" -#include <klocale.h> +#include <tdelocale.h> #include <math.h> PMTranslateControlPoint::PMTranslateControlPoint( const PMVector& trans, int id ) diff --git a/kpovmodeler/pmtranslateedit.cpp b/kpovmodeler/pmtranslateedit.cpp index f98bcf00..51c5cdbe 100644 --- a/kpovmodeler/pmtranslateedit.cpp +++ b/kpovmodeler/pmtranslateedit.cpp @@ -21,7 +21,7 @@ #include "pmvectoredit.h" #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> PMTranslateEdit::PMTranslateEdit( TQWidget* parent, const char* name ) diff --git a/kpovmodeler/pmtreeview.cpp b/kpovmodeler/pmtreeview.cpp index e1fa9e97..7ac1ca76 100644 --- a/kpovmodeler/pmtreeview.cpp +++ b/kpovmodeler/pmtreeview.cpp @@ -24,9 +24,9 @@ #include <tqpopupmenu.h> #include <tqcursor.h> -#include <klocale.h> -#include <kmessagebox.h> -#include <kglobalsettings.h> +#include <tdelocale.h> +#include <tdemessagebox.h> +#include <tdeglobalsettings.h> #include <kiconloader.h> #include <kxmlguifactory.h> diff --git a/kpovmodeler/pmtriangle.cpp b/kpovmodeler/pmtriangle.cpp index ecf00f8c..ebbbd356 100644 --- a/kpovmodeler/pmtriangle.cpp +++ b/kpovmodeler/pmtriangle.cpp @@ -25,7 +25,7 @@ #include "pm3dcontrolpoint.h" #include "pmvectorcontrolpoint.h" -#include <klocale.h> +#include <tdelocale.h> const PMVector point0Default = PMVector( -1.0, 0.0, 0.0 ); const PMVector point1Default = PMVector( 1.0, 0.0, 0.0 ); diff --git a/kpovmodeler/pmtriangleedit.cpp b/kpovmodeler/pmtriangleedit.cpp index 457ddb29..64c554c0 100644 --- a/kpovmodeler/pmtriangleedit.cpp +++ b/kpovmodeler/pmtriangleedit.cpp @@ -24,8 +24,8 @@ #include <tqlabel.h> #include <tqcheckbox.h> #include <tqpushbutton.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> PMTriangleEdit::PMTriangleEdit( TQWidget* parent, const char* name ) : Base( parent, name ) diff --git a/kpovmodeler/pmunknownview.cpp b/kpovmodeler/pmunknownview.cpp index 72827c2f..d75e9410 100644 --- a/kpovmodeler/pmunknownview.cpp +++ b/kpovmodeler/pmunknownview.cpp @@ -16,7 +16,7 @@ **************************************************************************/ #include "pmunknownview.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqlayout.h> PMUnknownView::PMUnknownView( const TQString& viewType, diff --git a/kpovmodeler/pmvectoredit.cpp b/kpovmodeler/pmvectoredit.cpp index 7b9b6568..017fae9c 100644 --- a/kpovmodeler/pmvectoredit.cpp +++ b/kpovmodeler/pmvectoredit.cpp @@ -22,8 +22,8 @@ #include <tqlayout.h> #include <tqlabel.h> #include <kdialog.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> PMVectorEdit::PMVectorEdit( const TQString& descriptionX, diff --git a/kpovmodeler/pmvectorlistedit.cpp b/kpovmodeler/pmvectorlistedit.cpp index eb580d63..0fa5ded9 100644 --- a/kpovmodeler/pmvectorlistedit.cpp +++ b/kpovmodeler/pmvectorlistedit.cpp @@ -22,8 +22,8 @@ #include <tqapplication.h> #include <tqpalette.h> #include <tqpainter.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> const int c_columnWidth = 65; diff --git a/kpovmodeler/pmview.cpp b/kpovmodeler/pmview.cpp index c791375b..e9ec01d1 100644 --- a/kpovmodeler/pmview.cpp +++ b/kpovmodeler/pmview.cpp @@ -23,7 +23,7 @@ #include <tqlabel.h> #include <tdeconfig.h> #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <stdio.h> diff --git a/kpovmodeler/pmviewfactory.cpp b/kpovmodeler/pmviewfactory.cpp index 804c787c..26c0a040 100644 --- a/kpovmodeler/pmviewfactory.cpp +++ b/kpovmodeler/pmviewfactory.cpp @@ -26,7 +26,7 @@ #include "pmdialogview.h" #include "pmlibrarybrowser.h" -#include <klocale.h> +#include <tdelocale.h> PMViewFactory* PMViewFactory::s_pInstance = 0; KStaticDeleter<PMViewFactory> PMViewFactory::s_staticDeleter; diff --git a/kpovmodeler/pmviewlayoutmanager.cpp b/kpovmodeler/pmviewlayoutmanager.cpp index 6522f6da..a3eb400b 100644 --- a/kpovmodeler/pmviewlayoutmanager.cpp +++ b/kpovmodeler/pmviewlayoutmanager.cpp @@ -22,7 +22,7 @@ #include <tdeconfig.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <kfilterdev.h> #include <tdepopupmenu.h> #include <kiconloader.h> diff --git a/kpovmodeler/pmwarp.cpp b/kpovmodeler/pmwarp.cpp index 166777ce..b80cdcfe 100644 --- a/kpovmodeler/pmwarp.cpp +++ b/kpovmodeler/pmwarp.cpp @@ -22,7 +22,7 @@ #include "pmmemento.h" #include "pmenumproperty.h" -#include <klocale.h> +#include <tdelocale.h> const PMVector directionDefault = PMVector( 1.0, 0.0, 0.0 ); const PMVector offsetDefault = PMVector( 0.0, 0.0, 0.0 ); diff --git a/kpovmodeler/pmwarpedit.cpp b/kpovmodeler/pmwarpedit.cpp index 64e327f2..ca38417c 100644 --- a/kpovmodeler/pmwarpedit.cpp +++ b/kpovmodeler/pmwarpedit.cpp @@ -25,7 +25,7 @@ #include <tqlabel.h> #include <tqcombobox.h> #include <tqcheckbox.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> diff --git a/kpovmodeler/pmxmlparser.cpp b/kpovmodeler/pmxmlparser.cpp index 11d42015..7cb71a87 100644 --- a/kpovmodeler/pmxmlparser.cpp +++ b/kpovmodeler/pmxmlparser.cpp @@ -18,7 +18,7 @@ #include "pmxmlparser.h" #include <tqbuffer.h> -#include <klocale.h> +#include <tdelocale.h> #include "pmpart.h" #include "pmscene.h" diff --git a/kruler/klineal.cpp b/kruler/klineal.cpp index 7dc680b1..a4d7e19c 100644 --- a/kruler/klineal.cpp +++ b/kruler/klineal.cpp @@ -20,11 +20,11 @@ #include <tdeconfig.h> #include <kcursor.h> #include <kdebug.h> -#include <kglobal.h> -#include <kglobalsettings.h> +#include <tdeglobal.h> +#include <tdeglobalsettings.h> #include <kiconloader.h> #include <kimageeffect.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdemainwindow.h> #include <knotifyclient.h> #include <tdepopupmenu.h> diff --git a/kruler/main.cpp b/kruler/main.cpp index e7165eb2..d9892c1e 100644 --- a/kruler/main.cpp +++ b/kruler/main.cpp @@ -5,7 +5,7 @@ #include <tdecmdlineargs.h> #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> #include "klineal.h" diff --git a/ksnapshot/ksnapshot.cpp b/ksnapshot/ksnapshot.cpp index 15a3407c..ad5df57c 100644 --- a/ksnapshot/ksnapshot.cpp +++ b/ksnapshot/ksnapshot.cpp @@ -11,17 +11,17 @@ */ -#include <klocale.h> +#include <tdelocale.h> #include <kimageio.h> #include <tdefiledialog.h> #include <kimagefilepreview.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdebug.h> #include <tdeapplication.h> #include <kprinter.h> #include <tdeio/netaccess.h> #include <ksavefile.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tqbitmap.h> #include <tqdragobject.h> @@ -34,7 +34,7 @@ #include <khelpmenu.h> #include <tdepopupmenu.h> #include <kpushbutton.h> -#include <kstartupinfo.h> +#include <tdestartupinfo.h> #include <tqcursor.h> #include <tqregexp.h> @@ -54,7 +54,7 @@ #include <config.h> -#include <kglobal.h> +#include <tdeglobal.h> #define kApp TDEApplication::kApplication() diff --git a/ksnapshot/ksnapshot.h b/ksnapshot/ksnapshot.h index 4ccaaeb6..5db7c0e6 100644 --- a/ksnapshot/ksnapshot.h +++ b/ksnapshot/ksnapshot.h @@ -13,7 +13,7 @@ #include <tqtimer.h> #include <dcopclient.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kdialogbase.h> #include <kurl.h> diff --git a/ksnapshot/ksnapshotwidget.ui b/ksnapshot/ksnapshotwidget.ui index 95590cb4..10082ab6 100644 --- a/ksnapshot/ksnapshotwidget.ui +++ b/ksnapshot/ksnapshotwidget.ui @@ -320,7 +320,7 @@ If <i>no delay</i> is set, the program will wait for a mouse click b <includes> <include location="global" impldecl="in implementation">kdialog.h</include> <include location="global" impldecl="in implementation">kiconloader.h</include> - <include location="global" impldecl="in implementation">kglobalsettings.h</include> + <include location="global" impldecl="in implementation">tdeglobalsettings.h</include> <include location="local" impldecl="in implementation">ksnapshotwidget.ui.h</include> </includes> <Q_SIGNALS> diff --git a/ksnapshot/main.cpp b/ksnapshot/main.cpp index f3dde8e0..098ae004 100644 --- a/ksnapshot/main.cpp +++ b/ksnapshot/main.cpp @@ -23,7 +23,7 @@ #include <tdeapplication.h> #include <kimageio.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> #include <tdeaboutdata.h> #include <kiconloader.h> diff --git a/ksnapshot/regiongrabber.cpp b/ksnapshot/regiongrabber.cpp index 9db7ed2f..2c4d4a2b 100644 --- a/ksnapshot/regiongrabber.cpp +++ b/ksnapshot/regiongrabber.cpp @@ -26,7 +26,7 @@ #include <tqtimer.h> #include <tqtooltip.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> SizeTip::SizeTip( TQWidget *parent, const char *name ) : TQLabel( parent, name, WStyle_Customize | WX11BypassWM | diff --git a/ksvg/core/KSVGCanvas.cpp b/ksvg/core/KSVGCanvas.cpp index 347e00ba..49d56982 100644 --- a/ksvg/core/KSVGCanvas.cpp +++ b/ksvg/core/KSVGCanvas.cpp @@ -30,7 +30,7 @@ #include "SVGDocumentImpl.h" #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tqstring.h> #include <tqdatetime.h> diff --git a/ksvg/core/KSVGReader.cc b/ksvg/core/KSVGReader.cc index e3dc186f..9fef68f7 100644 --- a/ksvg/core/KSVGReader.cc +++ b/ksvg/core/KSVGReader.cc @@ -20,7 +20,7 @@ #include <dom/dom_exception.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqmap.h> #include <ksimpleconfig.h> #include <KSVGCanvas.h> diff --git a/ksvg/ecma/ksvg_window.cpp b/ksvg/ecma/ksvg_window.cpp index 979e7fed..8afce843 100644 --- a/ksvg/ecma/ksvg_window.cpp +++ b/ksvg/ecma/ksvg_window.cpp @@ -43,8 +43,8 @@ #include <assert.h> #include <kdebug.h> #include <tqstylesheet.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <kinputdialog.h> using namespace KSVG; diff --git a/ksvg/impl/SVGCircleElementImpl.cc b/ksvg/impl/SVGCircleElementImpl.cc index b6246d1a..7ad3f13a 100644 --- a/ksvg/impl/SVGCircleElementImpl.cc +++ b/ksvg/impl/SVGCircleElementImpl.cc @@ -19,7 +19,7 @@ */ #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "CanvasItem.h" #include "KSVGCanvas.h" diff --git a/ksvg/impl/SVGEllipseElementImpl.cc b/ksvg/impl/SVGEllipseElementImpl.cc index 9908941a..76b050a5 100644 --- a/ksvg/impl/SVGEllipseElementImpl.cc +++ b/ksvg/impl/SVGEllipseElementImpl.cc @@ -19,7 +19,7 @@ */ #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "CanvasItem.h" #include "KSVGCanvas.h" diff --git a/ksvg/impl/SVGLineElementImpl.cc b/ksvg/impl/SVGLineElementImpl.cc index 7e13f46c..2db23950 100644 --- a/ksvg/impl/SVGLineElementImpl.cc +++ b/ksvg/impl/SVGLineElementImpl.cc @@ -19,7 +19,7 @@ */ #include <math.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kdebug.h> diff --git a/ksvg/impl/SVGPathElementImpl.cc b/ksvg/impl/SVGPathElementImpl.cc index 506ad01a..93ddc6ad 100644 --- a/ksvg/impl/SVGPathElementImpl.cc +++ b/ksvg/impl/SVGPathElementImpl.cc @@ -22,7 +22,7 @@ #include <cfloat> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "SVGRectImpl.h" #include "SVGPaintImpl.h" diff --git a/ksvg/impl/SVGPatternElementImpl.cc b/ksvg/impl/SVGPatternElementImpl.cc index 1b088240..37825869 100644 --- a/ksvg/impl/SVGPatternElementImpl.cc +++ b/ksvg/impl/SVGPatternElementImpl.cc @@ -19,7 +19,7 @@ */ #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "SVGPatternElement.h" #include "SVGPatternElementImpl.h" diff --git a/ksvg/impl/SVGRectElementImpl.cc b/ksvg/impl/SVGRectElementImpl.cc index 3dad7cbf..b1e4dfba 100644 --- a/ksvg/impl/SVGRectElementImpl.cc +++ b/ksvg/impl/SVGRectElementImpl.cc @@ -19,7 +19,7 @@ */ #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "SVGRectImpl.h" #include "SVGDocumentImpl.h" diff --git a/ksvg/impl/SVGTestsImpl.cc b/ksvg/impl/SVGTestsImpl.cc index 4ead2a8c..e2154b7b 100644 --- a/ksvg/impl/SVGTestsImpl.cc +++ b/ksvg/impl/SVGTestsImpl.cc @@ -18,8 +18,8 @@ Boston, MA 02110-1301, USA. */ -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include "SVGTestsImpl.h" #include "SVGStringListImpl.h" diff --git a/ksvg/impl/SVGTextContentElementImpl.cc b/ksvg/impl/SVGTextContentElementImpl.cc index 302b54b7..4af6c7d0 100644 --- a/ksvg/impl/SVGTextContentElementImpl.cc +++ b/ksvg/impl/SVGTextContentElementImpl.cc @@ -19,7 +19,7 @@ */ #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "Glyph.h" diff --git a/ksvg/impl/SVGTextPathElementImpl.cc b/ksvg/impl/SVGTextPathElementImpl.cc index 78c272f8..8634155b 100644 --- a/ksvg/impl/SVGTextPathElementImpl.cc +++ b/ksvg/impl/SVGTextPathElementImpl.cc @@ -19,7 +19,7 @@ */ #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "Glyph.h" diff --git a/ksvg/impl/SVGWindowImpl.cc b/ksvg/impl/SVGWindowImpl.cc index 476185f1..c0e459c8 100644 --- a/ksvg/impl/SVGWindowImpl.cc +++ b/ksvg/impl/SVGWindowImpl.cc @@ -29,9 +29,9 @@ #include <tqstylesheet.h> #include <kurl.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kinputdialog.h> -#include <klocale.h> +#include <tdelocale.h> using namespace KSVG; diff --git a/ksvg/plugin/backends/libart/LibartCanvas.cpp b/ksvg/plugin/backends/libart/LibartCanvas.cpp index 55b371dd..03b18f06 100644 --- a/ksvg/plugin/backends/libart/LibartCanvas.cpp +++ b/ksvg/plugin/backends/libart/LibartCanvas.cpp @@ -39,7 +39,7 @@ #include "SVGMaskElementImpl.h" #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kgenericfactory.h> #include "SVGPaint.h" diff --git a/ksvg/plugin/ksvg_factory.cpp b/ksvg/plugin/ksvg_factory.cpp index e981ac34..b856da64 100644 --- a/ksvg/plugin/ksvg_factory.cpp +++ b/ksvg/plugin/ksvg_factory.cpp @@ -20,8 +20,8 @@ #include <tdeaboutdata.h> #include <kinstance.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kstandarddirs.h> #include "ksvg_plugin.h" diff --git a/ksvg/plugin/ksvg_plugin.cpp b/ksvg/plugin/ksvg_plugin.cpp index fbbb3e78..6f79a968 100644 --- a/ksvg/plugin/ksvg_plugin.cpp +++ b/ksvg/plugin/ksvg_plugin.cpp @@ -22,8 +22,8 @@ #include <kdebug.h> #include <tdeaction.h> #include <tdefiledialog.h> -#include <klocale.h> -#include <ktempfile.h> +#include <tdelocale.h> +#include <tdetempfile.h> #include <ksimpleconfig.h> #include <tdeaboutapplication.h> diff --git a/ksvg/test/external/printnodetest.cpp b/ksvg/test/external/printnodetest.cpp index 5310ac68..3597d5bb 100644 --- a/ksvg/test/external/printnodetest.cpp +++ b/ksvg/test/external/printnodetest.cpp @@ -5,7 +5,7 @@ #include <tdeapplication.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaboutdata.h> #include <kdebug.h> diff --git a/ksvg/test/external/svgdisplay.cc b/ksvg/test/external/svgdisplay.cc index ec4b94f1..de1172dc 100644 --- a/ksvg/test/external/svgdisplay.cc +++ b/ksvg/test/external/svgdisplay.cc @@ -1,6 +1,6 @@ #include <tdeapplication.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaboutdata.h> #include "SVGTestWidget.h" diff --git a/kuickshow/src/defaultswidget.cpp b/kuickshow/src/defaultswidget.cpp index 7e94b1b1..4746638e 100644 --- a/kuickshow/src/defaultswidget.cpp +++ b/kuickshow/src/defaultswidget.cpp @@ -24,7 +24,7 @@ #include <kcombobox.h> #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <kstandarddirs.h> diff --git a/kuickshow/src/filefinder.cpp b/kuickshow/src/filefinder.cpp index 7b8a5909..91012ac2 100644 --- a/kuickshow/src/filefinder.cpp +++ b/kuickshow/src/filefinder.cpp @@ -20,7 +20,7 @@ #include <tdeapplication.h> #include <tdeconfig.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdecompletionbox.h> #include <kurlcompletion.h> diff --git a/kuickshow/src/filewidget.cpp b/kuickshow/src/filewidget.cpp index 52a054ba..61c75118 100644 --- a/kuickshow/src/filewidget.cpp +++ b/kuickshow/src/filewidget.cpp @@ -19,9 +19,9 @@ #include <tqkeycode.h> #include <tdeversion.h> -#include <kglobal.h> -#include <kglobalsettings.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdeglobalsettings.h> +#include <tdelocale.h> #include <tdepopupmenu.h> #include <kpropertiesdialog.h> #include <kurlcompletion.h> diff --git a/kuickshow/src/filewidget.h b/kuickshow/src/filewidget.h index cb54c042..87eff314 100644 --- a/kuickshow/src/filewidget.h +++ b/kuickshow/src/filewidget.h @@ -21,7 +21,7 @@ #include <tqevent.h> -#include <kdiroperator.h> +#include <tdediroperator.h> class FileFinder; class KFileItem; diff --git a/kuickshow/src/generalwidget.cpp b/kuickshow/src/generalwidget.cpp index 377e6f57..d51fe7d9 100644 --- a/kuickshow/src/generalwidget.cpp +++ b/kuickshow/src/generalwidget.cpp @@ -27,7 +27,7 @@ #include <kdialog.h> #include <kiconloader.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <kurllabel.h> diff --git a/kuickshow/src/imagewindow.cpp b/kuickshow/src/imagewindow.cpp index 49468533..2c227063 100644 --- a/kuickshow/src/imagewindow.cpp +++ b/kuickshow/src/imagewindow.cpp @@ -47,15 +47,15 @@ #include <tdefiledialog.h> #include <kiconloader.h> #include <kimageeffect.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kprinter.h> #include <kpropertiesdialog.h> #include <tdestdaccel.h> #include <kstdguiitem.h> #include <kstandarddirs.h> -#include <kglobalsettings.h> -#include <ktempfile.h> +#include <tdeglobalsettings.h> +#include <tdetempfile.h> #include <twin.h> #include <netwm.h> #include <kurldrag.h> diff --git a/kuickshow/src/kuickconfigdlg.cpp b/kuickshow/src/kuickconfigdlg.cpp index 908aadb3..baee42b8 100644 --- a/kuickshow/src/kuickconfigdlg.cpp +++ b/kuickshow/src/kuickconfigdlg.cpp @@ -27,8 +27,8 @@ #include <tdeaccel.h> #include <tdeconfig.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include "imagewindow.h" #include "defaultswidget.h" diff --git a/kuickshow/src/kuickdata.cpp b/kuickshow/src/kuickdata.cpp index 84c4ff38..1e6a5912 100644 --- a/kuickshow/src/kuickdata.cpp +++ b/kuickshow/src/kuickdata.cpp @@ -20,7 +20,7 @@ #include <tqcolor.h> #include <tdeconfig.h> -#include <kglobal.h> +#include <tdeglobal.h> #include "kuickdata.h" diff --git a/kuickshow/src/kuickfile.cpp b/kuickshow/src/kuickfile.cpp index 764210f0..0f970f85 100644 --- a/kuickshow/src/kuickfile.cpp +++ b/kuickshow/src/kuickfile.cpp @@ -3,11 +3,11 @@ #include <kdebug.h> #include <tdeversion.h> #include <kinstance.h> -#include <klocale.h> +#include <tdelocale.h> #include <kprogress.h> #include <tdeio/job.h> #include <tdeio/netaccess.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include "filecache.h" #include "kuickfile.h" diff --git a/kuickshow/src/kuickshow.cpp b/kuickshow/src/kuickshow.cpp index 4a3d85a3..7ddac89d 100644 --- a/kuickshow/src/kuickshow.cpp +++ b/kuickshow/src/kuickshow.cpp @@ -38,13 +38,13 @@ #include <tdeversion.h> #include <tdefiledialog.h> #include <tdefilemetainfo.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <khelpmenu.h> #include <kiconloader.h> #include <tdeio/netaccess.h> -#include <klocale.h> -#include <kmenubar.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemenubar.h> +#include <tdemessagebox.h> #include <tdepopupmenu.h> #include <kprotocolinfo.h> #include <kpropertiesdialog.h> @@ -52,7 +52,7 @@ #include <kstatusbar.h> #include <kstdaction.h> #include <kstandarddirs.h> -#include <kstartupinfo.h> +#include <tdestartupinfo.h> #include <tdetoolbar.h> #include <kurlcombobox.h> #include <kurlcompletion.h> diff --git a/kuickshow/src/main.cpp b/kuickshow/src/main.cpp index 14f1bc6b..f2633626 100644 --- a/kuickshow/src/main.cpp +++ b/kuickshow/src/main.cpp @@ -21,7 +21,7 @@ #include <tdeaboutdata.h> #include <tdeapplication.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include "kuickshow.h" diff --git a/kuickshow/src/printing.cpp b/kuickshow/src/printing.cpp index 7d822f96..2f1fd700 100644 --- a/kuickshow/src/printing.cpp +++ b/kuickshow/src/printing.cpp @@ -32,12 +32,12 @@ #include <kcombobox.h> #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <knuminput.h> #include <kprinter.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include "imagewindow.h" #include "printing.h" diff --git a/kuickshow/src/slideshowwidget.cpp b/kuickshow/src/slideshowwidget.cpp index 9727c203..5330daa5 100644 --- a/kuickshow/src/slideshowwidget.cpp +++ b/kuickshow/src/slideshowwidget.cpp @@ -20,7 +20,7 @@ #include <tqlayout.h> #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include "slideshowwidget.h" diff --git a/kview/config/kviewconfmodules.cpp b/kview/config/kviewconfmodules.cpp index 2316c920..23f800a9 100644 --- a/kview/config/kviewconfmodules.cpp +++ b/kview/config/kviewconfmodules.cpp @@ -22,9 +22,9 @@ #include <tqvbuttongroup.h> #include <tqradiobutton.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeconfig.h> #include <kgenericfactory.h> #include <tqwhatsthis.h> diff --git a/kview/config/plugins/kviewpluginsconfig.cpp b/kview/config/plugins/kviewpluginsconfig.cpp index 79b6b76b..49c2775f 100644 --- a/kview/config/plugins/kviewpluginsconfig.cpp +++ b/kview/config/plugins/kviewpluginsconfig.cpp @@ -20,8 +20,8 @@ #include <kpluginselector.h> #include <kgenericfactory.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <ksimpleconfig.h> #include <kplugininfo.h> diff --git a/kview/kview.cpp b/kview/kview.cpp index 2ff3e52c..f91942d1 100644 --- a/kview/kview.cpp +++ b/kview/kview.cpp @@ -24,7 +24,7 @@ #include <ksettings/dispatcher.h> #include <kurl.h> #include <klibloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeparts/componentfactory.h> #include <tdeparts/plugin.h> #include <tdeparts/part.h> @@ -33,9 +33,9 @@ #include <kstdaction.h> #include <kimageio.h> #include <tdefiledialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <twinmodule.h> -#include <kmenubar.h> +#include <tdemenubar.h> #include <kstatusbar.h> #include <kdebug.h> #include <kedittoolbar.h> diff --git a/kview/kviewcanvas/config/confmodules.cpp b/kview/kviewcanvas/config/confmodules.cpp index 04b3cf3a..55efba65 100644 --- a/kview/kviewcanvas/config/confmodules.cpp +++ b/kview/kviewcanvas/config/confmodules.cpp @@ -24,7 +24,7 @@ #include <tqcheckbox.h> #include <tqframe.h> -#include <klocale.h> +#include <tdelocale.h> #include <ksimpleconfig.h> #include <kcolorbutton.h> #include <tdelistview.h> diff --git a/kview/kviewcanvas/config/defaults.h b/kview/kviewcanvas/config/defaults.h index 166b3b02..4d309585 100644 --- a/kview/kviewcanvas/config/defaults.h +++ b/kview/kviewcanvas/config/defaults.h @@ -19,7 +19,7 @@ #ifndef DEFAULTS_H #define DEFAULTS_H -#include <klocale.h> +#include <tdelocale.h> #include <tqsize.h> #include <tqcolor.h> diff --git a/kview/kviewcanvas/test/main.cpp b/kview/kviewcanvas/test/main.cpp index 0f7af338..8fc0b532 100644 --- a/kview/kviewcanvas/test/main.cpp +++ b/kview/kviewcanvas/test/main.cpp @@ -2,7 +2,7 @@ #include <tdeapplication.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> static const char description[] = I18N_NOOP("A TDE KPart Application"); diff --git a/kview/kviewcanvas/test/test.cpp b/kview/kviewcanvas/test/test.cpp index 01ac6e43..de1694f8 100644 --- a/kview/kviewcanvas/test/test.cpp +++ b/kview/kviewcanvas/test/test.cpp @@ -8,7 +8,7 @@ #include <kurl.h> #include <klibloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeparts/componentfactory.h> #include <tqimage.h> diff --git a/kview/kviewviewer/config/kviewviewerpluginsconfig.cpp b/kview/kviewviewer/config/kviewviewerpluginsconfig.cpp index 122190f9..af444cdd 100644 --- a/kview/kviewviewer/config/kviewviewerpluginsconfig.cpp +++ b/kview/kviewviewer/config/kviewviewerpluginsconfig.cpp @@ -20,8 +20,8 @@ #include <kpluginselector.h> #include <kgenericfactory.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <ksimpleconfig.h> #include <kplugininfo.h> diff --git a/kview/kviewviewer/imagesettings.cpp b/kview/kviewviewer/imagesettings.cpp index 0ee58b78..1cb82f58 100644 --- a/kview/kviewviewer/imagesettings.cpp +++ b/kview/kviewviewer/imagesettings.cpp @@ -21,7 +21,7 @@ #include <tqcheckbox.h> #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> ImageSettings::ImageSettings( TQWidget * parent, const char * name ) diff --git a/kview/kviewviewer/kviewkonqextension.cpp b/kview/kviewviewer/kviewkonqextension.cpp index 0fba3ab0..43f1fa5d 100644 --- a/kview/kviewviewer/kviewkonqextension.cpp +++ b/kview/kviewviewer/kviewkonqextension.cpp @@ -29,8 +29,8 @@ #include <kprinter.h> #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> KViewKonqExtension::KViewKonqExtension( KImageViewer::Canvas * canvas, KViewViewer *parent, const char *name ) diff --git a/kview/kviewviewer/kviewviewer.cpp b/kview/kviewviewer/kviewviewer.cpp index 59ef17b7..8bfe4cd2 100644 --- a/kview/kviewviewer/kviewviewer.cpp +++ b/kview/kviewviewer/kviewviewer.cpp @@ -43,8 +43,8 @@ #include <tdeparts/genericfactory.h> #include <tdeparts/componentfactory.h> #include <tdeparts/plugin.h> -#include <kmessagebox.h> -#include <ktempfile.h> +#include <tdemessagebox.h> +#include <tdetempfile.h> #include <tdeapplication.h> #include <kimageio.h> #include <tdestdaccel.h> diff --git a/kview/kviewviewer/test/main.cpp b/kview/kviewviewer/test/main.cpp index 2dc70dcf..1fa9d7bf 100644 --- a/kview/kviewviewer/test/main.cpp +++ b/kview/kviewviewer/test/main.cpp @@ -2,7 +2,7 @@ #include <tdeapplication.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> static const char description[] = I18N_NOOP("KView Viewer Part Test"); diff --git a/kview/kviewviewer/test/test.cpp b/kview/kviewviewer/test/test.cpp index f4a286ec..87b0d1c8 100644 --- a/kview/kviewviewer/test/test.cpp +++ b/kview/kviewviewer/test/test.cpp @@ -7,7 +7,7 @@ #include <kurl.h> #include <klibloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeparts/componentfactory.h> #include <tdeapplication.h> diff --git a/kview/main.cpp b/kview/main.cpp index fa9c0578..3fc3b364 100644 --- a/kview/main.cpp +++ b/kview/main.cpp @@ -21,7 +21,7 @@ #include <tdeapplication.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> static const char description[] = I18N_NOOP( "TDE Image Viewer" ); diff --git a/kview/modules/browser/kviewbrowser.cpp b/kview/modules/browser/kviewbrowser.cpp index 92472029..41fee38b 100644 --- a/kview/modules/browser/kviewbrowser.cpp +++ b/kview/modules/browser/kviewbrowser.cpp @@ -24,7 +24,7 @@ #include <kdirlister.h> #include <tdeaction.h> -#include <klocale.h> +#include <tdelocale.h> #include <kgenericfactory.h> #include <kdebug.h> #include <kimageviewer/viewer.h> diff --git a/kview/modules/effects/kvieweffects.cpp b/kview/modules/effects/kvieweffects.cpp index 82507454..803b81e7 100644 --- a/kview/modules/effects/kvieweffects.cpp +++ b/kview/modules/effects/kvieweffects.cpp @@ -7,7 +7,7 @@ #include <tqobjectlist.h> #include <tdeaction.h> -#include <klocale.h> +#include <tdelocale.h> #include <kgenericfactory.h> #include <kdebug.h> #include <kimageviewer/viewer.h> diff --git a/kview/modules/presenter/config/kviewpresenterconfig.cpp b/kview/modules/presenter/config/kviewpresenterconfig.cpp index c3682d5f..5cda7ee0 100644 --- a/kview/modules/presenter/config/kviewpresenterconfig.cpp +++ b/kview/modules/presenter/config/kviewpresenterconfig.cpp @@ -22,9 +22,9 @@ #include <tqcheckbox.h> #include <tqframe.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeconfig.h> #include <kgenericfactory.h> diff --git a/kview/modules/presenter/imagelistdialog.ui b/kview/modules/presenter/imagelistdialog.ui index b3f8cf48..d00950f4 100644 --- a/kview/modules/presenter/imagelistdialog.ui +++ b/kview/modules/presenter/imagelistdialog.ui @@ -260,7 +260,7 @@ <include location="global" impldecl="in implementation">kurl.h</include> <include location="global" impldecl="in implementation">tdefiledialog.h</include> <include location="global" impldecl="in implementation">tqstring.h</include> - <include location="global" impldecl="in implementation">kmessagebox.h</include> + <include location="global" impldecl="in implementation">tdemessagebox.h</include> <include location="local" impldecl="in implementation">imagelistitem.h</include> <include location="local" impldecl="in implementation">imagelistdialog.ui.h</include> </includes> diff --git a/kview/modules/presenter/kviewpresenter.cpp b/kview/modules/presenter/kviewpresenter.cpp index e2f2ef87..065bccaa 100644 --- a/kview/modules/presenter/kviewpresenter.cpp +++ b/kview/modules/presenter/kviewpresenter.cpp @@ -33,10 +33,10 @@ #include <kpushbutton.h> #include <tdeapplication.h> #include <tdeaction.h> -#include <klocale.h> +#include <tdelocale.h> #include <kgenericfactory.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <knuminput.h> #include <tdefiledialog.h> @@ -44,8 +44,8 @@ #include <kimageviewer/viewer.h> #include <kimageviewer/canvas.h> #include <tdeio/netaccess.h> -#include <kmessagebox.h> -#include <ktempfile.h> +#include <tdemessagebox.h> +#include <tdetempfile.h> #include <kurldrag.h> typedef KGenericFactory<KViewPresenter> KViewPresenterFactory; diff --git a/kview/modules/presenter/kviewpresenterconfmodule.cpp b/kview/modules/presenter/kviewpresenterconfmodule.cpp index df9622b8..3d6de8b4 100644 --- a/kview/modules/presenter/kviewpresenterconfmodule.cpp +++ b/kview/modules/presenter/kviewpresenterconfmodule.cpp @@ -24,9 +24,9 @@ #include <tqcheckbox.h> #include <tqframe.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeconfig.h> KViewPresenterConfModule::KViewPresenterConfModule( TQObject * parent ) diff --git a/kview/modules/scale/kfloatspinbox.cpp b/kview/modules/scale/kfloatspinbox.cpp index c260119e..0dc7fb33 100644 --- a/kview/modules/scale/kfloatspinbox.cpp +++ b/kview/modules/scale/kfloatspinbox.cpp @@ -25,8 +25,8 @@ #endif #include <knumvalidator.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kdebug.h> int pow( int a, int b ) diff --git a/kview/modules/scale/kview_scale.cpp b/kview/modules/scale/kview_scale.cpp index d2f6c9c5..2e6d03c4 100644 --- a/kview/modules/scale/kview_scale.cpp +++ b/kview/modules/scale/kview_scale.cpp @@ -25,7 +25,7 @@ #include <tqvbox.h> #include <tdeaction.h> -#include <klocale.h> +#include <tdelocale.h> #include <kgenericfactory.h> #include <kdebug.h> #include <kimageviewer/viewer.h> diff --git a/kview/modules/scale/scaledlg.cpp b/kview/modules/scale/scaledlg.cpp index ad38815c..308546cd 100644 --- a/kview/modules/scale/scaledlg.cpp +++ b/kview/modules/scale/scaledlg.cpp @@ -30,10 +30,10 @@ #include <kdebug.h> #include <kcombobox.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> #include "kfloatspinbox.h" -#include <kglobal.h> +#include <tdeglobal.h> #define ONEINCHINMM 2.54 diff --git a/kview/modules/scanner/kviewscanner.cpp b/kview/modules/scanner/kviewscanner.cpp index 1c35fa68..ee3ca0dd 100644 --- a/kview/modules/scanner/kviewscanner.cpp +++ b/kview/modules/scanner/kviewscanner.cpp @@ -25,10 +25,10 @@ #include <tdeaction.h> #include <kinstance.h> -#include <klocale.h> +#include <tdelocale.h> #include <kgenericfactory.h> #include <kscan.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdebug.h> #include <kimageviewer/viewer.h> diff --git a/kview/modules/template/kviewtemplate.cpp b/kview/modules/template/kviewtemplate.cpp index f148f7ac..dc386560 100644 --- a/kview/modules/template/kviewtemplate.cpp +++ b/kview/modules/template/kviewtemplate.cpp @@ -7,7 +7,7 @@ #include <tqobjectlist.h> #include <tdeaction.h> -/*#include <klocale.h>*/ +/*#include <tdelocale.h>*/ #include <kgenericfactory.h> #include <kdebug.h> #include <kimageviewer/viewer.h> diff --git a/kviewshell/documentWidget.cpp b/kviewshell/documentWidget.cpp index 509bab71..619135df 100644 --- a/kviewshell/documentWidget.cpp +++ b/kviewshell/documentWidget.cpp @@ -14,9 +14,9 @@ #include <tdeaction.h> #include <tdeapplication.h> #include <kdebug.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqclipboard.h> #include <tqcursor.h> #include <tqimage.h> diff --git a/kviewshell/empty_multipage.cpp b/kviewshell/empty_multipage.cpp index 83ba49d9..26d55611 100644 --- a/kviewshell/empty_multipage.cpp +++ b/kviewshell/empty_multipage.cpp @@ -19,8 +19,8 @@ #include <config.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include "empty_multipage.h" diff --git a/kviewshell/kprintDialogPage_pageoptions.cpp b/kviewshell/kprintDialogPage_pageoptions.cpp index 1086b83f..f3577ab1 100644 --- a/kviewshell/kprintDialogPage_pageoptions.cpp +++ b/kviewshell/kprintDialogPage_pageoptions.cpp @@ -9,7 +9,7 @@ #include <config.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqbuttongroup.h> #include <tqcheckbox.h> #include <tqlayout.h> diff --git a/kviewshell/kviewpart.cpp b/kviewshell/kviewpart.cpp index 1b028c81..cc8f8b2f 100644 --- a/kviewshell/kviewpart.cpp +++ b/kviewshell/kviewpart.cpp @@ -19,12 +19,12 @@ #include <tdefiledialog.h> #include <kfilterbase.h> #include <kfilterdev.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kinstance.h> #include <tdeio/job.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kmimetype.h> #include <tdeparts/componentfactory.h> #include <tdeparts/genericfactory.h> @@ -32,7 +32,7 @@ #include <kprogress.h> #include <kstandarddirs.h> #include <kstdaction.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <ktrader.h> #include <kinputdialog.h> diff --git a/kviewshell/kviewshell.cpp b/kviewshell/kviewshell.cpp index 855019e9..1a29eb71 100644 --- a/kviewshell/kviewshell.cpp +++ b/kviewshell/kviewshell.cpp @@ -18,9 +18,9 @@ #include <tdeaction.h> #include <tdeconfig.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> -#include <kmenubar.h> +#include <tdelocale.h> +#include <tdemessagebox.h> +#include <tdemenubar.h> #include <klibloader.h> #include <kstdaction.h> #include <kedittoolbar.h> diff --git a/kviewshell/main.cpp b/kviewshell/main.cpp index aa6dd7be..b2c1ba47 100644 --- a/kviewshell/main.cpp +++ b/kviewshell/main.cpp @@ -7,7 +7,7 @@ #include <kdebug.h> #include <kmimetype.h> #include <kurl.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaboutdata.h> #include <tqdir.h> diff --git a/kviewshell/martdelist.cpp b/kviewshell/martdelist.cpp index 7adb4a23..acc94311 100644 --- a/kviewshell/martdelist.cpp +++ b/kviewshell/martdelist.cpp @@ -30,8 +30,8 @@ #include <tqtimer.h> #include <tdeapplication.h> -#include <kglobalsettings.h> -#include <klocale.h> +#include <tdeglobalsettings.h> +#include <tdelocale.h> #include <tdepopupmenu.h> #include <kiconloader.h> #include <kdebug.h> diff --git a/kviewshell/pageSize.cpp b/kviewshell/pageSize.cpp index 9e59da04..6a94aeed 100644 --- a/kviewshell/pageSize.cpp +++ b/kviewshell/pageSize.cpp @@ -10,8 +10,8 @@ #include <config.h> #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <math.h> #include <tqstringlist.h> diff --git a/kviewshell/pageSizeDialog.cpp b/kviewshell/pageSizeDialog.cpp index 02cc9c04..aaede928 100644 --- a/kviewshell/pageSizeDialog.cpp +++ b/kviewshell/pageSizeDialog.cpp @@ -11,8 +11,8 @@ #include <tdeapplication.h> #include <kcombobox.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tqlabel.h> #include <tqlayout.h> #include <tqlineedit.h> diff --git a/kviewshell/pageSizeWidget.cpp b/kviewshell/pageSizeWidget.cpp index 9f2503d2..52e52237 100644 --- a/kviewshell/pageSizeWidget.cpp +++ b/kviewshell/pageSizeWidget.cpp @@ -11,7 +11,7 @@ #include <kcombobox.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqlineedit.h> #include <tqvalidator.h> diff --git a/kviewshell/plugins/djvu/djvumultipage.cpp b/kviewshell/plugins/djvu/djvumultipage.cpp index ad044d20..ae1ab9f6 100644 --- a/kviewshell/plugins/djvu/djvumultipage.cpp +++ b/kviewshell/plugins/djvu/djvumultipage.cpp @@ -26,7 +26,7 @@ #include <tdefiledialog.h> #include <tdeparts/genericfactory.h> #include <kprinter.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include "kvsprefs.h" #include <tqapplication.h> #include <tqpaintdevicemetrics.h> @@ -41,7 +41,7 @@ #include "pageRangeWidget.h" #include "prefs.h" -#include "kmessagebox.h" +#include "tdemessagebox.h" typedef KParts::GenericFactory<DjVuMultiPage> DjVuMultiPageFactory; K_EXPORT_COMPONENT_FACTORY(djvuviewpart, DjVuMultiPageFactory) diff --git a/kviewshell/plugins/djvu/djvurenderer.cpp b/kviewshell/plugins/djvu/djvurenderer.cpp index ae0b0454..c9e52c1e 100644 --- a/kviewshell/plugins/djvu/djvurenderer.cpp +++ b/kviewshell/plugins/djvu/djvurenderer.cpp @@ -21,9 +21,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqfileinfo.h> #include <tqimage.h> #include <tqpainter.h> diff --git a/kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions.cpp b/kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions.cpp index 24b7dfbb..325effeb 100644 --- a/kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions.cpp +++ b/kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions.cpp @@ -18,7 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include <klocale.h> +#include <tdelocale.h> #include <tqlayout.h> #include <tqcheckbox.h> #include <tqcombobox.h> diff --git a/kviewshell/plugins/djvu/kprintDialogPage_DJVUpageoptions.cpp b/kviewshell/plugins/djvu/kprintDialogPage_DJVUpageoptions.cpp index cb932048..c192b7ff 100644 --- a/kviewshell/plugins/djvu/kprintDialogPage_DJVUpageoptions.cpp +++ b/kviewshell/plugins/djvu/kprintDialogPage_DJVUpageoptions.cpp @@ -18,7 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include <klocale.h> +#include <tdelocale.h> #include <tqbuttongroup.h> #include <tqcheckbox.h> #include <tqlayout.h> diff --git a/kviewshell/searchWidget.cpp b/kviewshell/searchWidget.cpp index b6a4d95d..4387b070 100644 --- a/kviewshell/searchWidget.cpp +++ b/kviewshell/searchWidget.cpp @@ -29,8 +29,8 @@ #include <kdebug.h> #include <kiconloader.h> -#include <kglobalsettings.h> -#include <klocale.h> +#include <tdeglobalsettings.h> +#include <tdelocale.h> #include <klineedit.h> diff --git a/kviewshell/tableOfContents.cpp b/kviewshell/tableOfContents.cpp index e2ae9a02..82862d14 100644 --- a/kviewshell/tableOfContents.cpp +++ b/kviewshell/tableOfContents.cpp @@ -20,7 +20,7 @@ #include <config.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include "tableOfContents.h" diff --git a/kviewshell/tdemultipage.cpp b/kviewshell/tdemultipage.cpp index 07e433d4..063b8f2d 100644 --- a/kviewshell/tdemultipage.cpp +++ b/kviewshell/tdemultipage.cpp @@ -6,8 +6,8 @@ #include <tdefiledialog.h> #include <kiconloader.h> #include <tdeio/job.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kprinter.h> #include <kstdaction.h> #include <tqobject.h> diff --git a/kviewshell/units.cpp b/kviewshell/units.cpp index 99dc2da9..bfc8b3b6 100644 --- a/kviewshell/units.cpp +++ b/kviewshell/units.cpp @@ -10,8 +10,8 @@ #include <config.h> #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <math.h> #include <tqstringlist.h> diff --git a/kviewshell/zoom.cpp b/kviewshell/zoom.cpp index 1c3ee6f6..0268f80f 100644 --- a/kviewshell/zoom.cpp +++ b/kviewshell/zoom.cpp @@ -12,7 +12,7 @@ #include <math.h> #include <tqstringlist.h> -#include <klocale.h> +#include <tdelocale.h> #include "zoom.h" #include "zoomlimits.h" diff --git a/libkscan/devselector.cpp b/libkscan/devselector.cpp index 61094f1b..542b975b 100644 --- a/libkscan/devselector.cpp +++ b/libkscan/devselector.cpp @@ -33,9 +33,9 @@ #include <tdeapplication.h> #include <tdeconfig.h> #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdeglobal.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <ksimpleconfig.h> #include "devselector.h" diff --git a/libkscan/gammadialog.cpp b/libkscan/gammadialog.cpp index 548a545e..2c6c601a 100644 --- a/libkscan/gammadialog.cpp +++ b/libkscan/gammadialog.cpp @@ -24,7 +24,7 @@ #include <tqcombobox.h> #include <kscanslider.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include "gammadialog.h" diff --git a/libkscan/img_canvas.cpp b/libkscan/img_canvas.cpp index 5bc13aeb..d673b284 100644 --- a/libkscan/img_canvas.cpp +++ b/libkscan/img_canvas.cpp @@ -28,7 +28,7 @@ #include <tqimage.h> #include <tqpainter.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdestyle.h> #include <tdeapplication.h> diff --git a/libkscan/imgscaledialog.cpp b/libkscan/imgscaledialog.cpp index b0250ef8..d7841339 100644 --- a/libkscan/imgscaledialog.cpp +++ b/libkscan/imgscaledialog.cpp @@ -17,7 +17,7 @@ Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tqbuttongroup.h> #include <tqradiobutton.h> diff --git a/libkscan/imgscaninfo.cpp b/libkscan/imgscaninfo.cpp index eee481c6..02876292 100644 --- a/libkscan/imgscaninfo.cpp +++ b/libkscan/imgscaninfo.cpp @@ -19,7 +19,7 @@ #include "imgscaninfo.h" -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> diff --git a/libkscan/kscandevice.cpp b/libkscan/kscandevice.cpp index 41e05570..653ef998 100644 --- a/libkscan/kscandevice.cpp +++ b/libkscan/kscandevice.cpp @@ -32,8 +32,8 @@ #include <tqfileinfo.h> #include <tqapplication.h> #include <kdebug.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <tdeconfig.h> #include <kstandarddirs.h> diff --git a/libkscan/kscanslider.cpp b/libkscan/kscanslider.cpp index 5ad7ce91..001c5978 100644 --- a/libkscan/kscanslider.cpp +++ b/libkscan/kscanslider.cpp @@ -27,7 +27,7 @@ #include <tqlineedit.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include "kscanslider.h" diff --git a/libkscan/massscandialog.cpp b/libkscan/massscandialog.cpp index 9d4a5f91..fb686bab 100644 --- a/libkscan/massscandialog.cpp +++ b/libkscan/massscandialog.cpp @@ -23,7 +23,7 @@ #include <tqgroupbox.h> #include <tqframe.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kpushbutton.h> #include <kstdguiitem.h> diff --git a/libkscan/previewer.cpp b/libkscan/previewer.cpp index a8d3f6be..2925d50f 100644 --- a/libkscan/previewer.cpp +++ b/libkscan/previewer.cpp @@ -31,7 +31,7 @@ #include <tqlayout.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kcombobox.h> #include <tdeaction.h> #include <kstandarddirs.h> @@ -46,7 +46,7 @@ #include <tdeconfig.h> #include <tqbuttongroup.h> #include <tqvbuttongroup.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tqvaluevector.h> #define ID_CUSTOM 0 diff --git a/libkscan/scandialog.cpp b/libkscan/scandialog.cpp index 9a0d2bf0..bd38caa1 100644 --- a/libkscan/scandialog.cpp +++ b/libkscan/scandialog.cpp @@ -27,13 +27,13 @@ #include <tqapplication.h> #include <tqcheckbox.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kdebug.h> #include <tdeconfig.h> #include <ksimpleconfig.h> #include <kled.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kscandevice.h> // libkscan stuff diff --git a/libkscan/scanparams.cpp b/libkscan/scanparams.cpp index 64bcde21..e8e7ad95 100644 --- a/libkscan/scanparams.cpp +++ b/libkscan/scanparams.cpp @@ -37,7 +37,7 @@ #include <tdefiledialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kbuttonbox.h> #include <kiconloader.h> diff --git a/libkscan/scansourcedialog.cpp b/libkscan/scansourcedialog.cpp index fcb3fc25..e0e7a0d4 100644 --- a/libkscan/scansourcedialog.cpp +++ b/libkscan/scansourcedialog.cpp @@ -20,7 +20,7 @@ #include "scansourcedialog.h" #include "kscanslider.h" -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tqlabel.h> diff --git a/libkscan/sizeindicator.cpp b/libkscan/sizeindicator.cpp index bd259bd3..bd97285a 100644 --- a/libkscan/sizeindicator.cpp +++ b/libkscan/sizeindicator.cpp @@ -23,7 +23,7 @@ #include <tqimage.h> #include <kimageeffect.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tqpainter.h> diff --git a/tdefile-plugins/bmp/tdefile_bmp.cpp b/tdefile-plugins/bmp/tdefile_bmp.cpp index 354ea54e..5349edb0 100644 --- a/tdefile-plugins/bmp/tdefile_bmp.cpp +++ b/tdefile-plugins/bmp/tdefile_bmp.cpp @@ -21,7 +21,7 @@ #include "tdefile_bmp.h" #include <kprocess.h> -#include <klocale.h> +#include <tdelocale.h> #include <kgenericfactory.h> #include <kstringvalidator.h> #include <kdebug.h> diff --git a/tdefile-plugins/dds/tdefile_dds.cpp b/tdefile-plugins/dds/tdefile_dds.cpp index e49bf498..71f19c4f 100644 --- a/tdefile-plugins/dds/tdefile_dds.cpp +++ b/tdefile-plugins/dds/tdefile_dds.cpp @@ -21,7 +21,7 @@ #include "tdefile_dds.h" #include <kprocess.h> -#include <klocale.h> +#include <tdelocale.h> #include <kgenericfactory.h> #include <kstringvalidator.h> #include <kdebug.h> diff --git a/tdefile-plugins/dvi/tdefile_dvi.cpp b/tdefile-plugins/dvi/tdefile_dvi.cpp index 374e5e54..1f981a2e 100644 --- a/tdefile-plugins/dvi/tdefile_dvi.cpp +++ b/tdefile-plugins/dvi/tdefile_dvi.cpp @@ -24,7 +24,7 @@ #include <kgenericfactory.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdefilemetainfo.h> #include <tqstring.h> diff --git a/tdefile-plugins/exr/tdefile_exr.cpp b/tdefile-plugins/exr/tdefile_exr.cpp index d8007e3d..a2613bff 100644 --- a/tdefile-plugins/exr/tdefile_exr.cpp +++ b/tdefile-plugins/exr/tdefile_exr.cpp @@ -41,7 +41,7 @@ #include <kurl.h> #include <kprocess.h> -#include <klocale.h> +#include <tdelocale.h> #include <kgenericfactory.h> #include <kdebug.h> diff --git a/tdefile-plugins/gif/tdefile_gif.cpp b/tdefile-plugins/gif/tdefile_gif.cpp index 9cc522dc..112b780a 100644 --- a/tdefile-plugins/gif/tdefile_gif.cpp +++ b/tdefile-plugins/gif/tdefile_gif.cpp @@ -27,7 +27,7 @@ #include <kurl.h> #include <kprocess.h> -#include <klocale.h> +#include <tdelocale.h> #include <kgenericfactory.h> #include <kdebug.h> diff --git a/tdefile-plugins/ico/tdefile_ico.cpp b/tdefile-plugins/ico/tdefile_ico.cpp index 273a5e18..057fe0a8 100644 --- a/tdefile-plugins/ico/tdefile_ico.cpp +++ b/tdefile-plugins/ico/tdefile_ico.cpp @@ -21,7 +21,7 @@ #include "tdefile_ico.h" #include <kprocess.h> -#include <klocale.h> +#include <tdelocale.h> #include <kgenericfactory.h> #include <kstringvalidator.h> #include <kdebug.h> diff --git a/tdefile-plugins/jpeg/exif.cpp b/tdefile-plugins/jpeg/exif.cpp index 60c689bd..d50ecaf6 100644 --- a/tdefile-plugins/jpeg/exif.cpp +++ b/tdefile-plugins/jpeg/exif.cpp @@ -10,7 +10,7 @@ #include "exif.h" #include <tqwmatrix.h> -#include <kglobal.h> +#include <tdeglobal.h> static unsigned char * LastExifRefd; diff --git a/tdefile-plugins/jpeg/tdefile_jpeg.cpp b/tdefile-plugins/jpeg/tdefile_jpeg.cpp index c902b99b..2c0894c2 100644 --- a/tdefile-plugins/jpeg/tdefile_jpeg.cpp +++ b/tdefile-plugins/jpeg/tdefile_jpeg.cpp @@ -25,7 +25,7 @@ #include <kurl.h> #include <kprocess.h> -#include <klocale.h> +#include <tdelocale.h> #include <kgenericfactory.h> #include <kdebug.h> diff --git a/tdefile-plugins/png/tdefile_png.cpp b/tdefile-plugins/png/tdefile_png.cpp index 9766fbc6..8a558aa6 100644 --- a/tdefile-plugins/png/tdefile_png.cpp +++ b/tdefile-plugins/png/tdefile_png.cpp @@ -23,7 +23,7 @@ #include <kurl.h> #include <kprocess.h> -#include <klocale.h> +#include <tdelocale.h> #include <kgenericfactory.h> #include <kdebug.h> diff --git a/tdefile-plugins/ps/tdefile_ps.cpp b/tdefile-plugins/ps/tdefile_ps.cpp index 87161176..87b653d3 100644 --- a/tdefile-plugins/ps/tdefile_ps.cpp +++ b/tdefile-plugins/ps/tdefile_ps.cpp @@ -22,7 +22,7 @@ #include <tqfile.h> -#include <klocale.h> +#include <tdelocale.h> #include <kgenericfactory.h> #include <kdebug.h> diff --git a/tdefile-plugins/raw/kcamerarawplugin.cpp b/tdefile-plugins/raw/kcamerarawplugin.cpp index a7a0cb27..6ac4759c 100644 --- a/tdefile-plugins/raw/kcamerarawplugin.cpp +++ b/tdefile-plugins/raw/kcamerarawplugin.cpp @@ -23,10 +23,10 @@ #include <config.h> #endif -#include <klocale.h> +#include <tdelocale.h> #include <kgenericfactory.h> #include <kdebug.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kimageio.h> #include <tqfile.h> #include <tqimage.h> diff --git a/tdefile-plugins/tga/tdefile_tga.cpp b/tdefile-plugins/tga/tdefile_tga.cpp index 36fad13c..5263af48 100644 --- a/tdefile-plugins/tga/tdefile_tga.cpp +++ b/tdefile-plugins/tga/tdefile_tga.cpp @@ -21,7 +21,7 @@ #include "tdefile_tga.h" #include <kprocess.h> -#include <klocale.h> +#include <tdelocale.h> #include <kgenericfactory.h> #include <kstringvalidator.h> #include <kdebug.h> diff --git a/tdefile-plugins/xbm/tdefile_xbm.cpp b/tdefile-plugins/xbm/tdefile_xbm.cpp index d4871d6f..1e9937a3 100644 --- a/tdefile-plugins/xbm/tdefile_xbm.cpp +++ b/tdefile-plugins/xbm/tdefile_xbm.cpp @@ -21,7 +21,7 @@ #include "tdefile_xbm.h" #include <kprocess.h> -#include <klocale.h> +#include <tdelocale.h> #include <kgenericfactory.h> #include <kstringvalidator.h> #include <kdebug.h> |