diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:09:38 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:09:38 -0600 |
| commit | a9b566f374517373eb3c0e9785c594024bf25418 (patch) | |
| tree | 0d299c8c01a3c1c24cbc53fa0daf8a5e9333c765 /kmymoney2 | |
| parent | 6078e14f28ec3b34cc2041cbd8628a1d8420512c (diff) | |
| download | kmymoney-a9b566f374517373eb3c0e9785c594024bf25418.tar.gz kmymoney-a9b566f374517373eb3c0e9785c594024bf25418.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kmymoney2')
| -rw-r--r-- | kmymoney2/Makefile.am | 2 | ||||
| -rw-r--r-- | kmymoney2/kmymoney2.cpp | 2 | ||||
| -rw-r--r-- | kmymoney2/plugins/pluginloader.cpp | 2 | ||||
| -rw-r--r-- | kmymoney2/views/khomeview.cpp | 2 | ||||
| -rw-r--r-- | kmymoney2/views/khomeview.h | 2 | ||||
| -rwxr-xr-x | kmymoney2/views/kreportsview.cpp | 2 | ||||
| -rwxr-xr-x | kmymoney2/views/kreportsview.h | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/kmymoney2/Makefile.am b/kmymoney2/Makefile.am index 5b52d1f..aa853fe 100644 --- a/kmymoney2/Makefile.am +++ b/kmymoney2/Makefile.am @@ -99,7 +99,7 @@ INCLUDES= $(all_includes) -I$(top_srcdir) -I. -I$(top_builddir)/kmymoney2/dialog METASOURCES = AUTO # the library search path. -kmymoney2_LDFLAGS = $(all_libraries) $(kde_RPATH) -export-dynamic $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KUTILS) +kmymoney2_LDFLAGS = $(all_libraries) $(kde_RPATH) -export-dynamic $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KUTILS) # Uncomment the following two lines if you add a ui.rc file for your application to make use of # KDE diff --git a/kmymoney2/kmymoney2.cpp b/kmymoney2/kmymoney2.cpp index 4c0b456..721dfab 100644 --- a/kmymoney2/kmymoney2.cpp +++ b/kmymoney2/kmymoney2.cpp @@ -65,7 +65,7 @@ #include <kio/netaccess.h> #include <dcopclient.h> #include <kstartupinfo.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include <krun.h> #include <kconfigdialog.h> #include <kinputdialog.h> diff --git a/kmymoney2/plugins/pluginloader.cpp b/kmymoney2/plugins/pluginloader.cpp index 5e1dcc6..3213781 100644 --- a/kmymoney2/plugins/pluginloader.cpp +++ b/kmymoney2/plugins/pluginloader.cpp @@ -26,7 +26,7 @@ // KDE Includes #include <ktrader.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include <kdebug.h> #include <kdialog.h> #include <kconfig.h> diff --git a/kmymoney2/views/khomeview.cpp b/kmymoney2/views/khomeview.cpp index 3860c04..680b384 100644 --- a/kmymoney2/views/khomeview.cpp +++ b/kmymoney2/views/khomeview.cpp @@ -40,7 +40,7 @@ #include <kglobal.h> #include <klocale.h> #include <kstandarddirs.h> -#include <khtmlview.h> +#include <tdehtmlview.h> #include <kconfig.h> #include <kstdaction.h> #include <kmainwindow.h> diff --git a/kmymoney2/views/khomeview.h b/kmymoney2/views/khomeview.h index e4a47bb..0afa739 100644 --- a/kmymoney2/views/khomeview.h +++ b/kmymoney2/views/khomeview.h @@ -30,7 +30,7 @@ class TQFrame; // ---------------------------------------------------------------------------- // KDE Includes -#include <khtml_part.h> +#include <tdehtml_part.h> // ---------------------------------------------------------------------------- // Project Includes diff --git a/kmymoney2/views/kreportsview.cpp b/kmymoney2/views/kreportsview.cpp index 965a502..90ca8a3 100755 --- a/kmymoney2/views/kreportsview.cpp +++ b/kmymoney2/views/kreportsview.cpp @@ -53,7 +53,7 @@ #include <kglobalsettings.h> #include <klocale.h> #include <kstandarddirs.h> -#include <khtmlview.h> +#include <tdehtmlview.h> #include <kconfig.h> #include <kdebug.h> #include <kfiledialog.h> diff --git a/kmymoney2/views/kreportsview.h b/kmymoney2/views/kreportsview.h index 46f18ff..4b34a5d 100755 --- a/kmymoney2/views/kreportsview.h +++ b/kmymoney2/views/kreportsview.h @@ -42,7 +42,7 @@ class TQListViewItem; // ---------------------------------------------------------------------------- // KDE Includes -#include <khtml_part.h> +#include <tdehtml_part.h> #include <klistview.h> #include <ktabwidget.h> |