diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:59 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:59 -0600 |
| commit | 1515a4f2eb9cf023ed7f9c2e10106b5e93164a08 (patch) | |
| tree | d5617734090b254659ff331ce7d1e574c4807caf /kuiviewer | |
| parent | f8069e2ea048f2657cc417d83820576ec55c181b (diff) | |
| download | tdesdk-1515a4f2eb9cf023ed7f9c2e10106b5e93164a08.tar.gz tdesdk-1515a4f2eb9cf023ed7f9c2e10106b5e93164a08.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kuiviewer')
| -rw-r--r-- | kuiviewer/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | kuiviewer/Makefile.am | 2 | ||||
| -rw-r--r-- | kuiviewer/kuiviewer.h | 2 | ||||
| -rw-r--r-- | kuiviewer/kuiviewer_part.cpp | 2 | ||||
| -rw-r--r-- | kuiviewer/kuiviewer_part.h | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/kuiviewer/CMakeLists.txt b/kuiviewer/CMakeLists.txt index 5c0fcaa0..c38517d3 100644 --- a/kuiviewer/CMakeLists.txt +++ b/kuiviewer/CMakeLists.txt @@ -46,7 +46,7 @@ install( FILES tde_add_kpart( libkuiviewerpart AUTOMOC SOURCES kuiviewer_part.cpp - LINK ktexteditor-shared ${TQTQUI_LIBRARIES} + LINK tdetexteditor-shared ${TQTQUI_LIBRARIES} DESTINATION ${PLUGIN_INSTALL_DIR} ) @@ -64,6 +64,6 @@ tde_add_kpart( quithumbnail tde_add_executable( kuiviewer AUTOMOC SOURCES main.cpp kuiviewer.cpp - LINK ktexteditor-shared + LINK tdetexteditor-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kuiviewer/Makefile.am b/kuiviewer/Makefile.am index 7f31a16d..d3ba9a11 100644 --- a/kuiviewer/Makefile.am +++ b/kuiviewer/Makefile.am @@ -25,7 +25,7 @@ bin_PROGRAMS = kuiviewer # the application source, library search path, and link libraries kuiviewer_SOURCES = main.cpp kuiviewer.cpp -kuiviewer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kuiviewer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kuiviewer_LDADD = $(LIB_KPARTS) xdg_apps_DATA =kuiviewer.desktop diff --git a/kuiviewer/kuiviewer.h b/kuiviewer/kuiviewer.h index 7ac3ed9a..e404b66a 100644 --- a/kuiviewer/kuiviewer.h +++ b/kuiviewer/kuiviewer.h @@ -28,7 +28,7 @@ #endif #include <kapplication.h> -#include <kparts/mainwindow.h> +#include <tdeparts/mainwindow.h> class KToggleAction; class KListView; diff --git a/kuiviewer/kuiviewer_part.cpp b/kuiviewer/kuiviewer_part.cpp index b14d2412..dcd33c30 100644 --- a/kuiviewer/kuiviewer_part.cpp +++ b/kuiviewer/kuiviewer_part.cpp @@ -31,7 +31,7 @@ #include <kinstance.h> #include <kio/netaccess.h> #include <klistview.h> -#include <kparts/genericfactory.h> +#include <tdeparts/genericfactory.h> #include <kstdaction.h> #include <kstyle.h> #include <tqmetaobject.h> diff --git a/kuiviewer/kuiviewer_part.h b/kuiviewer/kuiviewer_part.h index 779a51cd..a0dd6d8b 100644 --- a/kuiviewer/kuiviewer_part.h +++ b/kuiviewer/kuiviewer_part.h @@ -23,7 +23,7 @@ #define KUIVIEWERPART_H #include <tqguardedptr.h> -#include <kparts/part.h> +#include <tdeparts/part.h> class TQWidget; class KURL; |