diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:03:37 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:03:37 -0600 |
| commit | 2e25fa39cd67cca2472d3eabdb478feb517d72a5 (patch) | |
| tree | 63725962f632d152cbf20709191d39f6fc865966 /kamera/kcontrol | |
| 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 'kamera/kcontrol')
| -rw-r--r-- | kamera/kcontrol/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kamera/kcontrol/kamera.desktop | 2 | ||||
| -rw-r--r-- | kamera/kcontrol/kameradevice.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/kamera/kcontrol/CMakeLists.txt b/kamera/kcontrol/CMakeLists.txt index c4a395ab..c901d4b4 100644 --- a/kamera/kcontrol/CMakeLists.txt +++ b/kamera/kcontrol/CMakeLists.txt @@ -31,6 +31,6 @@ install( FILES kamera.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) tde_add_kpart( kcm_kamera SHARED AUTOMOC SOURCES kamera.cpp kameradevice.cpp kameraconfigdialog.cpp - LINK kio-shared ${GPHOTO2_LIBRARIES} + LINK tdeio-shared ${GPHOTO2_LIBRARIES} DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kamera/kcontrol/kamera.desktop b/kamera/kcontrol/kamera.desktop index ac9f737e..d06c4be9 100644 --- a/kamera/kcontrol/kamera.desktop +++ b/kamera/kcontrol/kamera.desktop @@ -188,6 +188,6 @@ Type=Application X-TDE-Library=kamera X-TDE-ModuleType=Library Icon=camera -Exec=kcmshell kamera +Exec=tdecmshell kamera DocPath=kamera/index.html Categories=Qt;TDE;Settings;X-TDE-settings-hardware; diff --git a/kamera/kcontrol/kameradevice.cpp b/kamera/kcontrol/kameradevice.cpp index 20d090fa..e6f26449 100644 --- a/kamera/kcontrol/kameradevice.cpp +++ b/kamera/kcontrol/kameradevice.cpp @@ -32,7 +32,7 @@ #include <tqgrid.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klistview.h> #include <kmessagebox.h> #include <kdebug.h> |