diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:52:32 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:52:32 -0600 |
| commit | 91726329ab9745105638d8b74cfd9f000cd13af4 (patch) | |
| tree | 2e8be3b7edc2ecf47e6ee4e5a63cb45ca6819c4c /configdialog | |
| parent | d6cfa98becda3f9648dcda4dafd3de99b8733901 (diff) | |
| download | kbfx-91726329ab9745105638d8b74cfd9f000cd13af4.tar.gz kbfx-91726329ab9745105638d8b74cfd9f000cd13af4.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'configdialog')
| -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 |
5 files changed, 10 insertions, 10 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> |