diff options
| author | Timothy Pearson <[email protected]> | 2013-01-26 13:17:50 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-26 13:17:50 -0600 |
| commit | b363d2579af0a11b77e698aed2e1021c2233b644 (patch) | |
| tree | f4a47b87354b7a6a3b266c8121bd8ddaeb7accaa /kontact/src | |
| parent | 61bddfe3a7226b18c68a76124b727c736f431688 (diff) | |
| download | tdepim-b363d2579af0a11b77e698aed2e1021c2233b644.tar.gz tdepim-b363d2579af0a11b77e698aed2e1021c2233b644.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kontact/src')
| -rw-r--r-- | kontact/src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kontact/src/Makefile.am | 2 | ||||
| -rw-r--r-- | kontact/src/mainwindow.cpp | 6 | ||||
| -rw-r--r-- | kontact/src/mainwindow.h | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/kontact/src/CMakeLists.txt b/kontact/src/CMakeLists.txt index 38076fe44..39ea8df98 100644 --- a/kontact/src/CMakeLists.txt +++ b/kontact/src/CMakeLists.txt @@ -50,7 +50,7 @@ tde_add_executable( kontact AUTOMOC main.cpp mainwindow.cpp sidepanebase.cpp iconsidepane.cpp aboutdialog.cpp profilemanager.cpp profiledialog.cpp kontactiface.skel - LINK kontact-shared kpinterfaces-shared kutils-shared khtml-shared + LINK kontact-shared kpinterfaces-shared tdeutils-shared tdehtml-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kontact/src/Makefile.am b/kontact/src/Makefile.am index 082f9f243..daec1fa3a 100644 --- a/kontact/src/Makefile.am +++ b/kontact/src/Makefile.am @@ -10,7 +10,7 @@ libkontact_la_SOURCES = prefs.kcfgc bin_PROGRAMS = kontact kontact_METASOURCES = AUTO -kontact_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kontact_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kontact_LDADD = $(top_builddir)/libtdepim/libtdepim.la \ $(top_builddir)/kontact/interfaces/libkpinterfaces.la libkontact.la \ $(LIB_KPARTS) $(LIB_KUTILS) $(LIB_KHTML) diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp index 8a6a7f354..d3642b6a5 100644 --- a/kontact/src/mainwindow.cpp +++ b/kontact/src/mainwindow.cpp @@ -46,7 +46,7 @@ #include <klistbox.h> #include <klocale.h> #include <kmessagebox.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include <kplugininfo.h> #include <kpopupmenu.h> #include <ksettings/dialog.h> @@ -60,8 +60,8 @@ #include <ksettings/componentsdialog.h> #include <kstringhandler.h> #include <krsqueezedtextlabel.h> -#include <khtml_part.h> -#include <khtmlview.h> +#include <tdehtml_part.h> +#include <tdehtmlview.h> #include <libtdepim/kfileio.h> #include <kcursor.h> #include <krun.h> diff --git a/kontact/src/mainwindow.h b/kontact/src/mainwindow.h index 42b55420b..de23b19a8 100644 --- a/kontact/src/mainwindow.h +++ b/kontact/src/mainwindow.h @@ -28,9 +28,9 @@ #include <tqptrlist.h> #include <tqwidgetstack.h> -#include <kparts/mainwindow.h> -#include <kparts/part.h> -#include <kparts/partmanager.h> +#include <tdeparts/mainwindow.h> +#include <tdeparts/part.h> +#include <tdeparts/partmanager.h> #include <kdcopservicestarter.h> #include "core.h" |