diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:19:22 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:19:22 -0600 |
| commit | a5430e4b98efd05937bd3bfe78c56eb826f145fa (patch) | |
| tree | 1af88f74a9d800399de58491b215fb303cbfb1f3 /kdialog | |
| 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 'kdialog')
| -rw-r--r-- | kdialog/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kdialog/Makefile.am | 2 | ||||
| -rw-r--r-- | kdialog/kdialog.cpp | 4 | ||||
| -rw-r--r-- | kdialog/tdelistboxdialog.cpp | 4 | ||||
| -rw-r--r-- | kdialog/widgets.cpp | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/kdialog/CMakeLists.txt b/kdialog/CMakeLists.txt index 2ec728f66..6620430d4 100644 --- a/kdialog/CMakeLists.txt +++ b/kdialog/CMakeLists.txt @@ -24,7 +24,7 @@ link_directories( tde_add_executable( kdialog AUTOMOC SOURCES - kdialog.cpp widgets.cpp klistboxdialog.cpp + kdialog.cpp widgets.cpp tdelistboxdialog.cpp progressdialog.cpp progressdialogiface.skel LINK tdeio-shared DESTINATION ${BIN_INSTALL_DIR} diff --git a/kdialog/Makefile.am b/kdialog/Makefile.am index 6340ce37d..be19a45bc 100644 --- a/kdialog/Makefile.am +++ b/kdialog/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = $(all_includes) bin_PROGRAMS = kdialog -kdialog_SOURCES = kdialog.cpp widgets.cpp klistboxdialog.cpp progressdialog.cpp progressdialogiface.skel +kdialog_SOURCES = kdialog.cpp widgets.cpp tdelistboxdialog.cpp progressdialog.cpp progressdialogiface.skel kdialog_LDADD = $(LIB_KIO) kdialog_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor diff --git a/kdialog/kdialog.cpp b/kdialog/kdialog.cpp index 2f365c129..67b1af208 100644 --- a/kdialog/kdialog.cpp +++ b/kdialog/kdialog.cpp @@ -33,9 +33,9 @@ #include <kapplication.h> #include <kdebug.h> //#include <ktopwidget.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <kpassivepopup.h> -#include <krecentdocument.h> +#include <tderecentdocument.h> #include <kapplication.h> #include "widgets.h" diff --git a/kdialog/tdelistboxdialog.cpp b/kdialog/tdelistboxdialog.cpp index 65be6c71e..f3fc62423 100644 --- a/kdialog/tdelistboxdialog.cpp +++ b/kdialog/tdelistboxdialog.cpp @@ -21,8 +21,8 @@ #include <tqlistbox.h> #include <tqvbox.h> -#include "klistboxdialog.h" -#include "klistboxdialog.moc" +#include "tdelistboxdialog.h" +#include "tdelistboxdialog.moc" #include "klocale.h" diff --git a/kdialog/widgets.cpp b/kdialog/widgets.cpp index 1563a817b..cf1040ed6 100644 --- a/kdialog/widgets.cpp +++ b/kdialog/widgets.cpp @@ -22,7 +22,7 @@ #include <kmessagebox.h> #include "widgets.h" -#include "klistboxdialog.h" +#include "tdelistboxdialog.h" #include "progressdialog.h" #include <kinputdialog.h> #include <kpassdlg.h> |