diff options
-rw-r--r-- | configdialog/CMakeLists.txt | 2 | ||||
-rw-r--r-- | configdialog/kbfxconfigapp.h | 6 | ||||
-rw-r--r-- | configdialog/kbfxconfigdlgfonts-old.ui | 6 | ||||
-rw-r--r-- | configdialog/kbfxconfigdlglayout.ui | 2 | ||||
-rw-r--r-- | configdialog/kbfxconfigdlgthemes.ui | 4 | ||||
-rw-r--r-- | kbfxlib/common/CMakeLists.txt | 2 | ||||
-rw-r--r-- | kbfxlib/common/kbfxconfig.h | 4 | ||||
-rw-r--r-- | kbfxlib/common/kbfxkiodownload.h | 2 | ||||
-rw-r--r-- | kbfxlib/common/kbfxthemesdata.h | 2 | ||||
-rw-r--r-- | kbfxlib/data/CMakeLists.txt | 2 | ||||
-rw-r--r-- | plugins/applications/CMakeLists.txt | 2 | ||||
-rw-r--r-- | plugins/applications/kbfxplasmadataplugin.cpp | 2 | ||||
-rw-r--r-- | plugins/plasmoids/CMakeLists.txt | 2 | ||||
-rw-r--r-- | plugins/recentstuff/CMakeLists.txt | 2 | ||||
-rw-r--r-- | plugins/settings/CMakeLists.txt | 2 | ||||
-rw-r--r-- | plugins/settings/kbfxplasmadatapluginsettings.cpp | 2 | ||||
-rw-r--r-- | plugins/strigi/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/kbfxspinx.h | 2 |
19 files changed, 25 insertions, 25 deletions
diff --git a/configdialog/CMakeLists.txt b/configdialog/CMakeLists.txt index b8ee279..5776226 100644 --- a/configdialog/CMakeLists.txt +++ b/configdialog/CMakeLists.txt @@ -36,7 +36,7 @@ tde_add_executable( kbfxconfigapp AUTOMOC kbfxconfigdlgstyle.ui kbfxconfigdlgtooltip.ui kbfxconfigdlgfonts-old.ui kbfxconfigdlgplugins.ui kbfxconfigdlglayout.ui - LINK ${TQT_LIBRARIES} kbfxdata kbfxcommon tdecore-shared tdeui-shared DCOP-shared kio-shared tdehtml-shared + LINK ${TQT_LIBRARIES} kbfxdata kbfxcommon tdecore-shared tdeui-shared DCOP-shared tdeio-shared tdehtml-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/configdialog/kbfxconfigapp.h b/configdialog/kbfxconfigapp.h index 985daac..3379780 100644 --- a/configdialog/kbfxconfigapp.h +++ b/configdialog/kbfxconfigapp.h @@ -46,12 +46,12 @@ #include <kcmdlineargs.h> #include <kcombobox.h> #include <kdebug.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <tdehtml_part.h> #include <tdehtmlview.h> #include <kicondialog.h> -#include <kio/job.h> -#include <kio/netaccess.h> +#include <tdeio/job.h> +#include <tdeio/netaccess.h> #include <klocale.h> #include <kmainwindow.h> #include <kmessagebox.h> diff --git a/configdialog/kbfxconfigdlgfonts-old.ui b/configdialog/kbfxconfigdlgfonts-old.ui index 9a33dba..95b1a0d 100644 --- a/configdialog/kbfxconfigdlgfonts-old.ui +++ b/configdialog/kbfxconfigdlgfonts-old.ui @@ -1134,10 +1134,10 @@ <include location="global" impldecl="in declaration">kdebug.h</include> <include location="global" impldecl="in declaration">kbfxthemesdata.h</include> <include location="global" impldecl="in declaration">kstandarddirs.h</include> - <include location="global" impldecl="in declaration">kfiledialog.h</include> - <include location="global" impldecl="in declaration">kio/netaccess.h</include> + <include location="global" impldecl="in declaration">tdefiledialog.h</include> + <include location="global" impldecl="in declaration">tdeio/netaccess.h</include> <include location="global" impldecl="in declaration">kmessagebox.h</include> - <include location="global" impldecl="in declaration">kconfig.h</include> + <include location="global" impldecl="in declaration">tdeconfig.h</include> <include location="global" impldecl="in declaration">kbfxfontchooser.h</include> <include location="local" impldecl="in implementation">kbfxconfigdlgfonts-old.ui.h</include> </includes> diff --git a/configdialog/kbfxconfigdlglayout.ui b/configdialog/kbfxconfigdlglayout.ui index e707cea..7c0060f 100644 --- a/configdialog/kbfxconfigdlglayout.ui +++ b/configdialog/kbfxconfigdlglayout.ui @@ -1053,7 +1053,7 @@ <include location="global" impldecl="in declaration">tqstringlist.h</include> <include location="global" impldecl="in declaration">kstandarddirs.h</include> <include location="global" impldecl="in declaration">kmessagebox.h</include> - <include location="global" impldecl="in declaration">kfiledialog.h</include> + <include location="global" impldecl="in declaration">tdefiledialog.h</include> <include location="local" impldecl="in implementation">kbfxconfigdlglayout.ui.h</include> </includes> <variables> diff --git a/configdialog/kbfxconfigdlgthemes.ui b/configdialog/kbfxconfigdlgthemes.ui index 4826f0c..25d7499 100644 --- a/configdialog/kbfxconfigdlgthemes.ui +++ b/configdialog/kbfxconfigdlgthemes.ui @@ -983,8 +983,8 @@ <include location="global" impldecl="in declaration">kdebug.h</include> <include location="global" impldecl="in declaration">tqstringlist.h</include> <include location="global" impldecl="in declaration">kmessagebox.h</include> - <include location="global" impldecl="in declaration">kio/netaccess.h</include> - <include location="global" impldecl="in declaration">kfiledialog.h</include> + <include location="global" impldecl="in declaration">tdeio/netaccess.h</include> + <include location="global" impldecl="in declaration">tdefiledialog.h</include> <include location="global" impldecl="in declaration">ktar.h</include> <include location="global" impldecl="in declaration">kstandarddirs.h</include> <include location="global" impldecl="in declaration">kbfxthemesdata.h</include> diff --git a/kbfxlib/common/CMakeLists.txt b/kbfxlib/common/CMakeLists.txt index 297dac9..6df4f68 100644 --- a/kbfxlib/common/CMakeLists.txt +++ b/kbfxlib/common/CMakeLists.txt @@ -35,7 +35,7 @@ set( ${target}_SRCS tde_add_library( ${target} SHARED AUTOMOC SOURCES ${${target}_SRCS} # VERSION 4.2.0 - LINK DCOP-shared tdecore-shared tdeui-shared kio-shared tdehtml-shared ${M_LIBRARY} + LINK DCOP-shared tdecore-shared tdeui-shared tdeio-shared tdehtml-shared ${M_LIBRARY} DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/kbfxlib/common/kbfxconfig.h b/kbfxlib/common/kbfxconfig.h index 8de6886..e92a151 100644 --- a/kbfxlib/common/kbfxconfig.h +++ b/kbfxlib/common/kbfxconfig.h @@ -32,8 +32,8 @@ #include <tqstring.h> #include <kapplication.h> -#include <kconfig.h> -#include <kconfigskeleton.h> +#include <tdeconfig.h> +#include <tdeconfigskeleton.h> #include <kdebug.h> #include <kglobal.h> #include <kiconloader.h> diff --git a/kbfxlib/common/kbfxkiodownload.h b/kbfxlib/common/kbfxkiodownload.h index 9646176..3e9df44 100644 --- a/kbfxlib/common/kbfxkiodownload.h +++ b/kbfxlib/common/kbfxkiodownload.h @@ -22,7 +22,7 @@ #ifndef KBFX_KIO_DOWNLOAD_H #define KBFX_KIO_DOWNLOAD_H -#include <kio/job.h> +#include <tdeio/job.h> #include <ktempfile.h> #include <kdebug.h> diff --git a/kbfxlib/common/kbfxthemesdata.h b/kbfxlib/common/kbfxthemesdata.h index 19e494e..cb70efa 100644 --- a/kbfxlib/common/kbfxthemesdata.h +++ b/kbfxlib/common/kbfxthemesdata.h @@ -24,7 +24,7 @@ #include <kdebug.h> #include <tqstringlist.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kstandarddirs.h> #include <tqmap.h> #include <tqdir.h> diff --git a/kbfxlib/data/CMakeLists.txt b/kbfxlib/data/CMakeLists.txt index bd2e102..4be93b4 100644 --- a/kbfxlib/data/CMakeLists.txt +++ b/kbfxlib/data/CMakeLists.txt @@ -36,7 +36,7 @@ set( ${target}_SRCS tde_add_library( ${target} SHARED AUTOMOC SOURCES ${${target}_SRCS} # VERSION 4.2.0 - LINK DCOP-shared tdecore-shared tdeui-shared kio-shared tdehtml-shared ${M_LIBRARY} + LINK DCOP-shared tdecore-shared tdeui-shared tdeio-shared tdehtml-shared ${M_LIBRARY} DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/plugins/applications/CMakeLists.txt b/plugins/applications/CMakeLists.txt index 6bb84c2..203fe59 100644 --- a/plugins/applications/CMakeLists.txt +++ b/plugins/applications/CMakeLists.txt @@ -39,7 +39,7 @@ set( ${target}_SRCS tde_add_library( ${target} SHARED AUTOMOC SOURCES ${${target}_SRCS} # VERSION 4.2.0 - LINK DCOP-shared tdecore-shared tdeui-shared kio-shared tdehtml-shared ${M_LIBRARY} kbfxdata + LINK DCOP-shared tdecore-shared tdeui-shared tdeio-shared tdehtml-shared ${M_LIBRARY} kbfxdata DESTINATION ${LIB_INSTALL_DIR}/kbfx/plugins ) diff --git a/plugins/applications/kbfxplasmadataplugin.cpp b/plugins/applications/kbfxplasmadataplugin.cpp index 1c43edc..43312ff 100644 --- a/plugins/applications/kbfxplasmadataplugin.cpp +++ b/plugins/applications/kbfxplasmadataplugin.cpp @@ -105,7 +105,7 @@ view () tr2i18n ( "Do NOT Autorepair" ) ); if ( messageBoxUserResReturn == KMessageBox::Yes ) { - KRun::runCommand ( "kbuildsycoca" ); + KRun::runCommand ( "tdebuildsycoca" ); // if ( ! ConfigInit().m_KbfxWatcher ) // { DCOPRef m_kickerPanel("kicker", "kicker"); diff --git a/plugins/plasmoids/CMakeLists.txt b/plugins/plasmoids/CMakeLists.txt index d096771..7c40c2e 100644 --- a/plugins/plasmoids/CMakeLists.txt +++ b/plugins/plasmoids/CMakeLists.txt @@ -39,7 +39,7 @@ set( ${target}_SRCS tde_add_library( ${target} SHARED AUTOMOC SOURCES ${${target}_SRCS} # VERSION 4.2.0 - LINK DCOP-shared tdecore-shared tdeui-shared kio-shared tdehtml-shared ${M_LIBRARY} kbfxdata + LINK DCOP-shared tdecore-shared tdeui-shared tdeio-shared tdehtml-shared ${M_LIBRARY} kbfxdata DESTINATION ${LIB_INSTALL_DIR}/kbfx/plugins ) diff --git a/plugins/recentstuff/CMakeLists.txt b/plugins/recentstuff/CMakeLists.txt index d8c168f..7ea02fa 100644 --- a/plugins/recentstuff/CMakeLists.txt +++ b/plugins/recentstuff/CMakeLists.txt @@ -39,7 +39,7 @@ set( ${target}_SRCS tde_add_library( ${target} SHARED AUTOMOC SOURCES ${${target}_SRCS} # VERSION 4.2.0 - LINK DCOP-shared tdecore-shared tdeui-shared kio-shared tdehtml-shared ${M_LIBRARY} kbfxdata + LINK DCOP-shared tdecore-shared tdeui-shared tdeio-shared tdehtml-shared ${M_LIBRARY} kbfxdata DESTINATION ${LIB_INSTALL_DIR}/kbfx/plugins ) diff --git a/plugins/settings/CMakeLists.txt b/plugins/settings/CMakeLists.txt index 3f6b153..0677fcd 100644 --- a/plugins/settings/CMakeLists.txt +++ b/plugins/settings/CMakeLists.txt @@ -39,7 +39,7 @@ set( ${target}_SRCS tde_add_library( ${target} SHARED AUTOMOC SOURCES ${${target}_SRCS} # VERSION 4.2.0 - LINK DCOP-shared tdecore-shared tdeui-shared kio-shared tdehtml-shared ${M_LIBRARY} kbfxdata + LINK DCOP-shared tdecore-shared tdeui-shared tdeio-shared tdehtml-shared ${M_LIBRARY} kbfxdata DESTINATION ${LIB_INSTALL_DIR}/kbfx/plugins ) diff --git a/plugins/settings/kbfxplasmadatapluginsettings.cpp b/plugins/settings/kbfxplasmadatapluginsettings.cpp index e81d7b5..def2bbd 100644 --- a/plugins/settings/kbfxplasmadatapluginsettings.cpp +++ b/plugins/settings/kbfxplasmadatapluginsettings.cpp @@ -106,7 +106,7 @@ view () tr2i18n ( "Do NOT Autorepair" ) ); if ( messageBoxUserResReturn == KMessageBox::Yes ) { - KRun::runCommand ( "kbuildsycoca" ); + KRun::runCommand ( "tdebuildsycoca" ); // if ( ! ConfigInit().m_KbfxWatcher ) // { DCOPRef m_kickerPanel("kicker", "kicker"); diff --git a/plugins/strigi/CMakeLists.txt b/plugins/strigi/CMakeLists.txt index 2c8aa03..3f71cda 100644 --- a/plugins/strigi/CMakeLists.txt +++ b/plugins/strigi/CMakeLists.txt @@ -39,7 +39,7 @@ set( ${target}_SRCS tde_add_library( ${target} SHARED AUTOMOC SOURCES ${${target}_SRCS} # VERSION 4.2.0 - LINK DCOP-shared tdecore-shared tdeui-shared kio-shared tdehtml-shared ${M_LIBRARY} ${STRIGICLIENT_LIBRARY} kbfxdata kbfxplasmadatasettings + LINK DCOP-shared tdecore-shared tdeui-shared tdeio-shared tdehtml-shared ${M_LIBRARY} ${STRIGICLIENT_LIBRARY} kbfxdata kbfxplasmadatasettings DESTINATION ${LIB_INSTALL_DIR}/kbfx/plugins ) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ebbff82..ec4cc46 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -41,7 +41,7 @@ set( ${target}_SRCS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK tdecore-shared tdeui-shared kio-shared kbfxcommon kbfxdata + LINK tdecore-shared tdeui-shared tdeio-shared kbfxcommon kbfxdata DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/src/kbfxspinx.h b/src/kbfxspinx.h index f7745d2..d0bc1ce 100644 --- a/src/kbfxspinx.h +++ b/src/kbfxspinx.h @@ -38,7 +38,7 @@ #include <dcopobject.h> #include <dcopref.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kdirwatch.h> #include <kglobal.h> |