diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:07:46 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:07:46 -0600 |
commit | 4298fb9f3d8c0e68fdd6e1f36523f6509af56a17 (patch) | |
tree | a700a4af64a3727e5c77b5440777e18f54d94f28 /src | |
parent | 3b974934d9123068efc34d59b335263b91590a06 (diff) | |
download | filelight-4298fb9f3d8c0e68fdd6e1f36523f6509af56a17.tar.gz filelight-4298fb9f3d8c0e68fdd6e1f36523f6509af56a17.zip |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'src')
-rw-r--r-- | src/app/Makefile.am | 2 | ||||
-rw-r--r-- | src/app/mainWindow.h | 2 | ||||
-rw-r--r-- | src/part/part.cpp | 2 | ||||
-rw-r--r-- | src/part/part.h | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/app/Makefile.am b/src/app/Makefile.am index 5476a43..5e0465c 100644 --- a/src/app/Makefile.am +++ b/src/app/Makefile.am @@ -5,4 +5,4 @@ METASOURCES = AUTO bin_PROGRAMS = filelight filelight_SOURCES = historyAction.cpp mainWindow.cpp main.cpp filelight_LDADD = $(LIB_KPARTS) $(LIB_TDEUI) -filelight_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +filelight_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor diff --git a/src/app/mainWindow.h b/src/app/mainWindow.h index 68314aa..8562aa8 100644 --- a/src/app/mainWindow.h +++ b/src/app/mainWindow.h @@ -18,7 +18,7 @@ #ifndef FILELIGHT_H #define FILELIGHT_H -#include <kparts/mainwindow.h> +#include <tdeparts/mainwindow.h> class KSqueezedTextLabel; class KHistoryCombo; diff --git a/src/part/part.cpp b/src/part/part.cpp index b519044..609da9a 100644 --- a/src/part/part.cpp +++ b/src/part/part.cpp @@ -17,7 +17,7 @@ #include <klocale.h> #include <kmessagebox.h> //::start() //#include <konq_operations.h> -#include <kparts/genericfactory.h> +#include <tdeparts/genericfactory.h> #include <kstatusbar.h> #include <kstdaction.h> #include <tqfile.h> //encodeName() diff --git a/src/part/part.h b/src/part/part.h index 809b133..2555ea7 100644 --- a/src/part/part.h +++ b/src/part/part.h @@ -4,9 +4,9 @@ #ifndef FILELIGHTPART_H #define FILELIGHTPART_H -#include <kparts/browserextension.h> -#include <kparts/statusbarextension.h> -#include <kparts/part.h> +#include <tdeparts/browserextension.h> +#include <tdeparts/statusbarextension.h> +#include <tdeparts/part.h> #include <kurl.h> class TDEAboutData; |