diff options
Diffstat (limited to 'src')
42 files changed, 49 insertions, 49 deletions
diff --git a/src/common/common/number.cpp b/src/common/common/number.cpp index 39a9c73..0766ba5 100644 --- a/src/common/common/number.cpp +++ b/src/common/common/number.cpp @@ -11,7 +11,7 @@ #include "common/global/global.h" #include "misc.h" #if !defined(NO_KDE) -# include <kglobal.h> +# include <tdeglobal.h> #endif //----------------------------------------------------------------------------- diff --git a/src/common/global/global.h b/src/common/global/global.h index 8dee015..10dfb0c 100644 --- a/src/common/global/global.h +++ b/src/common/global/global.h @@ -25,16 +25,16 @@ #if defined(NO_KDE) # include "tqt_config.h" # include "common/nokde/nokde_kurl.h" -# include "common/nokde/nokde_klocale.h" +# include "common/nokde/nokde_tdelocale.h" # include "common/nokde/nokde_tdeaboutdata.h" # include "common/nokde/nokde_tdecmdlineargs.h" #else # include "config.h" # include <tdeapplication.h> -# include <klocale.h> +# include <tdelocale.h> # include <tdeaboutdata.h> # include <tdecmdlineargs.h> -# include <ktempfile.h> +# include <tdetempfile.h> # include <tdeconfigbackend.h> #endif diff --git a/src/common/global/xml_data_file.cpp b/src/common/global/xml_data_file.cpp index bae7f17..5fa4bff 100644 --- a/src/common/global/xml_data_file.cpp +++ b/src/common/global/xml_data_file.cpp @@ -11,7 +11,7 @@ #include <tqfile.h> #include <tqstringlist.h> #include <ksimpleconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include "common/global/pfile.h" XmlDataFile::XmlDataFile(const PURL::Url &url, const TQString &name) diff --git a/src/common/gui/editlistbox.cpp b/src/common/gui/editlistbox.cpp index 126f996..3dcfe70 100644 --- a/src/common/gui/editlistbox.cpp +++ b/src/common/gui/editlistbox.cpp @@ -24,7 +24,7 @@ #include <tqheader.h> #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <knotifyclient.h> #include <kiconloader.h> diff --git a/src/common/gui/misc_gui.cpp b/src/common/gui/misc_gui.cpp index 9808492..5c7edf0 100644 --- a/src/common/gui/misc_gui.cpp +++ b/src/common/gui/misc_gui.cpp @@ -21,7 +21,7 @@ #include <kcursor.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeaction.h> #include <ktabbar.h> diff --git a/src/common/gui/misc_gui.h b/src/common/gui/misc_gui.h index 8befca1..5df7382 100644 --- a/src/common/gui/misc_gui.h +++ b/src/common/gui/misc_gui.h @@ -16,7 +16,7 @@ #include <tqcombobox.h> #include <tqwidgetstack.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpushbutton.h> #include <ktabwidget.h> #include <ktabbar.h> diff --git a/src/common/gui/pfile_ext.cpp b/src/common/gui/pfile_ext.cpp index b210643..1ace10f 100644 --- a/src/common/gui/pfile_ext.cpp +++ b/src/common/gui/pfile_ext.cpp @@ -10,7 +10,7 @@ #include <tqfile.h> #include <tdeio/netaccess.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include "common/gui/misc_gui.h" //----------------------------------------------------------------------------- diff --git a/src/common/gui/purl_ext.cpp b/src/common/gui/purl_ext.cpp index 82348b5..11d7ecb 100644 --- a/src/common/gui/purl_ext.cpp +++ b/src/common/gui/purl_ext.cpp @@ -12,7 +12,7 @@ #include <tqapplication.h> #include <tdeio/netaccess.h> #include <tdefileitem.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tdeconfigbackend.h> #include "common/global/pfile.h" diff --git a/src/common/gui/purl_gui.h b/src/common/gui/purl_gui.h index c487d86..d7dd012 100644 --- a/src/common/gui/purl_gui.h +++ b/src/common/gui/purl_gui.h @@ -11,7 +11,7 @@ #include <tqvgroupbox.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurllabel.h> #include "common/global/purl.h" diff --git a/src/common/nokde/nokde.pro b/src/common/nokde/nokde.pro index ab37fbd..14dac2f 100644 --- a/src/common/nokde/nokde.pro +++ b/src/common/nokde/nokde.pro @@ -2,7 +2,7 @@ STOPDIR = ../../.. include($${STOPDIR}/lib.pro) TARGET = nokde -HEADERS += nokde_klocale.h nokde_tdeaboutdata.h nokde_tdecmdlineargs.h nokde_kprocess.h -SOURCES += nokde_klocale.cpp nokde_tdeaboutdata.cpp nokde_tdecmdlineargs.cpp nokde_kprocess.cpp +HEADERS += nokde_tdelocale.h nokde_tdeaboutdata.h nokde_tdecmdlineargs.h nokde_kprocess.h +SOURCES += nokde_tdelocale.cpp nokde_tdeaboutdata.cpp nokde_tdecmdlineargs.cpp nokde_kprocess.cpp win32:HEADERS += win32_utils.h win32:SOURCES += win32_utils.c
\ No newline at end of file diff --git a/src/common/nokde/nokde_klocale.cpp b/src/common/nokde/nokde_klocale.cpp index aa6cb26..327851b 100644 --- a/src/common/nokde/nokde_klocale.cpp +++ b/src/common/nokde/nokde_klocale.cpp @@ -1,4 +1,4 @@ -#include "nokde_klocale.h" +#include "nokde_tdelocale.h" TQString i18n(const TQString &, const TQString &text) { return text; } TQString locate(const TQString &, const TQString &) { return TQString(); } diff --git a/src/common/nokde/nokde_tdeaboutdata.h b/src/common/nokde/nokde_tdeaboutdata.h index 93a7768..7c49444 100644 --- a/src/common/nokde/nokde_tdeaboutdata.h +++ b/src/common/nokde/nokde_tdeaboutdata.h @@ -32,7 +32,7 @@ #include <tqstring.h> //#include <tqimage.h> -#include "nokde_klocale.h" +#include "nokde_tdelocale.h" #ifndef _KABOUTDATA_H_ #define _KABOUTDATA_H_ diff --git a/src/common/nokde/nokde_tdecmdlineargs.cpp b/src/common/nokde/nokde_tdecmdlineargs.cpp index 4480077..613a118 100644 --- a/src/common/nokde/nokde_tdecmdlineargs.cpp +++ b/src/common/nokde/nokde_tdecmdlineargs.cpp @@ -54,9 +54,9 @@ #include "nokde_tdecmdlineargs.h" #include "nokde_tdeaboutdata.h" -#include "nokde_klocale.h" +#include "nokde_tdelocale.h" //#include <tdeapplication.h> -//#include <kglobal.h> +//#include <tdeglobal.h> //#include <kstringhandler.h> //#include <kstaticdeleter.h> diff --git a/src/common/nokde/nokde_tdecmdlineargs.h b/src/common/nokde/nokde_tdecmdlineargs.h index 58931a6..fde841d 100644 --- a/src/common/nokde/nokde_tdecmdlineargs.h +++ b/src/common/nokde/nokde_tdecmdlineargs.h @@ -21,7 +21,7 @@ #ifndef _KCMDLINEARGS_H_ #define _KCMDLINEARGS_H_ -#include "nokde_klocale.h" +#include "nokde_tdelocale.h" #include "nokde_kurl.h" # if [[[TQT_VERSION IS DEPRECATED]]]<0x040000 diff --git a/src/devices/base/device_group.cpp b/src/devices/base/device_group.cpp index 8cace79..0509647 100644 --- a/src/devices/base/device_group.cpp +++ b/src/devices/base/device_group.cpp @@ -10,7 +10,7 @@ #if !defined(NO_KDE) # include <tqpainter.h> -# include <kglobal.h> +# include <tdeglobal.h> TQColor Device::statusColor(Status status) { diff --git a/src/devices/gui/memory_editor.cpp b/src/devices/gui/memory_editor.cpp index 79e30b6..c33891a 100644 --- a/src/devices/gui/memory_editor.cpp +++ b/src/devices/gui/memory_editor.cpp @@ -15,7 +15,7 @@ #include <tqgrid.h> #include <tqtimer.h> #include <tqpopupmenu.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpushbutton.h> #include <tdeaction.h> diff --git a/src/devices/mem24/gui/mem24_hex_view.cpp b/src/devices/mem24/gui/mem24_hex_view.cpp index 349e2fc..4c30905 100644 --- a/src/devices/mem24/gui/mem24_hex_view.cpp +++ b/src/devices/mem24/gui/mem24_hex_view.cpp @@ -10,7 +10,7 @@ #include <tqlayout.h> #include <tqlabel.h> -#include <klocale.h> +#include <tdelocale.h> #include "mem24_memory_editor.h" diff --git a/src/devices/mem24/gui/mem24_memory_editor.cpp b/src/devices/mem24/gui/mem24_memory_editor.cpp index c395b17..7ebd194 100644 --- a/src/devices/mem24/gui/mem24_memory_editor.cpp +++ b/src/devices/mem24/gui/mem24_memory_editor.cpp @@ -9,7 +9,7 @@ #include "mem24_memory_editor.h" #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpushbutton.h> #include "common/gui/misc_gui.h" diff --git a/src/devices/pic/gui/pic_config_word_editor.cpp b/src/devices/pic/gui/pic_config_word_editor.cpp index 0931076..b40adf5 100644 --- a/src/devices/pic/gui/pic_config_word_editor.cpp +++ b/src/devices/pic/gui/pic_config_word_editor.cpp @@ -12,7 +12,7 @@ #include <tqlabel.h> #include <tqlayout.h> #include <tqcombobox.h> -#include <klocale.h> +#include <tdelocale.h> #include "common/common/misc.h" #include "common/gui/misc_gui.h" diff --git a/src/devices/pic/gui/pic_hex_view.cpp b/src/devices/pic/gui/pic_hex_view.cpp index bbcc161..89d1a2f 100644 --- a/src/devices/pic/gui/pic_hex_view.cpp +++ b/src/devices/pic/gui/pic_hex_view.cpp @@ -12,7 +12,7 @@ #include <tqlayout.h> #include <tqlabel.h> -#include <klocale.h> +#include <tdelocale.h> #include "pic_memory_editor.h" #include "pic_config_editor.h" diff --git a/src/devices/pic/gui/pic_memory_editor.cpp b/src/devices/pic/gui/pic_memory_editor.cpp index e1fb50b..2f5b0b7 100644 --- a/src/devices/pic/gui/pic_memory_editor.cpp +++ b/src/devices/pic/gui/pic_memory_editor.cpp @@ -21,7 +21,7 @@ #include <tqlayout.h> #include <tqpixmap.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpushbutton.h> #include <tdeaction.h> diff --git a/src/devices/pic/gui/pic_register_view.cpp b/src/devices/pic/gui/pic_register_view.cpp index d5467fd..8848d85 100644 --- a/src/devices/pic/gui/pic_register_view.cpp +++ b/src/devices/pic/gui/pic_register_view.cpp @@ -15,7 +15,7 @@ #include <tqcombobox.h> #include <tqpopupmenu.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include "libgui/main_global.h" diff --git a/src/libgui/breakpoint_view.cpp b/src/libgui/breakpoint_view.cpp index 0a1f081..5375cf4 100644 --- a/src/libgui/breakpoint_view.cpp +++ b/src/libgui/breakpoint_view.cpp @@ -9,7 +9,7 @@ #include "breakpoint_view.h" #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqpopupmenu.h> #include "main_global.h" diff --git a/src/libgui/config_center.cpp b/src/libgui/config_center.cpp index bf7afc0..6806a7b 100644 --- a/src/libgui/config_center.cpp +++ b/src/libgui/config_center.cpp @@ -16,7 +16,7 @@ #include <tqtabwidget.h> #include <tqtimer.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdelistview.h> #include "global_config.h" diff --git a/src/libgui/config_gen.cpp b/src/libgui/config_gen.cpp index 01dc06b..d58be6e 100644 --- a/src/libgui/config_gen.cpp +++ b/src/libgui/config_gen.cpp @@ -10,7 +10,7 @@ #include <tqlayout.h> #include <tqlabel.h> -#include <klocale.h> +#include <tdelocale.h> #include "device_gui.h" #include "devices/base/generic_memory.h" diff --git a/src/libgui/console.cpp b/src/libgui/console.cpp index aab7b88..693b831 100644 --- a/src/libgui/console.cpp +++ b/src/libgui/console.cpp @@ -12,7 +12,7 @@ #include <tqlabel.h> #include <tqdir.h> #include <klibloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeparts/part.h> #include <kde_terminal_interface.h> diff --git a/src/libgui/device_gui.cpp b/src/libgui/device_gui.cpp index a5e1a1a..2066b06 100644 --- a/src/libgui/device_gui.cpp +++ b/src/libgui/device_gui.cpp @@ -17,7 +17,7 @@ #include <kiconloader.h> #include <kpushbutton.h> #include <tdelistview.h> -#include <klocale.h> +#include <tdelocale.h> #include "devices/list/device_list.h" #include "devices/base/device_group.h" diff --git a/src/libgui/editor.cpp b/src/libgui/editor.cpp index e5cea2e..1577a97 100644 --- a/src/libgui/editor.cpp +++ b/src/libgui/editor.cpp @@ -8,7 +8,7 @@ ***************************************************************************/ #include "editor.h" -#include <klocale.h> +#include <tdelocale.h> #include "common/gui/purl_gui.h" #include "common/gui/misc_gui.h" diff --git a/src/libgui/editor_manager.cpp b/src/libgui/editor_manager.cpp index be56c63..53e47bf 100644 --- a/src/libgui/editor_manager.cpp +++ b/src/libgui/editor_manager.cpp @@ -13,7 +13,7 @@ #include <tqdragobject.h> #include <tqpainter.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <tdepopupmenu.h> #include <tdeaction.h> diff --git a/src/libgui/global_config.cpp b/src/libgui/global_config.cpp index 20d1ad3..d85eadd 100644 --- a/src/libgui/global_config.cpp +++ b/src/libgui/global_config.cpp @@ -11,7 +11,7 @@ #include <tdeapplication.h> #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include "progs/list/prog_list.h" #include "tools/list/tool_list.h" diff --git a/src/libgui/hex_editor.cpp b/src/libgui/hex_editor.cpp index 395ede5..bae5c99 100644 --- a/src/libgui/hex_editor.cpp +++ b/src/libgui/hex_editor.cpp @@ -18,8 +18,8 @@ #include <tqlabel.h> #include <tqtimer.h> -#include <klocale.h> -#include <ktempfile.h> +#include <tdelocale.h> +#include <tdetempfile.h> #include "devices/base/device_group.h" #include "devices/gui/device_group_ui.h" diff --git a/src/libgui/likeback.cpp b/src/libgui/likeback.cpp index cdc3eef..fa505f2 100644 --- a/src/libgui/likeback.cpp +++ b/src/libgui/likeback.cpp @@ -23,9 +23,9 @@ #include <tdeconfig.h> #include <kiconloader.h> #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tqlayout.h> #include <tqtoolbutton.h> #include <tqpushbutton.h> diff --git a/src/libgui/new_dialogs.cpp b/src/libgui/new_dialogs.cpp index 4f4cfe3..a60be74 100644 --- a/src/libgui/new_dialogs.cpp +++ b/src/libgui/new_dialogs.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "new_dialogs.h" -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kpushbutton.h> diff --git a/src/libgui/object_view.cpp b/src/libgui/object_view.cpp index 1854b8a..0ad894d 100644 --- a/src/libgui/object_view.cpp +++ b/src/libgui/object_view.cpp @@ -8,7 +8,7 @@ ***************************************************************************/ #include "object_view.h" -#include <klocale.h> +#include <tdelocale.h> #include "devices/base/device_group.h" #include "devices/pic/pic/pic_memory.h" diff --git a/src/libgui/project_editor.cpp b/src/libgui/project_editor.cpp index 331bb55..3e22399 100644 --- a/src/libgui/project_editor.cpp +++ b/src/libgui/project_editor.cpp @@ -11,7 +11,7 @@ #include <tqlabel.h> #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> #include "project.h" #include "tools/list/compile_config.h" diff --git a/src/libgui/project_manager.cpp b/src/libgui/project_manager.cpp index 58c33e6..1553697 100644 --- a/src/libgui/project_manager.cpp +++ b/src/libgui/project_manager.cpp @@ -15,7 +15,7 @@ #include <tqtimer.h> #include <tqheader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <tdeaction.h> #include <tdeapplication.h> diff --git a/src/libgui/register_view.cpp b/src/libgui/register_view.cpp index 4f2aaff..40462a3 100644 --- a/src/libgui/register_view.cpp +++ b/src/libgui/register_view.cpp @@ -12,7 +12,7 @@ #include <tqlabel.h> #include <tqpushbutton.h> #include <tqcheckbox.h> -#include <klocale.h> +#include <tdelocale.h> #include "devices/base/device_group.h" #include "devices/gui/device_group_ui.h" diff --git a/src/libgui/text_editor.cpp b/src/libgui/text_editor.cpp index 68857cd..f064ec4 100644 --- a/src/libgui/text_editor.cpp +++ b/src/libgui/text_editor.cpp @@ -17,7 +17,7 @@ #include <tdepopupmenu.h> #include <kiconloader.h> #include <tdefiledialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <tdetexteditor/markinterface.h> diff --git a/src/libgui/toplevel.cpp b/src/libgui/toplevel.cpp index b241ce4..a4dc4dc 100644 --- a/src/libgui/toplevel.cpp +++ b/src/libgui/toplevel.cpp @@ -21,7 +21,7 @@ #include <tqtooltip.h> #include <kstatusbar.h> -#include <klocale.h> +#include <tdelocale.h> #include <kedittoolbar.h> #include <tdeapplication.h> #include <tdeconfig.h> @@ -31,7 +31,7 @@ #include <kiconloader.h> #include <tdepopupmenu.h> #include <khelpmenu.h> -#include <kmenubar.h> +#include <tdemenubar.h> #include "gui_debug_manager.h" #include "hex_editor.h" diff --git a/src/progs/gui/prog_group_ui.cpp b/src/progs/gui/prog_group_ui.cpp index e22a4b0..ebec9ce 100644 --- a/src/progs/gui/prog_group_ui.cpp +++ b/src/progs/gui/prog_group_ui.cpp @@ -8,7 +8,7 @@ ***************************************************************************/ #include "prog_group_ui.h" -#include <klocale.h> +#include <tdelocale.h> #include <tdeaction.h> #include <kiconloader.h> diff --git a/src/tools/gui/tool_config_widget.cpp b/src/tools/gui/tool_config_widget.cpp index ea2fd80..b964431 100644 --- a/src/tools/gui/tool_config_widget.cpp +++ b/src/tools/gui/tool_config_widget.cpp @@ -12,7 +12,7 @@ #include <tqtooltip.h> #include <tqwidgetstack.h> #include <tqvgroupbox.h> -#include <klocale.h> +#include <tdelocale.h> #include "devices/base/hex_buffer.h" #include "tools/list/compile_config.h" diff --git a/src/tools/gui/toolchain_config_widget.h b/src/tools/gui/toolchain_config_widget.h index b7b9010..488ce97 100644 --- a/src/tools/gui/toolchain_config_widget.h +++ b/src/tools/gui/toolchain_config_widget.h @@ -11,7 +11,7 @@ #include <tqwidgetstack.h> #include <tqlabel.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpushbutton.h> #include "common/gui/key_gui.h" |