diff options
author | Timothy Pearson <[email protected]> | 2013-02-01 23:19:22 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-02-01 23:19:22 -0600 |
commit | a5430e4b98efd05937bd3bfe78c56eb826f145fa (patch) | |
tree | 1af88f74a9d800399de58491b215fb303cbfb1f3 /kdebugdialog | |
parent | eba183d4de47093c6e44a99c8d7fe313aa2834c9 (diff) | |
download | tdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.tar.gz tdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.zip |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kdebugdialog')
-rw-r--r-- | kdebugdialog/CMakeLists.txt | 2 | ||||
-rw-r--r-- | kdebugdialog/Makefile.am | 2 | ||||
-rw-r--r-- | kdebugdialog/main.cpp | 2 | ||||
-rw-r--r-- | kdebugdialog/tdelistdebugdialog.cpp | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/kdebugdialog/CMakeLists.txt b/kdebugdialog/CMakeLists.txt index 8c478bbc9..f6eccd0fe 100644 --- a/kdebugdialog/CMakeLists.txt +++ b/kdebugdialog/CMakeLists.txt @@ -26,7 +26,7 @@ link_directories( tde_add_executable( kdebugdialog AUTOMOC SOURCES main.cpp kabstractdebugdialog.cpp kdebugdialog.cpp - klistdebugdialog.cpp + tdelistdebugdialog.cpp LINK tdeui-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kdebugdialog/Makefile.am b/kdebugdialog/Makefile.am index e3ed333f2..9d5a6e257 100644 --- a/kdebugdialog/Makefile.am +++ b/kdebugdialog/Makefile.am @@ -6,7 +6,7 @@ INCLUDES= $(all_includes) bin_PROGRAMS = kdebugdialog -kdebugdialog_SOURCES = main.cpp kabstractdebugdialog.cpp kdebugdialog.cpp klistdebugdialog.cpp +kdebugdialog_SOURCES = main.cpp kabstractdebugdialog.cpp kdebugdialog.cpp tdelistdebugdialog.cpp kdebugdialog_METASOURCES = AUTO kdebugdialog_LDFLAGS = $(all_libraries) $(KDE_RPATH) kdebugdialog_LDADD = $(LIB_TDEUI) diff --git a/kdebugdialog/main.cpp b/kdebugdialog/main.cpp index e1635ef26..1cc085a0c 100644 --- a/kdebugdialog/main.cpp +++ b/kdebugdialog/main.cpp @@ -18,7 +18,7 @@ */ #include "kdebugdialog.h" -#include "klistdebugdialog.h" +#include "tdelistdebugdialog.h" #include <kcmdlineargs.h> #include <kaboutdata.h> #include <kstandarddirs.h> diff --git a/kdebugdialog/tdelistdebugdialog.cpp b/kdebugdialog/tdelistdebugdialog.cpp index 68d02fd7b..42d0cd8ce 100644 --- a/kdebugdialog/tdelistdebugdialog.cpp +++ b/kdebugdialog/tdelistdebugdialog.cpp @@ -18,7 +18,7 @@ */ -#include "klistdebugdialog.h" +#include "tdelistdebugdialog.h" #include <tdeconfig.h> #include <kapplication.h> #include <kdebug.h> @@ -190,4 +190,4 @@ void TDEListDebugDialog::activateArea( TQCString area, bool activate ) } } -#include "klistdebugdialog.moc" +#include "tdelistdebugdialog.moc" |