From 4298fb9f3d8c0e68fdd6e1f36523f6509af56a17 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 26 Jan 2013 13:07:46 -0600 Subject: Rename a number of libraries and executables to avoid conflicts with KDE4 --- src/app/Makefile.am | 2 +- src/app/mainWindow.h | 2 +- src/part/part.cpp | 2 +- src/part/part.h | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src') 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 +#include 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 #include //::start() //#include -#include +#include #include #include #include //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 -#include -#include +#include +#include +#include #include class TDEAboutData; -- cgit v1.2.1