diff options
| author | Timothy Pearson <[email protected]> | 2013-01-27 01:03:37 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-27 01:03:37 -0600 |
| commit | 2e25fa39cd67cca2472d3eabdb478feb517d72a5 (patch) | |
| tree | 63725962f632d152cbf20709191d39f6fc865966 /libkscan | |
| parent | 190d88dfc662f3fc466c9d1f53acbbea65f33c49 (diff) | |
| download | tdegraphics-2e25fa39cd67cca2472d3eabdb478feb517d72a5.tar.gz tdegraphics-2e25fa39cd67cca2472d3eabdb478feb517d72a5.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'libkscan')
| -rw-r--r-- | libkscan/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | libkscan/devselector.cpp | 2 | ||||
| -rw-r--r-- | libkscan/kscandevice.cpp | 2 | ||||
| -rw-r--r-- | libkscan/kscanoptset.cpp | 2 | ||||
| -rw-r--r-- | libkscan/previewer.cpp | 2 | ||||
| -rw-r--r-- | libkscan/scandialog.cpp | 2 | ||||
| -rw-r--r-- | libkscan/scanparams.cpp | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/libkscan/CMakeLists.txt b/libkscan/CMakeLists.txt index 12ecff9f..b108f9e9 100644 --- a/libkscan/CMakeLists.txt +++ b/libkscan/CMakeLists.txt @@ -43,7 +43,7 @@ tde_add_library( kscan SHARED AUTOMOC img_canvas.cpp previewer.cpp imgscaledialog.cpp sizeindicator.cpp imgscaninfo.cpp VERSION 1.0.0 - LINK kio-shared ${SANE_LIBRARIES} + LINK tdeio-shared ${SANE_LIBRARIES} DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/libkscan/devselector.cpp b/libkscan/devselector.cpp index 2945dfdd..2caa054a 100644 --- a/libkscan/devselector.cpp +++ b/libkscan/devselector.cpp @@ -31,7 +31,7 @@ #include <tqstringlist.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kglobal.h> #include <klocale.h> diff --git a/libkscan/kscandevice.cpp b/libkscan/kscandevice.cpp index d42ddb9f..41e05570 100644 --- a/libkscan/kscandevice.cpp +++ b/libkscan/kscandevice.cpp @@ -34,7 +34,7 @@ #include <kdebug.h> #include <klocale.h> #include <kglobal.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kstandarddirs.h> #include <unistd.h> diff --git a/libkscan/kscanoptset.cpp b/libkscan/kscanoptset.cpp index 0c9b76e6..84e034c8 100644 --- a/libkscan/kscanoptset.cpp +++ b/libkscan/kscanoptset.cpp @@ -22,7 +22,7 @@ #include <tqmap.h> #include <tqdict.h> #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> #include "kscandevice.h" #include "kscanoption.h" diff --git a/libkscan/previewer.cpp b/libkscan/previewer.cpp index 183c7ba6..c13e45e3 100644 --- a/libkscan/previewer.cpp +++ b/libkscan/previewer.cpp @@ -43,7 +43,7 @@ #include "kscandevice.h" #include <tqslider.h> #include <tqcheckbox.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tqbuttongroup.h> #include <tqvbuttongroup.h> #include <kmessagebox.h> diff --git a/libkscan/scandialog.cpp b/libkscan/scandialog.cpp index c4b8691b..9a0d2bf0 100644 --- a/libkscan/scandialog.cpp +++ b/libkscan/scandialog.cpp @@ -30,7 +30,7 @@ #include <kglobal.h> #include <klocale.h> #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <ksimpleconfig.h> #include <kled.h> #include <kglobalsettings.h> diff --git a/libkscan/scanparams.cpp b/libkscan/scanparams.cpp index 896bf92e..64bcde21 100644 --- a/libkscan/scanparams.cpp +++ b/libkscan/scanparams.cpp @@ -36,7 +36,7 @@ #include <tqbuttongroup.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <klocale.h> #include <kdebug.h> #include <kbuttonbox.h> |