diff options
author | Timothy Pearson <[email protected]> | 2013-01-27 01:02:02 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-27 01:02:02 -0600 |
commit | de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf (patch) | |
tree | dbb3152c372f8620f9290137d461f3d9f9eba1cb /kcontrol/ebrowsing/plugins/shorturi | |
parent | 936d3cec490c13f2c5f7dd14f5e364fddaa6da71 (diff) | |
download | tdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.tar.gz tdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.zip |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/ebrowsing/plugins/shorturi')
-rw-r--r-- | kcontrol/ebrowsing/plugins/shorturi/CMakeLists.txt | 2 | ||||
-rw-r--r-- | kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kcontrol/ebrowsing/plugins/shorturi/CMakeLists.txt b/kcontrol/ebrowsing/plugins/shorturi/CMakeLists.txt index c8d25b1bf..4eb1c5441 100644 --- a/kcontrol/ebrowsing/plugins/shorturi/CMakeLists.txt +++ b/kcontrol/ebrowsing/plugins/shorturi/CMakeLists.txt @@ -29,6 +29,6 @@ install( FILES kshorturifilterrc DESTINATION ${CONFIG_INSTALL_DIR} ) tde_add_kpart( libkshorturifilter AUTOMOC SOURCES kshorturifilter.cpp kshorturifilter.skel - LINK kio-shared + LINK tdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp b/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp index c394de693..57bc2e92f 100644 --- a/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp +++ b/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp @@ -33,7 +33,7 @@ #include <kdebug.h> #include <kprotocolinfo.h> #include <kstandarddirs.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kmimetype.h> #include "kshorturifilter.h" @@ -48,10 +48,10 @@ /** * IMPORTANT: * If you change anything here, please run the regression test - * tdelibs/kio/tests/kurifiltertest. + * tdelibs/tdeio/tests/kurifiltertest. * * If you add anything here, make sure to add a corresponding - * test code to tdelibs/kio/tests/kurifiltertest. + * test code to tdelibs/tdeio/tests/kurifiltertest. */ typedef TQMap<TQString,TQString> EntryMap; |