TDE
/
kbfx
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kbfx
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename a number of libraries and executables to avoid conflicts with KDE4

Browse Source
pull/1/head
Timothy Pearson 12 years ago
parent d6cfa98bec
commit 91726329ab
19 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File

2
configdialog/CMakeLists.txt
Unescape Escape View File

@ -36,7 +36,7 @@ tde_add_executable( kbfxconfigapp AUTOMOC
kbfxconfigdlgstyle.ui kbfxconfigdlgtooltip.ui kbfxconfigdlgstyle.ui kbfxconfigdlgtooltip.ui
kbfxconfigdlgfonts-old.ui kbfxconfigdlgplugins.ui kbfxconfigdlgfonts-old.ui kbfxconfigdlgplugins.ui
kbfxconfigdlglayout.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} DESTINATION ${BIN_INSTALL_DIR}
) )

6
configdialog/kbfxconfigapp.h
Unescape Escape View File

@ -46,12 +46,12 @@
#include <kcmdlineargs.h> #include <kcmdlineargs.h>
#include <kcombobox.h> #include <kcombobox.h>
#include <kdebug.h> #include <kdebug.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <tdehtml_part.h> #include <tdehtml_part.h>
#include <tdehtmlview.h> #include <tdehtmlview.h>
#include <kicondialog.h> #include <kicondialog.h>
#include <kio/job.h> #include <tdeio/job.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <klocale.h> #include <klocale.h>
#include <kmainwindow.h> #include <kmainwindow.h>
#include <kmessagebox.h> #include <kmessagebox.h>

6
configdialog/kbfxconfigdlgfonts-old.ui
Unescape Escape View File

@ -1134,10 +1134,10 @@
<include location="global" impldecl="in declaration">kdebug.h</include> <include location="global" impldecl="in declaration">kdebug.h</include>
<include location="global" impldecl="in declaration">kbfxthemesdata.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">kstandarddirs.h</include>
<include location="global" impldecl="in declaration">kfiledialog.h</include> <include location="global" impldecl="in declaration">tdefiledialog.h</include>
<include location="global" impldecl="in declaration">kio/netaccess.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">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="global" impldecl="in declaration">kbfxfontchooser.h</include>
<include location="local" impldecl="in implementation">kbfxconfigdlgfonts-old.ui.h</include> <include location="local" impldecl="in implementation">kbfxconfigdlgfonts-old.ui.h</include>
</includes> </includes>

2
configdialog/kbfxconfigdlglayout.ui
Unescape Escape View File

@ -1053,7 +1053,7 @@
<include location="global" impldecl="in declaration">tqstringlist.h</include> <include location="global" impldecl="in declaration">tqstringlist.h</include>
<include location="global" impldecl="in declaration">kstandarddirs.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">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> <include location="local" impldecl="in implementation">kbfxconfigdlglayout.ui.h</include>
</includes> </includes>
<variables> <variables>

4
configdialog/kbfxconfigdlgthemes.ui
Unescape Escape View File

@ -983,8 +983,8 @@
<include location="global" impldecl="in declaration">kdebug.h</include> <include location="global" impldecl="in declaration">kdebug.h</include>
<include location="global" impldecl="in declaration">tqstringlist.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">kmessagebox.h</include>
<include location="global" impldecl="in declaration">kio/netaccess.h</include> <include location="global" impldecl="in declaration">tdeio/netaccess.h</include>
<include location="global" impldecl="in declaration">kfiledialog.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">ktar.h</include>
<include location="global" impldecl="in declaration">kstandarddirs.h</include> <include location="global" impldecl="in declaration">kstandarddirs.h</include>
<include location="global" impldecl="in declaration">kbfxthemesdata.h</include> <include location="global" impldecl="in declaration">kbfxthemesdata.h</include>

2
kbfxlib/common/CMakeLists.txt
Unescape Escape View File

@ -35,7 +35,7 @@ set( ${target}_SRCS
tde_add_library( ${target} SHARED AUTOMOC tde_add_library( ${target} SHARED AUTOMOC
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
# VERSION 4.2.0 # 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} DESTINATION ${LIB_INSTALL_DIR}
) )

4
kbfxlib/common/kbfxconfig.h
Unescape Escape View File

@ -32,8 +32,8 @@
#include <tqstring.h> #include <tqstring.h>
#include <kapplication.h> #include <kapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kconfigskeleton.h> #include <tdeconfigskeleton.h>
#include <kdebug.h> #include <kdebug.h>
#include <kglobal.h> #include <kglobal.h>
#include <kiconloader.h> #include <kiconloader.h>

2
kbfxlib/common/kbfxkiodownload.h
Unescape Escape View File

@ -22,7 +22,7 @@
#ifndef KBFX_KIO_DOWNLOAD_H #ifndef KBFX_KIO_DOWNLOAD_H
#define KBFX_KIO_DOWNLOAD_H #define KBFX_KIO_DOWNLOAD_H
#include <kio/job.h> #include <tdeio/job.h>
#include <ktempfile.h> #include <ktempfile.h>
#include <kdebug.h> #include <kdebug.h>

2
kbfxlib/common/kbfxthemesdata.h
Unescape Escape View File

@ -24,7 +24,7 @@
#include <kdebug.h> #include <kdebug.h>
#include <tqstringlist.h> #include <tqstringlist.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <tqmap.h> #include <tqmap.h>
#include <tqdir.h> #include <tqdir.h>

2
kbfxlib/data/CMakeLists.txt
Unescape Escape View File

@ -36,7 +36,7 @@ set( ${target}_SRCS
tde_add_library( ${target} SHARED AUTOMOC tde_add_library( ${target} SHARED AUTOMOC
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
# VERSION 4.2.0 # 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} DESTINATION ${LIB_INSTALL_DIR}
) )

2
plugins/applications/CMakeLists.txt
Unescape Escape View File

@ -39,7 +39,7 @@ set( ${target}_SRCS
tde_add_library( ${target} SHARED AUTOMOC tde_add_library( ${target} SHARED AUTOMOC
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
# VERSION 4.2.0 # 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 DESTINATION ${LIB_INSTALL_DIR}/kbfx/plugins
) )

2
plugins/applications/kbfxplasmadataplugin.cpp
Unescape Escape View File

@ -105,7 +105,7 @@ view ()
tr2i18n ( "Do NOT Autorepair" ) ); tr2i18n ( "Do NOT Autorepair" ) );
if ( messageBoxUserResReturn == KMessageBox::Yes ) if ( messageBoxUserResReturn == KMessageBox::Yes )
{ {
KRun::runCommand ( "kbuildsycoca" ); KRun::runCommand ( "tdebuildsycoca" );
// if ( ! ConfigInit().m_KbfxWatcher ) // if ( ! ConfigInit().m_KbfxWatcher )
// { // {
DCOPRef m_kickerPanel("kicker", "kicker"); DCOPRef m_kickerPanel("kicker", "kicker");

2
plugins/plasmoids/CMakeLists.txt
Unescape Escape View File

@ -39,7 +39,7 @@ set( ${target}_SRCS
tde_add_library( ${target} SHARED AUTOMOC tde_add_library( ${target} SHARED AUTOMOC
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
# VERSION 4.2.0 # 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 DESTINATION ${LIB_INSTALL_DIR}/kbfx/plugins
) )

2
plugins/recentstuff/CMakeLists.txt
Unescape Escape View File

@ -39,7 +39,7 @@ set( ${target}_SRCS
tde_add_library( ${target} SHARED AUTOMOC tde_add_library( ${target} SHARED AUTOMOC
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
# VERSION 4.2.0 # 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 DESTINATION ${LIB_INSTALL_DIR}/kbfx/plugins
) )

2
plugins/settings/CMakeLists.txt
Unescape Escape View File

@ -39,7 +39,7 @@ set( ${target}_SRCS
tde_add_library( ${target} SHARED AUTOMOC tde_add_library( ${target} SHARED AUTOMOC
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
# VERSION 4.2.0 # 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 DESTINATION ${LIB_INSTALL_DIR}/kbfx/plugins
) )

2
plugins/settings/kbfxplasmadatapluginsettings.cpp
Unescape Escape View File

@ -106,7 +106,7 @@ view ()
tr2i18n ( "Do NOT Autorepair" ) ); tr2i18n ( "Do NOT Autorepair" ) );
if ( messageBoxUserResReturn == KMessageBox::Yes ) if ( messageBoxUserResReturn == KMessageBox::Yes )
{ {
KRun::runCommand ( "kbuildsycoca" ); KRun::runCommand ( "tdebuildsycoca" );
// if ( ! ConfigInit().m_KbfxWatcher ) // if ( ! ConfigInit().m_KbfxWatcher )
// { // {
DCOPRef m_kickerPanel("kicker", "kicker"); DCOPRef m_kickerPanel("kicker", "kicker");

2
plugins/strigi/CMakeLists.txt
Unescape Escape View File

@ -39,7 +39,7 @@ set( ${target}_SRCS
tde_add_library( ${target} SHARED AUTOMOC tde_add_library( ${target} SHARED AUTOMOC
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
# VERSION 4.2.0 # 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 DESTINATION ${LIB_INSTALL_DIR}/kbfx/plugins
) )

2
src/CMakeLists.txt
Unescape Escape View File

@ -41,7 +41,7 @@ set( ${target}_SRCS
tde_add_kpart( ${target} AUTOMOC tde_add_kpart( ${target} AUTOMOC
SOURCES ${${target}_SRCS} 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} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

2
src/kbfxspinx.h
Unescape Escape View File

@ -38,7 +38,7 @@
#include <dcopobject.h> #include <dcopobject.h>
#include <dcopref.h> #include <dcopref.h>
#include <kapplication.h> #include <kapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <kdirwatch.h> #include <kdirwatch.h>
#include <kglobal.h> #include <kglobal.h>

Write Preview
Loading…
Cancel
Save