diff options
author | Timothy Pearson <[email protected]> | 2013-02-01 23:22:57 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-02-01 23:22:57 -0600 |
commit | 5be945600e2d7776e74663f56c2a25a8f57d7891 (patch) | |
tree | 9be5ab8203c0769df4dc0f314c45e52fa5ecfd8c /buildtools/custommakefiles | |
parent | e36b30d13d1f89100fae656adfde2b52234d12b6 (diff) | |
download | tdevelop-5be945600e2d7776e74663f56c2a25a8f57d7891.tar.gz tdevelop-5be945600e2d7776e74663f56c2a25a8f57d7891.zip |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'buildtools/custommakefiles')
-rw-r--r-- | buildtools/custommakefiles/customprojectpart.cpp | 6 | ||||
-rw-r--r-- | buildtools/custommakefiles/selectnewfilesdialog.cpp | 2 | ||||
-rw-r--r-- | buildtools/custommakefiles/selectnewfilesdialogbase.ui | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/buildtools/custommakefiles/customprojectpart.cpp b/buildtools/custommakefiles/customprojectpart.cpp index a2437019..39f2fde6 100644 --- a/buildtools/custommakefiles/customprojectpart.cpp +++ b/buildtools/custommakefiles/customprojectpart.cpp @@ -26,7 +26,7 @@ #include <tqwhatsthis.h> #include <tqdom.h> -#include <kaction.h> +#include <tdeaction.h> #include <tdeconfig.h> #include <kdebug.h> #include <kdialogbase.h> @@ -34,10 +34,10 @@ #include <kdevgenericfactory.h> #include <kiconloader.h> #include <klocale.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <kmessagebox.h> #include <tdeparts/part.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <tdeversion.h> #include <kprocess.h> diff --git a/buildtools/custommakefiles/selectnewfilesdialog.cpp b/buildtools/custommakefiles/selectnewfilesdialog.cpp index a4c0db99..ce418ad4 100644 --- a/buildtools/custommakefiles/selectnewfilesdialog.cpp +++ b/buildtools/custommakefiles/selectnewfilesdialog.cpp @@ -13,7 +13,7 @@ #include "selectnewfilesdialog.h" #include <tqlistview.h> -#include <klistview.h> +#include <tdelistview.h> #include <tqheader.h> #include <tqstringlist.h> #include <klocale.h> diff --git a/buildtools/custommakefiles/selectnewfilesdialogbase.ui b/buildtools/custommakefiles/selectnewfilesdialogbase.ui index e922d0e3..d56df24b 100644 --- a/buildtools/custommakefiles/selectnewfilesdialogbase.ui +++ b/buildtools/custommakefiles/selectnewfilesdialogbase.ui @@ -45,6 +45,6 @@ </widget> <layoutdefaults spacing="6" margin="11"/> <includehints> - <includehint>klistview.h</includehint> + <includehint>tdelistview.h</includehint> </includehints> </UI> |