diff --git a/CMakeLists.txt b/CMakeLists.txt index 8f41314b..88808fd4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,7 +51,7 @@ tde_setup_paths( ) ##### user requested modules #################### option( BUILD_ALL "Build all" OFF ) -option( BUILD_KFILEREPLACE "Build kfilereplace" ${BUILD_ALL} ) +option( BUILD_KFILEREPLACE "Build tdefilereplace" ${BUILD_ALL} ) option( BUILD_QUANTA "Build quanta" ${BUILD_ALL} ) @@ -78,7 +78,7 @@ if( BUILD_QUANTA ) add_subdirectory( lib ) endif( ) -tde_conditional_add_subdirectory( BUILD_KFILEREPLACE kfilereplace ) +tde_conditional_add_subdirectory( BUILD_KFILEREPLACE tdefilereplace ) tde_conditional_add_subdirectory( BUILD_QUANTA quanta ) diff --git a/doc/quanta/adv-quanta.docbook b/doc/quanta/adv-quanta.docbook index 5aefad44..432bc81c 100644 --- a/doc/quanta/adv-quanta.docbook +++ b/doc/quanta/adv-quanta.docbook @@ -210,7 +210,7 @@ This application lacks flexibility. Sorry, we will do better next time. - @@ -573,7 +573,7 @@ Documentation Copyright © 2004 Emiliano Gulmini emi_barbarossa@y - &kfilereplace; commands + &tdefilereplace; commands [$datetime:iso$] diff --git a/doc/kfilereplace/invert.png b/doc/tdefilereplace/invert.png similarity index 100% rename from doc/kfilereplace/invert.png rename to doc/tdefilereplace/invert.png diff --git a/doc/kfilereplace/kfr_standalone_main_window_1.png b/doc/tdefilereplace/kfr_standalone_main_window_1.png similarity index 100% rename from doc/kfilereplace/kfr_standalone_main_window_1.png rename to doc/tdefilereplace/kfr_standalone_main_window_1.png diff --git a/doc/kfilereplace/optionsdialog_main_window_1.png b/doc/tdefilereplace/optionsdialog_main_window_1.png similarity index 100% rename from doc/kfilereplace/optionsdialog_main_window_1.png rename to doc/tdefilereplace/optionsdialog_main_window_1.png diff --git a/doc/kfilereplace/optionsdialog_main_window_2.png b/doc/tdefilereplace/optionsdialog_main_window_2.png similarity index 100% rename from doc/kfilereplace/optionsdialog_main_window_2.png rename to doc/tdefilereplace/optionsdialog_main_window_2.png diff --git a/doc/kfilereplace/project.png b/doc/tdefilereplace/project.png similarity index 100% rename from doc/kfilereplace/project.png rename to doc/tdefilereplace/project.png diff --git a/doc/kfilereplace/projectdialog_main_window_1.png b/doc/tdefilereplace/projectdialog_main_window_1.png similarity index 100% rename from doc/kfilereplace/projectdialog_main_window_1.png rename to doc/tdefilereplace/projectdialog_main_window_1.png diff --git a/doc/kfilereplace/projectdialog_main_window_2.png b/doc/tdefilereplace/projectdialog_main_window_2.png similarity index 100% rename from doc/kfilereplace/projectdialog_main_window_2.png rename to doc/tdefilereplace/projectdialog_main_window_2.png diff --git a/doc/kfilereplace/recursive_option.png b/doc/tdefilereplace/recursive_option.png similarity index 100% rename from doc/kfilereplace/recursive_option.png rename to doc/tdefilereplace/recursive_option.png diff --git a/doc/kfilereplace/regularexpression_option.png b/doc/tdefilereplace/regularexpression_option.png similarity index 100% rename from doc/kfilereplace/regularexpression_option.png rename to doc/tdefilereplace/regularexpression_option.png diff --git a/doc/kfilereplace/report_example.png b/doc/tdefilereplace/report_example.png similarity index 100% rename from doc/kfilereplace/report_example.png rename to doc/tdefilereplace/report_example.png diff --git a/doc/kfilereplace/results_view.png b/doc/tdefilereplace/results_view.png similarity index 100% rename from doc/kfilereplace/results_view.png rename to doc/tdefilereplace/results_view.png diff --git a/doc/kfilereplace/stop.png b/doc/tdefilereplace/stop.png similarity index 100% rename from doc/kfilereplace/stop.png rename to doc/tdefilereplace/stop.png diff --git a/doc/kfilereplace/strings_view.png b/doc/tdefilereplace/strings_view.png similarity index 100% rename from doc/kfilereplace/strings_view.png rename to doc/tdefilereplace/strings_view.png diff --git a/doc/kfilereplace/toolbar.png b/doc/tdefilereplace/toolbar.png similarity index 100% rename from doc/kfilereplace/toolbar.png rename to doc/tdefilereplace/toolbar.png diff --git a/doc/kfilereplace/unsortedList.png b/doc/tdefilereplace/unsortedList.png similarity index 100% rename from doc/kfilereplace/unsortedList.png rename to doc/tdefilereplace/unsortedList.png diff --git a/kfilereplace/CMakeLists.txt b/kfilereplace/CMakeLists.txt deleted file mode 100644 index 2ca35794..00000000 --- a/kfilereplace/CMakeLists.txt +++ /dev/null @@ -1,56 +0,0 @@ -################################################# -# -# (C) 2010-2011 Serghei Amelian -# serghei (DOT) amelian (AT) gmail.com -# -# Improvements and feedback are welcome -# -# This file is released under GPL >= 2 -# -################################################# - -add_subdirectory( toolbar ) - -include_directories( - ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_BINARY_DIR} - ${TDE_INCLUDE_DIR} - ${TQT_INCLUDE_DIRS} -) - -link_directories( - ${TQT_LIBRARY_DIRS} -) - - -##### other data ################################ - -tde_install_icons( ) -install( FILES kfilereplace.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) -install( FILES kfilereplacepart.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES kfilereplacepartui.rc DESTINATION ${DATA_INSTALL_DIR}/kfilereplacepart ) -install( FILES kfilereplaceui.rc DESTINATION ${DATA_INSTALL_DIR}/kfilereplace ) - - -##### libkfilereplacepart (module) ############## - -tde_add_kpart( libkfilereplacepart AUTOMOC - SOURCES - commandengine.cpp configurationclasses.cpp - kfilereplacepart.cpp kfilereplaceview.cpp - kfilereplaceviewwdg.ui kaddstringdlg.cpp kaddstringdlgs.ui - knewprojectdlg.cpp knewprojectdlgs.ui koptionsdlg.cpp - koptionsdlgs.ui kfilereplacelib.cpp report.cpp - LINK kio-shared tdeparts-shared - DESTINATION ${PLUGIN_INSTALL_DIR} -) - - -##### kfilereplace (executable) ################# - -tde_add_executable( kfilereplace AUTOMOC - SOURCES - kfilereplace.cpp main.cpp - LINK kio-shared tdeparts-shared - DESTINATION ${BIN_INSTALL_DIR} -) diff --git a/kfilereplace/Makefile.am b/kfilereplace/Makefile.am deleted file mode 100644 index 4e0d8ed1..00000000 --- a/kfilereplace/Makefile.am +++ /dev/null @@ -1,43 +0,0 @@ -## Makefile.am for kfilereplace - -# set the include path for X, qt and KDE -INCLUDES = $(all_includes) - -# this has all of the subdirectories that make will recurse into. if -# there are none, comment this out -SUBDIRS = toolbar - -# these are the headers for your project -noinst_HEADERS = kaddstringdlg.h kfilereplaceiface.h kfilereplacelib.h \ - knewprojectdlg.h kfilereplaceview.h koptionsdlg.h report.h commandengine.h \ - configurationclasses.h kfilereplace.h - -# let automoc handle all of the meta source files (moc) -METASOURCES = AUTO - -kde_module_LTLIBRARIES = libkfilereplacepart.la -libkfilereplacepart_la_SOURCES = kfilereplacepart.cpp kfilereplaceview.cpp \ - kfilereplaceviewwdg.ui kaddstringdlg.cpp kaddstringdlgs.ui knewprojectdlg.cpp \ - knewprojectdlgs.ui koptionsdlg.cpp koptionsdlgs.ui kfilereplacelib.cpp report.cpp \ - commandengine.cpp configurationclasses.cpp - -libkfilereplacepart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts -lDCOP -libkfilereplacepart_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) $(LIB_KHTML) - -messages: rc.cpp - $(XGETTEXT) *.cpp *.h -o $(podir)/kfilereplace.pot - -KDE_ICON = AUTO -kde_services_DATA = kfilereplacepart.desktop -xdg_apps_DATA = kfilereplace.desktop - -# this is where the XML-GUI resource file goes -partrcdir = $(kde_datadir)/kfilereplacepart -partrc_DATA = kfilereplacepartui.rc - -shellrcdir = $(kde_datadir)/kfilereplace -shellrc_DATA = kfilereplaceui.rc -bin_PROGRAMS = kfilereplace -kfilereplace_LDFLAGS = $(KDE_RPATH) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts -lDCOP -kfilereplace_LDADD = $(LIB_KPARTS) -kfilereplace_SOURCES = kfilereplace.cpp main.cpp diff --git a/kfilereplace/toolbar/Makefile.am b/kfilereplace/toolbar/Makefile.am deleted file mode 100644 index 1b5627ad..00000000 --- a/kfilereplace/toolbar/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -appdir = $(kde_datadir)/kfilereplacepart/icons -app_ICON = AUTO - diff --git a/kimagemapeditor/kimagemapeditor.cpp b/kimagemapeditor/kimagemapeditor.cpp index c4d698c5..199b757b 100644 --- a/kimagemapeditor/kimagemapeditor.cpp +++ b/kimagemapeditor/kimagemapeditor.cpp @@ -46,7 +46,7 @@ #include #include #include -#include +#include #include #include #include @@ -57,7 +57,7 @@ #include #include #include -#include +#include #if KDE_IS_VERSION(3,1,90) #include #else diff --git a/kimagemapeditor/kimedialogs.cpp b/kimagemapeditor/kimedialogs.cpp index 665984ea..59187ffc 100644 --- a/kimagemapeditor/kimedialogs.cpp +++ b/kimagemapeditor/kimedialogs.cpp @@ -34,7 +34,7 @@ //#include // KDE #include -#include +#include #include #include #include diff --git a/kimagemapeditor/kimeshell.cpp b/kimagemapeditor/kimeshell.cpp index cb7d9e21..3914ac50 100644 --- a/kimagemapeditor/kimeshell.cpp +++ b/kimagemapeditor/kimeshell.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kimagemapeditor/qextfileinfo.cpp b/kimagemapeditor/qextfileinfo.cpp index 440e9c78..518dc79a 100644 --- a/kimagemapeditor/qextfileinfo.cpp +++ b/kimagemapeditor/qextfileinfo.cpp @@ -21,11 +21,11 @@ //kde includes #include -#include -#include -#include +#include +#include +#include #include -#include +#include #include #include diff --git a/kimagemapeditor/qextfileinfo.h b/kimagemapeditor/qextfileinfo.h index b064bcd8..86dd2923 100644 --- a/kimagemapeditor/qextfileinfo.h +++ b/kimagemapeditor/qextfileinfo.h @@ -12,10 +12,10 @@ #ifndef _TQEXTFILEINFO_H_ #define _TQEXTFILEINFO_H_ -#include -#include +#include +#include #include -#include +#include #include #include diff --git a/klinkstatus/klinkstatus.tdevelop b/klinkstatus/klinkstatus.tdevelop index 1a58961e..2caa649b 100644 --- a/klinkstatus/klinkstatus.tdevelop +++ b/klinkstatus/klinkstatus.tdevelop @@ -57,12 +57,12 @@ - + - + --enable-debug=full diff --git a/klinkstatus/src/cfg/klsconfig.kcfgc b/klinkstatus/src/cfg/klsconfig.kcfgc index 089abab7..10adf128 100644 --- a/klinkstatus/src/cfg/klsconfig.kcfgc +++ b/klinkstatus/src/cfg/klsconfig.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=klinkstatus.kcfg #IncludeFiles=defines.h ClassName=KLSConfig diff --git a/klinkstatus/src/engine/linkchecker.cpp b/klinkstatus/src/engine/linkchecker.cpp index 47a45ca6..13700c4e 100644 --- a/klinkstatus/src/engine/linkchecker.cpp +++ b/klinkstatus/src/engine/linkchecker.cpp @@ -27,11 +27,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include diff --git a/klinkstatus/src/engine/linkchecker.h b/klinkstatus/src/engine/linkchecker.h index a28d66bb..93b9268c 100644 --- a/klinkstatus/src/engine/linkchecker.h +++ b/klinkstatus/src/engine/linkchecker.h @@ -24,7 +24,7 @@ #include #include -#include +#include class KHTMLPart; #include "../parser/http.h" diff --git a/klinkstatus/src/klinkstatus.cpp b/klinkstatus/src/klinkstatus.cpp index 2efde62e..8309cb19 100644 --- a/klinkstatus/src/klinkstatus.cpp +++ b/klinkstatus/src/klinkstatus.cpp @@ -21,8 +21,8 @@ #include "klinkstatus.h" #include -#include -#include +#include +#include #include #include #include diff --git a/klinkstatus/src/klinkstatus_part.cpp b/klinkstatus/src/klinkstatus_part.cpp index 78c72716..bf56dbd3 100644 --- a/klinkstatus/src/klinkstatus_part.cpp +++ b/klinkstatus/src/klinkstatus_part.cpp @@ -23,13 +23,13 @@ #include #include #include -#include +#include #include #include #include #include #include -#include +#include #include #include #include diff --git a/klinkstatus/src/ui/klshistorycombo.cpp b/klinkstatus/src/ui/klshistorycombo.cpp index c29ae53d..13c8a16d 100644 --- a/klinkstatus/src/ui/klshistorycombo.cpp +++ b/klinkstatus/src/ui/klshistorycombo.cpp @@ -13,7 +13,7 @@ #include "klsconfig.h" #include -#include +#include #include #include #include diff --git a/klinkstatus/src/ui/sessionwidget.cpp b/klinkstatus/src/ui/sessionwidget.cpp index e6a96f61..a761499d 100644 --- a/klinkstatus/src/ui/sessionwidget.cpp +++ b/klinkstatus/src/ui/sessionwidget.cpp @@ -24,16 +24,16 @@ #include #include #include -#include +#include #include #include #include -#include +#include #include #include #include #include -#include +#include #include #include diff --git a/kommander/editor/assoctexteditorimpl.cpp b/kommander/editor/assoctexteditorimpl.cpp index 4cbaeb08..9fbfe938 100644 --- a/kommander/editor/assoctexteditorimpl.cpp +++ b/kommander/editor/assoctexteditorimpl.cpp @@ -16,7 +16,7 @@ ***************************************************************************/ /* KDE INCLUDES */ #include -#include +#include #include #include #include diff --git a/kommander/editor/filechooser.cpp b/kommander/editor/filechooser.cpp index 6dfb84ec..ac0aad5a 100644 --- a/kommander/editor/filechooser.cpp +++ b/kommander/editor/filechooser.cpp @@ -1,7 +1,7 @@ #include "filechooser.h" #include #include -#include +#include #include FileChooser::FileChooser( TQWidget *parent, const char *name ) diff --git a/kommander/editor/formfile.cpp b/kommander/editor/formfile.cpp index fbb64d48..97a636ef 100644 --- a/kommander/editor/formfile.cpp +++ b/kommander/editor/formfile.cpp @@ -34,7 +34,7 @@ // KDE includes #include -#include +#include #include #include #include diff --git a/kommander/editor/kommander.xml b/kommander/editor/kommander.xml index ee10455b..2652e09b 100644 --- a/kommander/editor/kommander.xml +++ b/kommander/editor/kommander.xml @@ -558,7 +558,7 @@ dcop kdialog - kfile + tdefile xhost xmodmap xset diff --git a/kommander/editor/main.cpp b/kommander/editor/main.cpp index a4c4b27b..75e4ce67 100644 --- a/kommander/editor/main.cpp +++ b/kommander/editor/main.cpp @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kommander/editor/mainwindow.cpp b/kommander/editor/mainwindow.cpp index 608049ed..fd3f0ecb 100644 --- a/kommander/editor/mainwindow.cpp +++ b/kommander/editor/mainwindow.cpp @@ -74,7 +74,7 @@ #include #include #include -#include +#include #include #include #include @@ -86,7 +86,7 @@ #include #include #include -#include +#include extern TQMap *qwf_functions; extern TQMap *qwf_forms; diff --git a/kommander/editor/mainwindowactions.cpp b/kommander/editor/mainwindowactions.cpp index 749f5d3b..8a217843 100644 --- a/kommander/editor/mainwindowactions.cpp +++ b/kommander/editor/mainwindowactions.cpp @@ -60,7 +60,7 @@ #include #include -#include +#include #include #include #include diff --git a/kommander/editor/messagelog.cpp b/kommander/editor/messagelog.cpp index 16947a77..33a385b3 100644 --- a/kommander/editor/messagelog.cpp +++ b/kommander/editor/messagelog.cpp @@ -17,7 +17,7 @@ #include "messagelog.h" #include -#include +#include #include #include #include diff --git a/kommander/factory/kommanderfactory.cpp b/kommander/factory/kommanderfactory.cpp index 7c717a68..76da35f1 100644 --- a/kommander/factory/kommanderfactory.cpp +++ b/kommander/factory/kommanderfactory.cpp @@ -19,7 +19,7 @@ **********************************************************************/ /* Modifications by Marc Britton (c) 2002 under GNU GPL, terms as above */ -#include +#include #include #include "kommanderfactory.h" diff --git a/kommander/pluginmanager/mainwindow.cpp b/kommander/pluginmanager/mainwindow.cpp index 8c1eb55b..249aed75 100644 --- a/kommander/pluginmanager/mainwindow.cpp +++ b/kommander/pluginmanager/mainwindow.cpp @@ -20,8 +20,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/kommander/pluginmanager/pluginmanager.cpp b/kommander/pluginmanager/pluginmanager.cpp index e5de0841..64f1bf22 100644 --- a/kommander/pluginmanager/pluginmanager.cpp +++ b/kommander/pluginmanager/pluginmanager.cpp @@ -14,7 +14,7 @@ ***************************************************************************/ -#include +#include #include #include "pluginmanager.h" diff --git a/kommander/widget/functionlib.cpp b/kommander/widget/functionlib.cpp index a43fbfaf..18f9a6b8 100644 --- a/kommander/widget/functionlib.cpp +++ b/kommander/widget/functionlib.cpp @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kommander/widget/kommanderfunctions.cpp b/kommander/widget/kommanderfunctions.cpp index b36a7251..dc890657 100644 --- a/kommander/widget/kommanderfunctions.cpp +++ b/kommander/widget/kommanderfunctions.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include diff --git a/kommander/widgets/fileselector.cpp b/kommander/widgets/fileselector.cpp index 897f85c8..54a0e90a 100644 --- a/kommander/widgets/fileselector.cpp +++ b/kommander/widgets/fileselector.cpp @@ -16,7 +16,7 @@ /* KDE INCLUDES */ -#include +#include #include #include #include diff --git a/kxsldbg/kxsldbg.cpp b/kxsldbg/kxsldbg.cpp index 49b2305e..5dab0044 100644 --- a/kxsldbg/kxsldbg.cpp +++ b/kxsldbg/kxsldbg.cpp @@ -6,7 +6,7 @@ #include "kxsldbg.h" #include -#include +#include #include #include diff --git a/kxsldbg/kxsldbgpart/kxsldbg_part.cpp b/kxsldbg/kxsldbgpart/kxsldbg_part.cpp index 05bbf489..6fbd6f46 100644 --- a/kxsldbg/kxsldbgpart/kxsldbg_part.cpp +++ b/kxsldbg/kxsldbgpart/kxsldbg_part.cpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kxsldbg/kxsldbgpart/qxsldbgdoc.h b/kxsldbg/kxsldbgpart/qxsldbgdoc.h index 49f18070..c7c50174 100644 --- a/kxsldbg/kxsldbgpart/qxsldbgdoc.h +++ b/kxsldbg/kxsldbgpart/qxsldbgdoc.h @@ -9,7 +9,7 @@ #ifndef TQXSLDBGDOC_H #define TQXSLDBGDOC_H -#include +#include #include #include #include diff --git a/kxsldbg/kxsldbgpart/xsldbgconfigimpl.cpp b/kxsldbg/kxsldbgpart/xsldbgconfigimpl.cpp index 2967b522..ddf862ca 100644 --- a/kxsldbg/kxsldbgpart/xsldbgconfigimpl.cpp +++ b/kxsldbg/kxsldbgpart/xsldbgconfigimpl.cpp @@ -16,7 +16,7 @@ ************************************************************************************/ #include -#include +#include #include #include diff --git a/lib/compatibility/knewstuff/downloaddialog.cpp b/lib/compatibility/knewstuff/downloaddialog.cpp index c5f402e1..afc27b16 100644 --- a/lib/compatibility/knewstuff/downloaddialog.cpp +++ b/lib/compatibility/knewstuff/downloaddialog.cpp @@ -25,11 +25,11 @@ #include #include #include -#include -#include +#include +#include #include #include -#include +#include #include #include diff --git a/lib/compatibility/knewstuff/engine.cpp b/lib/compatibility/knewstuff/engine.cpp index 2abb7bca..12857917 100644 --- a/lib/compatibility/knewstuff/engine.cpp +++ b/lib/compatibility/knewstuff/engine.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include #include diff --git a/lib/compatibility/knewstuff/knewstuffgeneric.cpp b/lib/compatibility/knewstuff/knewstuffgeneric.cpp index 163d9ade..9d516298 100644 --- a/lib/compatibility/knewstuff/knewstuffgeneric.cpp +++ b/lib/compatibility/knewstuff/knewstuffgeneric.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/lib/compatibility/knewstuff/knewstuffsecure.cpp b/lib/compatibility/knewstuff/knewstuffsecure.cpp index 3c90f068..a6a905c0 100644 --- a/lib/compatibility/knewstuff/knewstuffsecure.cpp +++ b/lib/compatibility/knewstuff/knewstuffsecure.cpp @@ -16,10 +16,10 @@ #include //kde includes -#include +#include #include #include -#include +#include #include #include #include diff --git a/lib/compatibility/knewstuff/provider.cpp b/lib/compatibility/knewstuff/provider.cpp index 92be65b6..4c631847 100644 --- a/lib/compatibility/knewstuff/provider.cpp +++ b/lib/compatibility/knewstuff/provider.cpp @@ -18,9 +18,9 @@ Boston, MA 02110-1301, USA. */ -#include +#include #include -#include +#include #include #include #include diff --git a/lib/compatibility/knewstuff/uploaddialog.cpp b/lib/compatibility/knewstuff/uploaddialog.cpp index 9e6ae83a..08940d0a 100644 --- a/lib/compatibility/knewstuff/uploaddialog.cpp +++ b/lib/compatibility/knewstuff/uploaddialog.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include "engine.h" diff --git a/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp b/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp index 47e2d71d..b0f12173 100644 --- a/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp +++ b/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp @@ -33,7 +33,7 @@ #include #ifndef NO_KDE2 -#include +#include #include #include #include diff --git a/lib/compatibility/tdemdi/qextmdi/ktabwidget.cpp b/lib/compatibility/tdemdi/qextmdi/ktabwidget.cpp index 041143d9..3b17a43a 100644 --- a/lib/compatibility/tdemdi/qextmdi/ktabwidget.cpp +++ b/lib/compatibility/tdemdi/qextmdi/ktabwidget.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdichildarea.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdichildarea.cpp index 91dcb4cd..916cee5b 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemdichildarea.cpp +++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildarea.cpp @@ -30,7 +30,7 @@ #include "tdemdidefines.h" -#include +#include #include #include #include diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.cpp index 80307785..6099d0c1 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.cpp +++ b/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.cpp @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include //TODO: Well, this is already defined in tdeui/kdockwidget.cpp diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp index e326cc26..bef9fb12 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp +++ b/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include diff --git a/lib/qextfileinfo.cpp b/lib/qextfileinfo.cpp index 3aaf5e1b..d13f9733 100644 --- a/lib/qextfileinfo.cpp +++ b/lib/qextfileinfo.cpp @@ -21,11 +21,11 @@ //kde includes #include -#include -#include -#include +#include +#include +#include #include -#include +#include #include #include diff --git a/lib/qextfileinfo.h b/lib/qextfileinfo.h index 1fbe1093..bb3f3c05 100644 --- a/lib/qextfileinfo.h +++ b/lib/qextfileinfo.h @@ -12,10 +12,10 @@ #ifndef _TQEXTFILEINFO_H_ #define _TQEXTFILEINFO_H_ -#include -#include +#include +#include #include -#include +#include #include #include diff --git a/quanta/components/csseditor/colorrequester.cpp b/quanta/components/csseditor/colorrequester.cpp index 7538ebe9..be7aba50 100644 --- a/quanta/components/csseditor/colorrequester.cpp +++ b/quanta/components/csseditor/colorrequester.cpp @@ -55,7 +55,7 @@ void colorRequester::init() if ( !d->edit ) d->edit = new KLineEdit( this, "line edit" ); - myButton = new KPushButton( this, "kfile button"); + myButton = new KPushButton( this, "tdefile button"); TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("colorize")); TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal ); myButton->setIconSet( iconSet ); diff --git a/quanta/components/csseditor/csseditor.cpp b/quanta/components/csseditor/csseditor.cpp index d3586f57..a157adae 100644 --- a/quanta/components/csseditor/csseditor.cpp +++ b/quanta/components/csseditor/csseditor.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include "propertysetter.h" diff --git a/quanta/components/csseditor/cssselector.cpp b/quanta/components/csseditor/cssselector.cpp index 7e61cf02..b1da7961 100644 --- a/quanta/components/csseditor/cssselector.cpp +++ b/quanta/components/csseditor/cssselector.cpp @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include "project.h" #include "stylesheetparser.h" diff --git a/quanta/components/csseditor/tlpeditors.cpp b/quanta/components/csseditor/tlpeditors.cpp index 994876a3..ab70afd6 100644 --- a/quanta/components/csseditor/tlpeditors.cpp +++ b/quanta/components/csseditor/tlpeditors.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include "qextfileinfo.h" diff --git a/quanta/components/debugger/dbgp/CMakeLists.txt b/quanta/components/debugger/dbgp/CMakeLists.txt index 868fc177..0652c64d 100644 --- a/quanta/components/debugger/dbgp/CMakeLists.txt +++ b/quanta/components/debugger/dbgp/CMakeLists.txt @@ -34,6 +34,6 @@ tde_add_kpart( quantadebuggerdbgp AUTOMOC quantadebuggerdbgp.cpp dbgpsettingss.ui dbgpsettings.cpp dbgpnetwork.cpp qbytearrayfifo.cpp - LINK debuggerinterface-static kio-shared + LINK debuggerinterface-static tdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/quanta/components/framewizard/fmfpeditor.cpp b/quanta/components/framewizard/fmfpeditor.cpp index e2bfb44a..a191cd19 100644 --- a/quanta/components/framewizard/fmfpeditor.cpp +++ b/quanta/components/framewizard/fmfpeditor.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include //#include diff --git a/quanta/data/config/plugins.rc b/quanta/data/config/plugins.rc index 1a5a5c24..d8035b9e 100644 --- a/quanta/data/config/plugins.rc +++ b/quanta/data/config/plugins.rc @@ -15,8 +15,8 @@ Input=3 [KFileReplace] Arguments= -FileName=trinity/libkfilereplacepart.la -Icon=kfilereplace +FileName=trinity/libtdefilereplacepart.la +Icon=tdefilereplace Input=3 Location= OutputWindow=Editor Tab diff --git a/quanta/data/config/quanta_preview_config.desktop b/quanta/data/config/quanta_preview_config.desktop index 4000aa18..a3f2e7d7 100644 --- a/quanta/data/config/quanta_preview_config.desktop +++ b/quanta/data/config/quanta_preview_config.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -Exec=kcmshell --caption %c %i tdehtml_behavior tdehtml_java_js tdehtml_fonts cookies cache proxy kcmcss crypto useragent tdehtml_plugins +Exec=tdecmshell --caption %c %i tdehtml_behavior tdehtml_java_js tdehtml_fonts cookies cache proxy kcmcss crypto useragent tdehtml_plugins Icon=konqueror DocPath=konqueror/index.html Name=Configure KHTML Browser Part diff --git a/quanta/data/doc/templates.html b/quanta/data/doc/templates.html index 3043187e..616dfbdc 100644 --- a/quanta/data/doc/templates.html +++ b/quanta/data/doc/templates.html @@ -137,7 +137,7 @@ cool things we took into consideration when using templates in projects. the file to the project templates prior to linking. This will prevent broken links on upload.
  • You always have control where you place your templates so you can choose to move them. However Quanta does not track this so you will need to change links. This is a good - task for kfilereplace which we are setting up to plug in as a kpart.
    • + task for tdefilereplace which we are setting up to plug in as a kpart.

    Templates conclusion diff --git a/quanta/dialogs/actionconfigdialog.cpp b/quanta/dialogs/actionconfigdialog.cpp index 7ae6b4a4..9654c046 100644 --- a/quanta/dialogs/actionconfigdialog.cpp +++ b/quanta/dialogs/actionconfigdialog.cpp @@ -26,7 +26,7 @@ //kde includes #include -#include +#include #include #include #include diff --git a/quanta/dialogs/copyto.cpp b/quanta/dialogs/copyto.cpp index bc2543dc..b5c53356 100644 --- a/quanta/dialogs/copyto.cpp +++ b/quanta/dialogs/copyto.cpp @@ -17,8 +17,8 @@ // qt includes // kde includes -#include -#include +#include +#include //app includes #include "copyto.h" diff --git a/quanta/dialogs/copyto.h b/quanta/dialogs/copyto.h index 29412488..3e021e0a 100644 --- a/quanta/dialogs/copyto.h +++ b/quanta/dialogs/copyto.h @@ -19,7 +19,7 @@ #define COPYTO_H // kde includes -#include +#include /** diff --git a/quanta/dialogs/dirtydlg.cpp b/quanta/dialogs/dirtydlg.cpp index be6f308a..08ce2883 100644 --- a/quanta/dialogs/dirtydlg.cpp +++ b/quanta/dialogs/dirtydlg.cpp @@ -23,10 +23,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include //app includes #include "dirtydialog.h" diff --git a/quanta/dialogs/dirtydlg.h b/quanta/dialogs/dirtydlg.h index 4b6d9232..5fd14e36 100644 --- a/quanta/dialogs/dirtydlg.h +++ b/quanta/dialogs/dirtydlg.h @@ -18,7 +18,7 @@ #define DIRTYDLG_H // kde includes -#include +#include class DirtyDialog; class KDialogBase; diff --git a/quanta/dialogs/dtepeditdlg.cpp b/quanta/dialogs/dtepeditdlg.cpp index bbb3456d..79247f40 100644 --- a/quanta/dialogs/dtepeditdlg.cpp +++ b/quanta/dialogs/dtepeditdlg.cpp @@ -24,8 +24,8 @@ //kde includes #include -#include -#include +#include +#include #include #include #include diff --git a/quanta/dialogs/filecombo.cpp b/quanta/dialogs/filecombo.cpp index 63fd1e58..8f31f692 100644 --- a/quanta/dialogs/filecombo.cpp +++ b/quanta/dialogs/filecombo.cpp @@ -22,7 +22,7 @@ // KDE includes #include -#include +#include #include // app include diff --git a/quanta/dialogs/settings/parseroptions.cpp b/quanta/dialogs/settings/parseroptions.cpp index 92ff1206..1f0e8b3c 100644 --- a/quanta/dialogs/settings/parseroptions.cpp +++ b/quanta/dialogs/settings/parseroptions.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include /* * Constructs a ParserOptions which is a child of 'parent', with the diff --git a/quanta/dialogs/tagdialogs/colorcombo.cpp b/quanta/dialogs/tagdialogs/colorcombo.cpp index 19331def..ebe9a7fd 100644 --- a/quanta/dialogs/tagdialogs/colorcombo.cpp +++ b/quanta/dialogs/tagdialogs/colorcombo.cpp @@ -45,7 +45,7 @@ #include #include -#include +#include #include #include #include diff --git a/quanta/dialogs/tagdialogs/tagdialog.cpp b/quanta/dialogs/tagdialogs/tagdialog.cpp index 90f5f80c..fe466986 100644 --- a/quanta/dialogs/tagdialogs/tagdialog.cpp +++ b/quanta/dialogs/tagdialogs/tagdialog.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/quanta/dialogs/tagdialogs/tagimgdlg.cpp b/quanta/dialogs/tagdialogs/tagimgdlg.cpp index d2a680f5..24578a88 100644 --- a/quanta/dialogs/tagdialogs/tagimgdlg.cpp +++ b/quanta/dialogs/tagdialogs/tagimgdlg.cpp @@ -22,8 +22,8 @@ //kde includes #include #include -#include -#include +#include +#include #include //app includes diff --git a/quanta/messages/annotationoutput.cpp b/quanta/messages/annotationoutput.cpp index 6888f462..e42eef5d 100644 --- a/quanta/messages/annotationoutput.cpp +++ b/quanta/messages/annotationoutput.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include #include diff --git a/quanta/messages/messageoutput.cpp b/quanta/messages/messageoutput.cpp index 2d126794..210ee532 100644 --- a/quanta/messages/messageoutput.cpp +++ b/quanta/messages/messageoutput.cpp @@ -18,7 +18,7 @@ // KDE includes #include #include -#include +#include #include #include #include diff --git a/quanta/parsers/dtd/dtd.cpp b/quanta/parsers/dtd/dtd.cpp index 34826ca4..19ccc218 100644 --- a/quanta/parsers/dtd/dtd.cpp +++ b/quanta/parsers/dtd/dtd.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include diff --git a/quanta/parsers/dtd/dtdparser.cpp b/quanta/parsers/dtd/dtdparser.cpp index 07d571f8..52bd35c8 100644 --- a/quanta/parsers/dtd/dtdparser.cpp +++ b/quanta/parsers/dtd/dtdparser.cpp @@ -23,13 +23,13 @@ #include //kde includes -#include +#include #include #include #include #include #include -#include +#include //other includes #ifdef LIBXML_2_5 diff --git a/quanta/parts/kafka/htmlenhancer.cpp b/quanta/parts/kafka/htmlenhancer.cpp index 8077a76b..32c58bc1 100644 --- a/quanta/parts/kafka/htmlenhancer.cpp +++ b/quanta/parts/kafka/htmlenhancer.cpp @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include "quantacommon.h" #include "document.h" diff --git a/quanta/parts/kafka/kafkasyncoptions.cpp b/quanta/parts/kafka/kafkasyncoptions.cpp index 2c37f0cd..2e6db3f9 100644 --- a/quanta/parts/kafka/kafkasyncoptions.cpp +++ b/quanta/parts/kafka/kafkasyncoptions.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include "kafkasyncoptions.h" diff --git a/quanta/parts/kafka/undoredo.cpp b/quanta/parts/kafka/undoredo.cpp index c7345467..a342a23f 100644 --- a/quanta/parts/kafka/undoredo.cpp +++ b/quanta/parts/kafka/undoredo.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include #include diff --git a/quanta/parts/preview/whtmlpart.cpp b/quanta/parts/preview/whtmlpart.cpp index 94552890..bc39e1af 100644 --- a/quanta/parts/preview/whtmlpart.cpp +++ b/quanta/parts/preview/whtmlpart.cpp @@ -20,7 +20,7 @@ #include //kde includes -#include +#include #include #include #include diff --git a/quanta/plugins/quantapluginconfig.cpp b/quanta/plugins/quantapluginconfig.cpp index 62f25553..02bb3724 100644 --- a/quanta/plugins/quantapluginconfig.cpp +++ b/quanta/plugins/quantapluginconfig.cpp @@ -17,7 +17,7 @@ /* KDE INCLUDES */ #include -#include +#include #include #include #include diff --git a/quanta/plugins/quantaplugineditor.cpp b/quanta/plugins/quantaplugineditor.cpp index 347ae9c6..6c8245f3 100644 --- a/quanta/plugins/quantaplugineditor.cpp +++ b/quanta/plugins/quantaplugineditor.cpp @@ -16,7 +16,7 @@ ***************************************************************************/ /* KDE INCLUDES */ -#include +#include #include #include #include diff --git a/quanta/plugins/quantaplugininterface.cpp b/quanta/plugins/quantaplugininterface.cpp index fc9a8823..51a2cf25 100644 --- a/quanta/plugins/quantaplugininterface.cpp +++ b/quanta/plugins/quantaplugininterface.cpp @@ -17,7 +17,7 @@ /* KDE INCLUDES */ #include -#include +#include #include #include #include diff --git a/quanta/plugins/quantaplugininterface.h b/quanta/plugins/quantaplugininterface.h index 5e876a5e..28458fad 100644 --- a/quanta/plugins/quantaplugininterface.h +++ b/quanta/plugins/quantaplugininterface.h @@ -19,7 +19,7 @@ #define QUANTAPLUGININTERFACE_H /* KDE INCLUDES */ -#include +#include #include /* QT INCLUDES */ diff --git a/quanta/project/project.cpp b/quanta/project/project.cpp index 6d5593d8..560b4e7e 100644 --- a/quanta/project/project.cpp +++ b/quanta/project/project.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/quanta/project/projectnewgeneral.cpp b/quanta/project/projectnewgeneral.cpp index fe6030bb..c60a9ac2 100644 --- a/quanta/project/projectnewgeneral.cpp +++ b/quanta/project/projectnewgeneral.cpp @@ -26,7 +26,7 @@ #include // kde includes -#include +#include #include #include #include diff --git a/quanta/project/projectnewlocal.cpp b/quanta/project/projectnewlocal.cpp index 97d824f4..b430b43b 100644 --- a/quanta/project/projectnewlocal.cpp +++ b/quanta/project/projectnewlocal.cpp @@ -28,7 +28,7 @@ // kde includes #include #include -#include +#include #include #include #include diff --git a/quanta/project/projectnewweb.cpp b/quanta/project/projectnewweb.cpp index 31d3f620..7d62d276 100644 --- a/quanta/project/projectnewweb.cpp +++ b/quanta/project/projectnewweb.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include diff --git a/quanta/project/projectoptions.ui.h b/quanta/project/projectoptions.ui.h index 3d0200aa..ef8ab07d 100644 --- a/quanta/project/projectoptions.ui.h +++ b/quanta/project/projectoptions.ui.h @@ -16,7 +16,7 @@ ***************************************************************************/ #include -#include +#include #include #include #include diff --git a/quanta/project/projectprivate.cpp b/quanta/project/projectprivate.cpp index c488acc0..305831ab 100644 --- a/quanta/project/projectprivate.cpp +++ b/quanta/project/projectprivate.cpp @@ -30,11 +30,11 @@ #include #include #include -#include +#include #include -#include +#include #include -#include +#include #include #include #include diff --git a/quanta/project/projectupload.cpp b/quanta/project/projectupload.cpp index 1f389cb4..6d075127 100644 --- a/quanta/project/projectupload.cpp +++ b/quanta/project/projectupload.cpp @@ -36,12 +36,12 @@ //kde includes #include #include -#include +#include #include #include #include #include -#include +#include #include #include #include diff --git a/quanta/project/projectupload.h b/quanta/project/projectupload.h index bd341eec..c3071899 100644 --- a/quanta/project/projectupload.h +++ b/quanta/project/projectupload.h @@ -25,7 +25,7 @@ #include #include -#include +#include /** *@author Dmitry Poplavsky & Alexander Yakovlev & Andras Mantia diff --git a/quanta/project/rescanprj.cpp b/quanta/project/rescanprj.cpp index 5f5ebc71..e04fd444 100644 --- a/quanta/project/rescanprj.cpp +++ b/quanta/project/rescanprj.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include diff --git a/quanta/project/rescanprj.h b/quanta/project/rescanprj.h index da3844ac..5c36efb9 100644 --- a/quanta/project/rescanprj.h +++ b/quanta/project/rescanprj.h @@ -19,7 +19,7 @@ #define RESCANPRJ_H #include -#include +#include #include "rescanprjdir.h" diff --git a/quanta/quanta.tdevelop b/quanta/quanta.tdevelop index c5729fab..2a70d8f0 100644 --- a/quanta/quanta.tdevelop +++ b/quanta/quanta.tdevelop @@ -88,7 +88,7 @@ - + diff --git a/quanta/src/document.cpp b/quanta/src/document.cpp index f6531e68..dee83bca 100644 --- a/quanta/src/document.cpp +++ b/quanta/src/document.cpp @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include #include diff --git a/quanta/src/dtds.cpp b/quanta/src/dtds.cpp index 9a91f304..642c3da7 100644 --- a/quanta/src/dtds.cpp +++ b/quanta/src/dtds.cpp @@ -28,7 +28,7 @@ // include files for KDE #include #include -#include +#include #include #include #include @@ -36,7 +36,7 @@ #include #include #include -#include +#include // application specific includes diff --git a/quanta/src/kqapp.cpp b/quanta/src/kqapp.cpp index 33a68e91..53b73ea2 100644 --- a/quanta/src/kqapp.cpp +++ b/quanta/src/kqapp.cpp @@ -18,7 +18,7 @@ #include -#include +#include #include #include #include diff --git a/quanta/src/quanta.cpp b/quanta/src/quanta.cpp index f604bc43..d0e862ff 100644 --- a/quanta/src/quanta.cpp +++ b/quanta/src/quanta.cpp @@ -58,10 +58,10 @@ #include #include #include -#include +#include #include #include -#include +#include #include #include #include @@ -107,7 +107,7 @@ #include #include -#include +#include #ifdef ENABLE_CVSSERVICE #include "cvsservice.h" @@ -195,7 +195,7 @@ extern int NN; const TQString resourceDir = TQString(QUANTA_PACKAGE) + "/"; -// from kfiledialog.cpp - avoid qt warning in STDERR (~/.xsessionerrors) +// from tdefiledialog.cpp - avoid qt warning in STDERR (~/.xsessionerrors) static void silenceTQToolBar(TQtMsgType, const char *){} QuantaApp::QuantaApp(int mdiMode) : DCOPObject("WindowManagerIf"), KMdiMainFrm( 0, "Quanta", (KMdi::MdiMode) mdiMode) diff --git a/quanta/src/quanta_init.cpp b/quanta/src/quanta_init.cpp index 77883967..48f106b0 100644 --- a/quanta/src/quanta_init.cpp +++ b/quanta/src/quanta_init.cpp @@ -40,11 +40,11 @@ #include #include #include -#include +#include #include #include #include -#include +#include #include #include #include @@ -54,7 +54,7 @@ #include #include #include -#include +#include #include #include #include @@ -1412,7 +1412,7 @@ void QuantaInit::checkRuntimeDependencies() dependency.name = i18n("Control Center (tdebase)"); - dependency.execName = "kcmshell"; + dependency.execName = "tdecmshell"; dependency.url = "http://www.kde.org"; dependency.description = i18n("preview browser configuration"); dependency.type = Dependency::Executable; @@ -1427,7 +1427,7 @@ void QuantaInit::checkRuntimeDependencies() dependency.name = "KFileReplace"; dependency.execName = "KFileReplace"; - dependency.url = "http://kfilereplace.tdewebdev.org"; + dependency.url = "http://tdefilereplace.tdewebdev.org"; dependency.description = i18n("search and replace in files"); dependency.type = Dependency::Plugin; dependencies.append(dependency); diff --git a/quanta/src/quantadoc.cpp b/quanta/src/quantadoc.cpp index 6a05a444..eb463cf6 100644 --- a/quanta/src/quantadoc.cpp +++ b/quanta/src/quantadoc.cpp @@ -29,7 +29,7 @@ // include files for KDE #include #include -#include +#include #include #include #include diff --git a/quanta/src/viewmanager.cpp b/quanta/src/viewmanager.cpp index 644e50a7..7cf9a1ed 100644 --- a/quanta/src/viewmanager.cpp +++ b/quanta/src/viewmanager.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include //app includes diff --git a/quanta/treeviews/basetreeview.cpp b/quanta/treeviews/basetreeview.cpp index 7ff962e1..b2d774fc 100644 --- a/quanta/treeviews/basetreeview.cpp +++ b/quanta/treeviews/basetreeview.cpp @@ -41,7 +41,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/quanta/treeviews/basetreeview.h b/quanta/treeviews/basetreeview.h index bf7110cf..bef646ae 100644 --- a/quanta/treeviews/basetreeview.h +++ b/quanta/treeviews/basetreeview.h @@ -22,9 +22,9 @@ #include //kde includes -#include -#include -#include +#include +#include +#include // quanta includes #include "quantacommon.h" diff --git a/quanta/treeviews/docfolder.cpp b/quanta/treeviews/docfolder.cpp index 3e7e8949..3d028451 100644 --- a/quanta/treeviews/docfolder.cpp +++ b/quanta/treeviews/docfolder.cpp @@ -20,7 +20,7 @@ #include // KDE includes -#include +#include #include #include diff --git a/quanta/treeviews/docitem.cpp b/quanta/treeviews/docitem.cpp index f24c3bb9..3fb4ac2f 100644 --- a/quanta/treeviews/docitem.cpp +++ b/quanta/treeviews/docitem.cpp @@ -17,7 +17,7 @@ #include -#include +#include #include "docitem.h" diff --git a/quanta/treeviews/doctreeview.cpp b/quanta/treeviews/doctreeview.cpp index 31579563..684072a5 100644 --- a/quanta/treeviews/doctreeview.cpp +++ b/quanta/treeviews/doctreeview.cpp @@ -22,7 +22,7 @@ #include // KDE clases -#include +#include #include #include #include diff --git a/quanta/treeviews/filestreeview.cpp b/quanta/treeviews/filestreeview.cpp index b9a0ac1d..eee9e6fb 100644 --- a/quanta/treeviews/filestreeview.cpp +++ b/quanta/treeviews/filestreeview.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include diff --git a/quanta/treeviews/servertreeview.cpp b/quanta/treeviews/servertreeview.cpp index 4c9a821f..fa34f582 100644 --- a/quanta/treeviews/servertreeview.cpp +++ b/quanta/treeviews/servertreeview.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include diff --git a/quanta/treeviews/structtreeview.cpp b/quanta/treeviews/structtreeview.cpp index f744e52d..4fa7afa9 100644 --- a/quanta/treeviews/structtreeview.cpp +++ b/quanta/treeviews/structtreeview.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include diff --git a/quanta/treeviews/templatestreeview.cpp b/quanta/treeviews/templatestreeview.cpp index bd00665f..a9aa75d0 100644 --- a/quanta/treeviews/templatestreeview.cpp +++ b/quanta/treeviews/templatestreeview.cpp @@ -48,11 +48,11 @@ #include #include #include -#include +#include #include #include #include -#include +#include #include "templatestreeview.h" diff --git a/quanta/treeviews/uploadtreefile.cpp b/quanta/treeviews/uploadtreefile.cpp index 9c055424..5257117e 100644 --- a/quanta/treeviews/uploadtreefile.cpp +++ b/quanta/treeviews/uploadtreefile.cpp @@ -19,7 +19,7 @@ #include // KDE includes -#include +#include #include #include diff --git a/quanta/treeviews/uploadtreeview.cpp b/quanta/treeviews/uploadtreeview.cpp index 259b81dc..4c5af524 100644 --- a/quanta/treeviews/uploadtreeview.cpp +++ b/quanta/treeviews/uploadtreeview.cpp @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include "uploadtreeview.h" #include "quantacommon.h" diff --git a/quanta/utility/quantabookmarks.cpp b/quanta/utility/quantabookmarks.cpp index c27e07a7..0678a972 100644 --- a/quanta/utility/quantabookmarks.cpp +++ b/quanta/utility/quantabookmarks.cpp @@ -21,7 +21,7 @@ #include "quantabookmarks.h" #include -#include +#include #include #include #include diff --git a/quanta/utility/quantacommon.cpp b/quanta/utility/quantacommon.cpp index e29c1013..e7f9380d 100644 --- a/quanta/utility/quantacommon.cpp +++ b/quanta/utility/quantacommon.cpp @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/quanta/utility/quantanetaccess.cpp b/quanta/utility/quantanetaccess.cpp index 6fa248eb..eb47cb86 100644 --- a/quanta/utility/quantanetaccess.cpp +++ b/quanta/utility/quantanetaccess.cpp @@ -17,11 +17,11 @@ #include #include -#include +#include #include #include #include -#include +#include #include #include "qextfileinfo.h" diff --git a/quanta/utility/tagactionset.cpp b/quanta/utility/tagactionset.cpp index 58af9c65..a5397df8 100644 --- a/quanta/utility/tagactionset.cpp +++ b/quanta/utility/tagactionset.cpp @@ -16,7 +16,7 @@ ***************************************************************************/ #include -#include +#include #include #include #include diff --git a/tdefilereplace/CMakeLists.txt b/tdefilereplace/CMakeLists.txt new file mode 100644 index 00000000..621c0e02 --- /dev/null +++ b/tdefilereplace/CMakeLists.txt @@ -0,0 +1,56 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +add_subdirectory( toolbar ) + +include_directories( + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_BINARY_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} +) + + +##### other data ################################ + +tde_install_icons( ) +install( FILES tdefilereplace.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) +install( FILES tdefilereplacepart.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES tdefilereplacepartui.rc DESTINATION ${DATA_INSTALL_DIR}/tdefilereplacepart ) +install( FILES tdefilereplaceui.rc DESTINATION ${DATA_INSTALL_DIR}/tdefilereplace ) + + +##### libtdefilereplacepart (module) ############## + +tde_add_kpart( libtdefilereplacepart AUTOMOC + SOURCES + commandengine.cpp configurationclasses.cpp + tdefilereplacepart.cpp tdefilereplaceview.cpp + tdefilereplaceviewwdg.ui kaddstringdlg.cpp kaddstringdlgs.ui + knewprojectdlg.cpp knewprojectdlgs.ui koptionsdlg.cpp + koptionsdlgs.ui tdefilereplacelib.cpp report.cpp + LINK tdeio-shared tdeparts-shared + DESTINATION ${PLUGIN_INSTALL_DIR} +) + + +##### tdefilereplace (executable) ################# + +tde_add_executable( tdefilereplace AUTOMOC + SOURCES + tdefilereplace.cpp main.cpp + LINK tdeio-shared tdeparts-shared + DESTINATION ${BIN_INSTALL_DIR} +) diff --git a/kfilereplace/ChangeLog b/tdefilereplace/ChangeLog similarity index 95% rename from kfilereplace/ChangeLog rename to tdefilereplace/ChangeLog index 9a9c507e..b94d65f5 100644 --- a/kfilereplace/ChangeLog +++ b/tdefilereplace/ChangeLog @@ -36,12 +36,12 @@ * Fixed a bug in KAddStringDlg: now when we want edit a string the search-only mode and search-replace mode don't merge. * Modified KFR file format: I added the tag '' just after the root to allows - kfilereplace to recognize if the list to load is a list of only search strings. I added some lines of code + tdefilereplace to recognize if the list to load is a list of only search strings. I added some lines of code to permit users to load files that don't have this new tag. * I'm writing docbook manual. 2005-01-10 Emiliano Gulmini - * The KFilereplaceView widget has been modified. Now it change the layout of kfilereplace depending of the + * The KFilereplaceView widget has been modified. Now it change the layout of tdefilereplace depending of the value of m_option->m_searchOnlyMode. * I fixed a bug in the backup file option. @@ -77,7 +77,7 @@ code that do commands feature from KFileREplaceLib to these two classes. 2004-08-09 Emiliano Gulmini - * I fixed a bug that affected the method "void KFileReplaceView::slotStringsClear()" in kfilereplaceview.cpp file. + * I fixed a bug that affected the method "void KFileReplaceView::slotStringsClear()" in tdefilereplaceview.cpp file. This bug caused the list of strings not to be correctly erased. 2004-08-07 Emiliano Gulmini @@ -95,7 +95,7 @@ "if(not(dirInfo.isReadable() and dirInfo.isExecutable())" " or " " not(dirInfo.isWritable())) " - in kfilereplacepart.cpp + in tdefilereplacepart.cpp 2004-07-30 Emiliano Gulmini * The icons have been fixed!!! What a miracle!!! @@ -138,8 +138,8 @@ apistruct.h kernel.(cpp,h) kexpression.(cpp,h) - kfilereplacedoc.(cpp,h) - kfilereplacepref.(cpp,h) + tdefilereplacedoc.(cpp,h) + tdefilereplacepref.(cpp,h) were removed and these files are added: @@ -178,7 +178,7 @@ * Fixed a bug that generate a wrong XHTML result file. 2004-03-06 Emiliano Gulmini - * Added kconfirmdlgs.ui. + * Added tdeconfirmdlgs.ui. * Fixed a bug in KOptionDlg, now when we select a option, the selection is shown correctly. * Fixed a bug KNewProjectDlg. @@ -191,13 +191,13 @@ html code. 2004-02-24 Emiliano Gulmini - * kfilereplacepref.(h,cpp) were removed. + * tdefilereplacepref.(h,cpp) were removed. * kernel.(h,cpp) now are a singleton class. * Some macros in kernel.h were replaced with integer constants. * Methods in kernel.h file were renamed. * Some superflous #include lines were removed. * The filelib.(h,cpp) were subtituted with KFilereplaceLib singleton class. - * Now kfilereplace logo and icons in the result view appear. + * Now tdefilereplace logo and icons in the result view appear. 2004-02-18 Emiliano Gulmini * The icons in toolbar directory were redrawn. diff --git a/tdefilereplace/Makefile.am b/tdefilereplace/Makefile.am new file mode 100644 index 00000000..8d2584c0 --- /dev/null +++ b/tdefilereplace/Makefile.am @@ -0,0 +1,43 @@ +## Makefile.am for tdefilereplace + +# set the include path for X, qt and KDE +INCLUDES = $(all_includes) + +# this has all of the subdirectories that make will recurse into. if +# there are none, comment this out +SUBDIRS = toolbar + +# these are the headers for your project +noinst_HEADERS = kaddstringdlg.h tdefilereplaceiface.h tdefilereplacelib.h \ + knewprojectdlg.h tdefilereplaceview.h koptionsdlg.h report.h commandengine.h \ + configurationclasses.h tdefilereplace.h + +# let automoc handle all of the meta source files (moc) +METASOURCES = AUTO + +kde_module_LTLIBRARIES = libtdefilereplacepart.la +libtdefilereplacepart_la_SOURCES = tdefilereplacepart.cpp tdefilereplaceview.cpp \ + tdefilereplaceviewwdg.ui kaddstringdlg.cpp kaddstringdlgs.ui knewprojectdlg.cpp \ + knewprojectdlgs.ui koptionsdlg.cpp koptionsdlgs.ui tdefilereplacelib.cpp report.cpp \ + commandengine.cpp configurationclasses.cpp + +libtdefilereplacepart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts -lDCOP +libtdefilereplacepart_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) $(LIB_KHTML) + +messages: rc.cpp + $(XGETTEXT) *.cpp *.h -o $(podir)/tdefilereplace.pot + +KDE_ICON = AUTO +kde_services_DATA = tdefilereplacepart.desktop +xdg_apps_DATA = tdefilereplace.desktop + +# this is where the XML-GUI resource file goes +partrcdir = $(kde_datadir)/tdefilereplacepart +partrc_DATA = tdefilereplacepartui.rc + +shellrcdir = $(kde_datadir)/tdefilereplace +shellrc_DATA = tdefilereplaceui.rc +bin_PROGRAMS = tdefilereplace +tdefilereplace_LDFLAGS = $(KDE_RPATH) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts -lDCOP +tdefilereplace_LDADD = $(LIB_KPARTS) +tdefilereplace_SOURCES = tdefilereplace.cpp main.cpp diff --git a/kfilereplace/commandengine.cpp b/tdefilereplace/commandengine.cpp similarity index 100% rename from kfilereplace/commandengine.cpp rename to tdefilereplace/commandengine.cpp diff --git a/kfilereplace/commandengine.h b/tdefilereplace/commandengine.h similarity index 100% rename from kfilereplace/commandengine.h rename to tdefilereplace/commandengine.h diff --git a/kfilereplace/configurationclasses.cpp b/tdefilereplace/configurationclasses.cpp similarity index 100% rename from kfilereplace/configurationclasses.cpp rename to tdefilereplace/configurationclasses.cpp diff --git a/kfilereplace/configurationclasses.h b/tdefilereplace/configurationclasses.h similarity index 99% rename from kfilereplace/configurationclasses.h rename to tdefilereplace/configurationclasses.h index 0d36261b..206de1c4 100644 --- a/kfilereplace/configurationclasses.h +++ b/tdefilereplace/configurationclasses.h @@ -25,7 +25,7 @@ #include typedef TQMap KeyValueMap; -// entry strings in the kfilereplacerc file +// entry strings in the tdefilereplacerc file const TQString rcDirectoriesList = "Directories list"; const TQString rcFiltersList = "Filters list"; const TQString rcRecentFiles = "Recent files"; diff --git a/kfilereplace/configure.in.in b/tdefilereplace/configure.in.in similarity index 85% rename from kfilereplace/configure.in.in rename to tdefilereplace/configure.in.in index a7f9ec22..787f832f 100644 --- a/kfilereplace/configure.in.in +++ b/tdefilereplace/configure.in.in @@ -1,6 +1,6 @@ #MIN_CONFIG -AM_INIT_AUTOMAKE(kfilereplace, 0.8.0) +AM_INIT_AUTOMAKE(tdefilereplace, 0.8.0) dnl These are common macros that you might or might not want to use diff --git a/kfilereplace/hi22-app-kfilereplace.png b/tdefilereplace/hi22-app-tdefilereplace.png similarity index 100% rename from kfilereplace/hi22-app-kfilereplace.png rename to tdefilereplace/hi22-app-tdefilereplace.png diff --git a/kfilereplace/hi32-app-kfilereplace.png b/tdefilereplace/hi32-app-tdefilereplace.png similarity index 100% rename from kfilereplace/hi32-app-kfilereplace.png rename to tdefilereplace/hi32-app-tdefilereplace.png diff --git a/kfilereplace/hi48-app-kfilereplace.png b/tdefilereplace/hi48-app-tdefilereplace.png similarity index 100% rename from kfilereplace/hi48-app-kfilereplace.png rename to tdefilereplace/hi48-app-tdefilereplace.png diff --git a/kfilereplace/kaddstringdlg.cpp b/tdefilereplace/kaddstringdlg.cpp similarity index 98% rename from kfilereplace/kaddstringdlg.cpp rename to tdefilereplace/kaddstringdlg.cpp index 1ec33552..a87ff7be 100644 --- a/kfilereplace/kaddstringdlg.cpp +++ b/tdefilereplace/kaddstringdlg.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include // local @@ -266,7 +266,7 @@ void KAddStringDlg::slotDeleteStringFromView() void KAddStringDlg::slotHelp() { - kapp->invokeHelp(TQString(), "kfilereplace"); + kapp->invokeHelp(TQString(), "tdefilereplace"); } #include "kaddstringdlg.moc" diff --git a/kfilereplace/kaddstringdlg.h b/tdefilereplace/kaddstringdlg.h similarity index 100% rename from kfilereplace/kaddstringdlg.h rename to tdefilereplace/kaddstringdlg.h diff --git a/kfilereplace/kaddstringdlgs.ui b/tdefilereplace/kaddstringdlgs.ui similarity index 100% rename from kfilereplace/kaddstringdlgs.ui rename to tdefilereplace/kaddstringdlgs.ui diff --git a/kfilereplace/knewprojectdlg.cpp b/tdefilereplace/knewprojectdlg.cpp similarity index 99% rename from kfilereplace/knewprojectdlg.cpp rename to tdefilereplace/knewprojectdlg.cpp index b610990e..4e9c9281 100644 --- a/kfilereplace/knewprojectdlg.cpp +++ b/tdefilereplace/knewprojectdlg.cpp @@ -32,8 +32,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/kfilereplace/knewprojectdlg.h b/tdefilereplace/knewprojectdlg.h similarity index 97% rename from kfilereplace/knewprojectdlg.h rename to tdefilereplace/knewprojectdlg.h index 7be5ecb9..b8b87da6 100644 --- a/kfilereplace/knewprojectdlg.h +++ b/tdefilereplace/knewprojectdlg.h @@ -56,7 +56,7 @@ class KNewProjectDlg : public KNewProjectDlgS void slotEnableChbUser(bool b); void slotEnableChbGroup(bool b); void slotEnableChbBackup(bool b); - void slotHelp(){ kapp->invokeHelp(TQString(), "kfilereplace"); } + void slotHelp(){ kapp->invokeHelp(TQString(), "tdefilereplace"); } private: void initGUI(); diff --git a/kfilereplace/knewprojectdlgs.ui b/tdefilereplace/knewprojectdlgs.ui similarity index 100% rename from kfilereplace/knewprojectdlgs.ui rename to tdefilereplace/knewprojectdlgs.ui diff --git a/kfilereplace/koptionsdlg.cpp b/tdefilereplace/koptionsdlg.cpp similarity index 99% rename from kfilereplace/koptionsdlg.cpp rename to tdefilereplace/koptionsdlg.cpp index 8d303f08..bd6bcbe8 100644 --- a/kfilereplace/koptionsdlg.cpp +++ b/tdefilereplace/koptionsdlg.cpp @@ -27,7 +27,7 @@ // KDE #include #include -#include +#include #include #include #include @@ -43,7 +43,7 @@ using namespace whatthisNameSpace; KOptionsDlg::KOptionsDlg(RCOptions* info, TQWidget *parent, const char *name) : KOptionsDlgS(parent,name,true) { - m_config = new TDEConfig("kfilereplacerc"); + m_config = new TDEConfig("tdefilereplacerc"); m_option = info; initGUI(); diff --git a/kfilereplace/koptionsdlg.h b/tdefilereplace/koptionsdlg.h similarity index 96% rename from kfilereplace/koptionsdlg.h rename to tdefilereplace/koptionsdlg.h index a9e8e620..4654c5cd 100644 --- a/kfilereplace/koptionsdlg.h +++ b/tdefilereplace/koptionsdlg.h @@ -48,7 +48,7 @@ class KOptionsDlg : public KOptionsDlgS void slotChbBackup(bool b); void slotChbConfirmStrings(bool b); void slotChbShowConfirmDialog(bool b); - void slotHelp(){ kapp->invokeHelp(TQString(), "kfilereplace"); } + void slotHelp(){ kapp->invokeHelp(TQString(), "tdefilereplace"); } private: void initGUI(); diff --git a/kfilereplace/koptionsdlgs.ui b/tdefilereplace/koptionsdlgs.ui similarity index 100% rename from kfilereplace/koptionsdlgs.ui rename to tdefilereplace/koptionsdlgs.ui diff --git a/kfilereplace/main.cpp b/tdefilereplace/main.cpp similarity index 95% rename from kfilereplace/main.cpp rename to tdefilereplace/main.cpp index b3adfffe..4b12eba0 100644 --- a/kfilereplace/main.cpp +++ b/tdefilereplace/main.cpp @@ -14,7 +14,7 @@ * * ***************************************************************************/ -#include "kfilereplace.h" +#include "tdefilereplace.h" #include #include @@ -34,7 +34,7 @@ static KCmdLineOptions options[] = int main(int argc, char *argv[]) { - TDEAboutData about("kfilereplace", I18N_NOOP("KFileReplace"), version, description, + TDEAboutData about("tdefilereplace", I18N_NOOP("KFileReplace"), version, description, TDEAboutData::License_GPL_V2, "(C) 2004-2005 Andras Mantia\n(C) 2004-2005 Emiliano Gulmini\n(C) 1999-2002 Francois Dupoux", I18N_NOOP("Part of the KDEWebDev module."), "http://www.tdewebdev.org"); diff --git a/kfilereplace/report.cpp b/tdefilereplace/report.cpp similarity index 100% rename from kfilereplace/report.cpp rename to tdefilereplace/report.cpp diff --git a/kfilereplace/report.h b/tdefilereplace/report.h similarity index 100% rename from kfilereplace/report.h rename to tdefilereplace/report.h diff --git a/kfilereplace/kfilereplace.cpp b/tdefilereplace/tdefilereplace.cpp similarity index 91% rename from kfilereplace/kfilereplace.cpp rename to tdefilereplace/tdefilereplace.cpp index a0976658..bd5725e4 100644 --- a/kfilereplace/kfilereplace.cpp +++ b/tdefilereplace/tdefilereplace.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - kfilereplace.cpp - KFileReplace shell implementation + tdefilereplace.cpp - KFileReplace shell implementation ------------------- begin : Thu Sep 16 14:14:09 2004 copyright : (C) 2004 by Andras Mantia @@ -22,16 +22,16 @@ #include //app includes -#include "kfilereplace.h" +#include "tdefilereplace.h" KFileReplace::KFileReplace() : KParts::MainWindow(0L, "KFileReplace") { - KLibFactory *factory = KLibLoader::self()->factory("libkfilereplacepart"); + KLibFactory *factory = KLibLoader::self()->factory("libtdefilereplacepart"); if (factory) { m_part = static_cast(factory->create(TQT_TQOBJECT(this), - "kfilereplace_part", "KParts::ReadOnlyPart" )); + "tdefilereplace_part", "KParts::ReadOnlyPart" )); if (m_part) { @@ -92,9 +92,9 @@ void KFileReplace::applyNewToolbarConfig() void KFileReplace::removeDuplicatedActions() { KActionCollection* part_action_collection = m_part->actionCollection(); - KAction* part_about_action = part_action_collection->action("help_about_kfilereplace"); + KAction* part_about_action = part_action_collection->action("help_about_tdefilereplace"); KAction* part_report_action = part_action_collection->action("report_bug"); - KAction* part_help_action= part_action_collection->action("help_kfilereplace"); + KAction* part_help_action= part_action_collection->action("help_tdefilereplace"); if (!part_about_action || !part_report_action || !part_help_action || !part_action_collection) return; @@ -108,4 +108,4 @@ void KFileReplace::removeDuplicatedActions() part_action_collection->remove(part_help_action); } -#include "kfilereplace.moc" +#include "tdefilereplace.moc" diff --git a/kfilereplace/kfilereplace.desktop b/tdefilereplace/tdefilereplace.desktop similarity index 96% rename from kfilereplace/kfilereplace.desktop rename to tdefilereplace/tdefilereplace.desktop index e656566f..d5ae92ca 100644 --- a/kfilereplace/kfilereplace.desktop +++ b/tdefilereplace/tdefilereplace.desktop @@ -8,10 +8,10 @@ Name[sv]=Kfilereplace Name[ta]=Kகோப்பு இடமாற்று Name[tg]=KФайлро ҷойгузор кардан Name[tr]=K Dosya Değiştirme -Exec=kfilereplace %i %m -caption "%c" -Icon=kfilereplace +Exec=tdefilereplace %i %m -caption "%c" +Icon=tdefilereplace Type=Application -DocPath=kfilereplace/index.html +DocPath=tdefilereplace/index.html Terminal=false GenericName=Search & Replace Tool GenericName[bg]=Търсене и замяна diff --git a/kfilereplace/kfilereplace.h b/tdefilereplace/tdefilereplace.h similarity index 96% rename from kfilereplace/kfilereplace.h rename to tdefilereplace/tdefilereplace.h index 5623d3bf..6dd154d9 100644 --- a/kfilereplace/kfilereplace.h +++ b/tdefilereplace/tdefilereplace.h @@ -1,5 +1,5 @@ /*************************************************************************** - kfilereplace.h - KFileReplace header + tdefilereplace.h - KFileReplace header ------------------- begin : Thu Sep 16 14:14:09 2004 copyright : (C) 2004 by Andras Mantia diff --git a/kfilereplace/kfilereplace.tdevelop b/tdefilereplace/tdefilereplace.tdevelop similarity index 98% rename from kfilereplace/kfilereplace.tdevelop rename to tdefilereplace/tdefilereplace.tdevelop index fcba4350..14e5fe4a 100644 --- a/kfilereplace/kfilereplace.tdevelop +++ b/tdefilereplace/tdefilereplace.tdevelop @@ -112,7 +112,7 @@ build / - kfilereplace/kfilereplace + tdefilereplace/tdefilereplace false true @@ -120,7 +120,7 @@ default - kfilereplace + tdefilereplace diff --git a/kfilereplace/kfilereplaceiface.h b/tdefilereplace/tdefilereplaceiface.h similarity index 95% rename from kfilereplace/kfilereplaceiface.h rename to tdefilereplace/tdefilereplaceiface.h index 3c62ae99..515a330e 100644 --- a/kfilereplace/kfilereplaceiface.h +++ b/tdefilereplace/tdefilereplaceiface.h @@ -1,5 +1,5 @@ /*************************************************************************** - kfilereplaceif.h - description + tdefilereplaceif.h - description ------------------- copyright : (C) 1999 by Franois Dupoux (C) 2003 Andras Mantia diff --git a/kfilereplace/kfilereplacelib.cpp b/tdefilereplace/tdefilereplacelib.cpp similarity index 99% rename from kfilereplace/kfilereplacelib.cpp rename to tdefilereplace/tdefilereplacelib.cpp index 6e0d8323..0f396f85 100644 --- a/kfilereplace/kfilereplacelib.cpp +++ b/tdefilereplace/tdefilereplacelib.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - kfilereplacelib.cpp - File library + tdefilereplacelib.cpp - File library ------------------- begin : lun mai 3 20:19:52 CEST 1999 @@ -35,7 +35,7 @@ #include // local -#include "kfilereplacelib.h" +#include "tdefilereplacelib.h" const double kilo = 1024.0; const double mega = 1048576.0;//1024^2 diff --git a/kfilereplace/kfilereplacelib.h b/tdefilereplace/tdefilereplacelib.h similarity index 96% rename from kfilereplace/kfilereplacelib.h rename to tdefilereplace/tdefilereplacelib.h index de80d17d..0810a992 100644 --- a/kfilereplace/kfilereplacelib.h +++ b/tdefilereplace/tdefilereplacelib.h @@ -1,5 +1,5 @@ /*************************************************************************** - kfilereplacelib.h - File library, derived from filelib.h + tdefilereplacelib.h - File library, derived from filelib.h ------------------- begin : lun mai 3 20:19:52 CEST 1999 diff --git a/kfilereplace/kfilereplacepart.cpp b/tdefilereplace/tdefilereplacepart.cpp similarity index 98% rename from kfilereplace/kfilereplacepart.cpp rename to tdefilereplace/tdefilereplacepart.cpp index ed01399a..ab91ae47 100644 --- a/kfilereplace/kfilereplacepart.cpp +++ b/tdefilereplace/tdefilereplacepart.cpp @@ -1,6 +1,6 @@ // // -// C++ Implementation: kfilereplacepart +// C++ Implementation: tdefilereplacepart // // Description: // @@ -26,10 +26,10 @@ #include #include #include -#include -#include +#include +#include #include -#include +#include #include #include #include @@ -43,9 +43,9 @@ #include // local -#include "kfilereplacelib.h" -#include "kfilereplacepart.h" -#include "kfilereplaceview.h" +#include "tdefilereplacelib.h" +#include "tdefilereplacepart.h" +#include "tdefilereplaceview.h" #include "koptionsdlg.h" #include "knewprojectdlg.h" #include "report.h" @@ -58,14 +58,14 @@ using namespace whatthisNameSpace; // Factory code for KDE 3 typedef KParts::GenericFactory FileReplaceFactory; -K_EXPORT_COMPONENT_FACTORY( libkfilereplacepart, FileReplaceFactory ) +K_EXPORT_COMPONENT_FACTORY( libtdefilereplacepart, FileReplaceFactory ) KFileReplacePart::KFileReplacePart(TQWidget* parentWidget, const char* , TQObject* parent, const char* name, const TQStringList & ) : KParts::ReadOnlyPart(parent,name) { setInstance(FileReplaceFactory::instance()); - TDEGlobal::locale()->insertCatalogue("kfilereplace"); + TDEGlobal::locale()->insertCatalogue("tdefilereplace"); m_parentWidget = parentWidget; - m_config = new TDEConfig("kfilereplacerc"); + m_config = new TDEConfig("tdefilereplacerc"); m_aboutDlg = 0; m_stop = false; m_optionMask = TQDir::Files; @@ -443,7 +443,7 @@ void KFileReplacePart::showAboutApplication() void KFileReplacePart::appHelpActivated() { - kapp->invokeHelp(TQString(), "kfilereplace"); + kapp->invokeHelp(TQString(), "tdefilereplace"); } void KFileReplacePart::reportBug() @@ -484,7 +484,7 @@ void KFileReplacePart::resetActions() actionCollection()->action("options_case")->setEnabled(true); actionCollection()->action("options_var")->setEnabled(!searchOnlyMode); actionCollection()->action("options_regularexpressions")->setEnabled(true); - actionCollection()->action("configure_kfilereplace")->setEnabled(true); + actionCollection()->action("configure_tdefilereplace")->setEnabled(true); hasItems = (rv->firstChild() != 0); @@ -509,7 +509,7 @@ void KFileReplacePart::resetActions() //PUBLIC METHODS TDEAboutData* KFileReplacePart::createAboutData() { - TDEAboutData * aboutData = new TDEAboutData("kfilereplacepart", + TDEAboutData * aboutData = new TDEAboutData("tdefilereplacepart", I18N_NOOP("KFileReplacePart"), KFR_VERSION, I18N_NOOP( "Batch search and replace tool."), @@ -551,7 +551,7 @@ bool KFileReplacePart::openURL(const KURL &url) //PRIVATE METHODS void KFileReplacePart::initGUI() { - setXMLFile("kfilereplacepartui.rc"); + setXMLFile("tdefilereplacepartui.rc"); actionCollection()->setHighlightingEnabled(true); @@ -592,7 +592,7 @@ void KFileReplacePart::initGUI() (void)new KToggleAction(i18n("Case &Sensitive"), "casesensitive_option", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOptionCaseSensitive()), actionCollection(), "options_case"); (void)new KToggleAction(i18n("Enable Commands &in Replace String: [$command:option$]"), "command_option", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOptionVariables()), actionCollection(), "options_var"); (void)new KToggleAction(i18n("Enable &Regular Expressions"), "regularexpression_option", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOptionRegularExpressions()), actionCollection(), "options_regularexpressions"); - (void)new KAction(i18n("Configure &KFileReplace..."), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOptionPreferences()), actionCollection(), "configure_kfilereplace"); + (void)new KAction(i18n("Configure &KFileReplace..."), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOptionPreferences()), actionCollection(), "configure_tdefilereplace"); // Results (void)new KAction(i18n("&Properties"), "informations", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultProperties()), actionCollection(), "results_infos"); @@ -606,8 +606,8 @@ void KFileReplacePart::initGUI() (void)new KAction(i18n("&Delete"), "editdelete", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultDelete()), actionCollection(), "results_delete"); (void)new KAction(i18n("E&xpand Tree"), 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultTreeExpand()), actionCollection(), "results_treeexpand"); (void)new KAction(i18n("&Reduce Tree"), 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultTreeReduce()), actionCollection(), "results_treereduce"); - (void)new KAction(i18n("&About KFileReplace"), "kfilereplace", 0, TQT_TQOBJECT(this), TQT_SLOT(showAboutApplication()), actionCollection(), "help_about_kfilereplace"); - (void)new KAction(i18n("KFileReplace &Handbook"), "help", 0, TQT_TQOBJECT(this), TQT_SLOT(appHelpActivated()), actionCollection(), "help_kfilereplace"); + (void)new KAction(i18n("&About KFileReplace"), "tdefilereplace", 0, TQT_TQOBJECT(this), TQT_SLOT(showAboutApplication()), actionCollection(), "help_about_tdefilereplace"); + (void)new KAction(i18n("KFileReplace &Handbook"), "help", 0, TQT_TQOBJECT(this), TQT_SLOT(appHelpActivated()), actionCollection(), "help_tdefilereplace"); (void)new KAction(i18n("&Report Bug"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(reportBug()), actionCollection(), "report_bug"); } @@ -645,7 +645,7 @@ void KFileReplacePart::freezeActions() actionCollection()->action("options_case")->setEnabled(false); actionCollection()->action("options_var")->setEnabled(false); actionCollection()->action("options_regularexpressions")->setEnabled(false); - actionCollection()->action("configure_kfilereplace")->setEnabled(false); + actionCollection()->action("configure_tdefilereplace")->setEnabled(false); actionCollection()->action("results_infos")->setEnabled(false); actionCollection()->action("results_openfile")->setEnabled(false); if (actionCollection()->action("results_editfile")) @@ -1517,7 +1517,7 @@ void KFileReplacePart::loadRulesFile(const TQString& fileName) { file.close(); - KMessageBox::information(m_w, i18n("File %1 seems not to be written in new kfr format. Remember that the old kfr format will be soon abandoned. You can convert your old rules files by simply saving them with kfilereplace.").arg(fileName),i18n("Warning")); + KMessageBox::information(m_w, i18n("File %1 seems not to be written in new kfr format. Remember that the old kfr format will be soon abandoned. You can convert your old rules files by simply saving them with tdefilereplace.").arg(fileName),i18n("Warning")); KFileReplaceLib::convertOldToNewKFRFormat(fileName, sv); @@ -1676,4 +1676,4 @@ void KFileReplacePart::whatsThis() actionCollection()->action("options_regularexpressions")->setWhatsThis(optionsRegularExpressionsWhatthis); } -#include "kfilereplacepart.moc" +#include "tdefilereplacepart.moc" diff --git a/kfilereplace/kfilereplacepart.desktop b/tdefilereplace/tdefilereplacepart.desktop similarity index 98% rename from kfilereplace/kfilereplacepart.desktop rename to tdefilereplace/tdefilereplacepart.desktop index f8c01e3e..de5ba1ee 100644 --- a/kfilereplace/kfilereplacepart.desktop +++ b/tdefilereplace/tdefilereplacepart.desktop @@ -1,9 +1,9 @@ [Desktop Entry] Type=Service MimeType=inode/directory -Icon=kfilereplace.png +Icon=tdefilereplace.png ServiceTypes=KParts/ReadOnlyPart -X-TDE-Library=libkfilereplacepart +X-TDE-Library=libtdefilereplacepart Comment=A batch search and replace tool Comment[bg]=Търсене и замяна във фонов режим Comment[ca]=Una eina per a la cerca i substitució per lots diff --git a/kfilereplace/kfilereplacepart.h b/tdefilereplace/tdefilereplacepart.h similarity index 94% rename from kfilereplace/kfilereplacepart.h rename to tdefilereplace/tdefilereplacepart.h index cc427153..d4f84b77 100644 --- a/kfilereplace/kfilereplacepart.h +++ b/tdefilereplace/tdefilereplacepart.h @@ -1,6 +1,6 @@ // // -// C++ Interface: kfilereplacepart +// C++ Interface: tdefilereplacepart // // Description: // @@ -101,12 +101,12 @@ class KFileReplacePart: public KParts::ReadOnlyPart void initView(); /** - * This method freezes the GUI of kfilereplace during searching + * This method freezes the GUI of tdefilereplace during searching */ void freezeActions(); /** - * These methods load the resources from kfilereplacerc + * These methods load the resources from tdefilereplacerc */ void loadOptionsFromRC(); void loadOptions(); @@ -118,7 +118,7 @@ class KFileReplacePart: public KParts::ReadOnlyPart void loadBackupExtensionOptions(); /** - * These methods save the resources to kfilereplacerc + * These methods save the resources to tdefilereplacerc */ void saveOptionsToRC(); void saveOptions(); diff --git a/kfilereplace/kfilereplacepartui.rc b/tdefilereplace/tdefilereplacepartui.rc similarity index 90% rename from kfilereplace/kfilereplacepartui.rc rename to tdefilereplace/tdefilereplacepartui.rc index 66946878..797809c6 100644 --- a/kfilereplace/kfilereplacepartui.rc +++ b/tdefilereplace/tdefilereplacepartui.rc @@ -1,7 +1,7 @@ - + -

    Search/&Replace + Search/&Replace @@ -42,13 +42,13 @@ &Settings - + &Help - + - + diff --git a/kfilereplace/kfilereplaceui.rc b/tdefilereplace/tdefilereplaceui.rc similarity index 63% rename from kfilereplace/kfilereplaceui.rc rename to tdefilereplace/tdefilereplaceui.rc index 2f645413..e70165ae 100644 --- a/kfilereplace/kfilereplaceui.rc +++ b/tdefilereplace/tdefilereplaceui.rc @@ -1,10 +1,10 @@ - + &File - Search/&Replace + Search/&Replace diff --git a/kfilereplace/kfilereplaceview.cpp b/tdefilereplace/tdefilereplaceview.cpp similarity index 98% rename from kfilereplace/kfilereplaceview.cpp rename to tdefilereplace/tdefilereplaceview.cpp index 5996193e..b7a8c6be 100644 --- a/kfilereplace/kfilereplaceview.cpp +++ b/tdefilereplace/tdefilereplaceview.cpp @@ -1,5 +1,5 @@ /***************************************************************************** - kfilereplaceview.cpp - description + tdefilereplaceview.cpp - description ------------------- begin : sam oct 16 15:28:00 CEST 1999 copyright : (C) 1999 by Fran�is Dupoux @@ -33,11 +33,11 @@ //#include #include #include -#include +#include // local -#include "kfilereplaceview.h" -#include "kfilereplacelib.h" +#include "tdefilereplaceview.h" +#include "tdefilereplacelib.h" #include "kaddstringdlg.h" #include "whatthis.h" @@ -669,4 +669,4 @@ void KFileReplaceView::whatsThis() TQWhatsThis::add(getResultsView(), lvResultWhatthis); TQWhatsThis::add(getStringsView(), lvStringsWhatthis); } -#include "kfilereplaceview.moc" +#include "tdefilereplaceview.moc" diff --git a/kfilereplace/kfilereplaceview.h b/tdefilereplace/tdefilereplaceview.h similarity index 97% rename from kfilereplace/kfilereplaceview.h rename to tdefilereplace/tdefilereplaceview.h index 4df878cf..adb77f6b 100644 --- a/kfilereplace/kfilereplaceview.h +++ b/tdefilereplace/tdefilereplaceview.h @@ -1,5 +1,5 @@ /*************************************************************************** - kfilereplaceview.h - description + tdefilereplaceview.h - description ------------------- begin : sam oct 16 15:28:00 CEST 1999 copyright : (C) 1999 by Franois Dupoux @@ -32,7 +32,7 @@ class KPopupMenu; class KListView; //local -#include "kfilereplaceviewwdg.h" +#include "tdefilereplaceviewwdg.h" #include "configurationclasses.h" class coord diff --git a/kfilereplace/kfilereplaceviewwdg.ui b/tdefilereplace/tdefilereplaceviewwdg.ui similarity index 100% rename from kfilereplace/kfilereplaceviewwdg.ui rename to tdefilereplace/tdefilereplaceviewwdg.ui diff --git a/kfilereplace/toolbar/CMakeLists.txt b/tdefilereplace/toolbar/CMakeLists.txt similarity index 77% rename from kfilereplace/toolbar/CMakeLists.txt rename to tdefilereplace/toolbar/CMakeLists.txt index 5496d621..95cdbd9f 100644 --- a/kfilereplace/toolbar/CMakeLists.txt +++ b/tdefilereplace/toolbar/CMakeLists.txt @@ -10,4 +10,4 @@ ################################################# -tde_install_icons( DESTINATION ${DATA_INSTALL_DIR}/kfilereplacepart/icons ) +tde_install_icons( DESTINATION ${DATA_INSTALL_DIR}/tdefilereplacepart/icons ) diff --git a/tdefilereplace/toolbar/Makefile.am b/tdefilereplace/toolbar/Makefile.am new file mode 100644 index 00000000..fb5c86b8 --- /dev/null +++ b/tdefilereplace/toolbar/Makefile.am @@ -0,0 +1,3 @@ +appdir = $(kde_datadir)/tdefilereplacepart/icons +app_ICON = AUTO + diff --git a/kfilereplace/toolbar/cr22-action-back.png b/tdefilereplace/toolbar/cr22-action-back.png similarity index 100% rename from kfilereplace/toolbar/cr22-action-back.png rename to tdefilereplace/toolbar/cr22-action-back.png diff --git a/kfilereplace/toolbar/cr22-action-backup_option.png b/tdefilereplace/toolbar/cr22-action-backup_option.png similarity index 100% rename from kfilereplace/toolbar/cr22-action-backup_option.png rename to tdefilereplace/toolbar/cr22-action-backup_option.png diff --git a/kfilereplace/toolbar/cr22-action-casesensitive_option.png b/tdefilereplace/toolbar/cr22-action-casesensitive_option.png similarity index 100% rename from kfilereplace/toolbar/cr22-action-casesensitive_option.png rename to tdefilereplace/toolbar/cr22-action-casesensitive_option.png diff --git a/kfilereplace/toolbar/cr22-action-command_option.png b/tdefilereplace/toolbar/cr22-action-command_option.png similarity index 100% rename from kfilereplace/toolbar/cr22-action-command_option.png rename to tdefilereplace/toolbar/cr22-action-command_option.png diff --git a/kfilereplace/toolbar/cr22-action-editadd.png b/tdefilereplace/toolbar/cr22-action-editadd.png similarity index 100% rename from kfilereplace/toolbar/cr22-action-editadd.png rename to tdefilereplace/toolbar/cr22-action-editadd.png diff --git a/kfilereplace/toolbar/cr22-action-editremove.png b/tdefilereplace/toolbar/cr22-action-editremove.png similarity index 100% rename from kfilereplace/toolbar/cr22-action-editremove.png rename to tdefilereplace/toolbar/cr22-action-editremove.png diff --git a/kfilereplace/toolbar/cr22-action-filereplace.png b/tdefilereplace/toolbar/cr22-action-filereplace.png similarity index 100% rename from kfilereplace/toolbar/cr22-action-filereplace.png rename to tdefilereplace/toolbar/cr22-action-filereplace.png diff --git a/kfilereplace/toolbar/cr22-action-filesearch.png b/tdefilereplace/toolbar/cr22-action-filesearch.png similarity index 100% rename from kfilereplace/toolbar/cr22-action-filesearch.png rename to tdefilereplace/toolbar/cr22-action-filesearch.png diff --git a/kfilereplace/toolbar/cr22-action-filesimulate.png b/tdefilereplace/toolbar/cr22-action-filesimulate.png similarity index 100% rename from kfilereplace/toolbar/cr22-action-filesimulate.png rename to tdefilereplace/toolbar/cr22-action-filesimulate.png diff --git a/kfilereplace/toolbar/cr22-action-informations.png b/tdefilereplace/toolbar/cr22-action-informations.png similarity index 100% rename from kfilereplace/toolbar/cr22-action-informations.png rename to tdefilereplace/toolbar/cr22-action-informations.png diff --git a/kfilereplace/toolbar/cr22-action-invert.png b/tdefilereplace/toolbar/cr22-action-invert.png similarity index 100% rename from kfilereplace/toolbar/cr22-action-invert.png rename to tdefilereplace/toolbar/cr22-action-invert.png diff --git a/kfilereplace/toolbar/cr22-action-next.png b/tdefilereplace/toolbar/cr22-action-next.png similarity index 100% rename from kfilereplace/toolbar/cr22-action-next.png rename to tdefilereplace/toolbar/cr22-action-next.png diff --git a/kfilereplace/toolbar/cr22-action-projectopen.png b/tdefilereplace/toolbar/cr22-action-projectopen.png similarity index 100% rename from kfilereplace/toolbar/cr22-action-projectopen.png rename to tdefilereplace/toolbar/cr22-action-projectopen.png diff --git a/kfilereplace/toolbar/cr22-action-recursive_option.png b/tdefilereplace/toolbar/cr22-action-recursive_option.png similarity index 100% rename from kfilereplace/toolbar/cr22-action-recursive_option.png rename to tdefilereplace/toolbar/cr22-action-recursive_option.png diff --git a/kfilereplace/toolbar/cr22-action-regularexpression_option.png b/tdefilereplace/toolbar/cr22-action-regularexpression_option.png similarity index 100% rename from kfilereplace/toolbar/cr22-action-regularexpression_option.png rename to tdefilereplace/toolbar/cr22-action-regularexpression_option.png diff --git a/kfilereplace/toolbar/cr22-action-unsortedList.png b/tdefilereplace/toolbar/cr22-action-unsortedList.png similarity index 100% rename from kfilereplace/toolbar/cr22-action-unsortedList.png rename to tdefilereplace/toolbar/cr22-action-unsortedList.png diff --git a/kfilereplace/tutorial.kwd b/tdefilereplace/tutorial.kwd similarity index 100% rename from kfilereplace/tutorial.kwd rename to tdefilereplace/tutorial.kwd diff --git a/kfilereplace/whatthis.h b/tdefilereplace/whatthis.h similarity index 97% rename from kfilereplace/whatthis.h rename to tdefilereplace/whatthis.h index 09f6ac80..6692d373 100644 --- a/kfilereplace/whatthis.h +++ b/tdefilereplace/whatthis.h @@ -62,7 +62,7 @@ namespace whatthisNameSpace const TQString chbIgnoreWhitespacesWhatthis =""; - const TQString chbFollowSymLinksWhatthis = i18n("If kfilereplace encounters a symbolic link treats it like a normal folder or file."); + const TQString chbFollowSymLinksWhatthis = i18n("If tdefilereplace encounters a symbolic link treats it like a normal folder or file."); const TQString chbIgnoreHiddenWhatthis = i18n("Enable this option to ignore hidden files or folders.");