diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:22:57 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:22:57 -0600 |
| commit | 5be945600e2d7776e74663f56c2a25a8f57d7891 (patch) | |
| tree | 9be5ab8203c0769df4dc0f314c45e52fa5ecfd8c /buildtools/qmake | |
| 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/qmake')
| -rw-r--r-- | buildtools/qmake/choosesubprojectdlg.h | 2 | ||||
| -rw-r--r-- | buildtools/qmake/choosesubprojectdlgbase.ui | 2 | ||||
| -rw-r--r-- | buildtools/qmake/disablesubprojectdlg.cpp | 2 | ||||
| -rw-r--r-- | buildtools/qmake/disablesubprojectdlgbase.ui | 2 | ||||
| -rw-r--r-- | buildtools/qmake/projectconfigurationdlg.h | 2 | ||||
| -rw-r--r-- | buildtools/qmake/projectconfigurationdlgbase.ui | 2 | ||||
| -rw-r--r-- | buildtools/qmake/trolllistview.h | 2 | ||||
| -rw-r--r-- | buildtools/qmake/trollprojectpart.cpp | 2 | ||||
| -rw-r--r-- | buildtools/qmake/trollprojectwidget.cpp | 6 |
9 files changed, 11 insertions, 11 deletions
diff --git a/buildtools/qmake/choosesubprojectdlg.h b/buildtools/qmake/choosesubprojectdlg.h index 18656480..e59ed6b9 100644 --- a/buildtools/qmake/choosesubprojectdlg.h +++ b/buildtools/qmake/choosesubprojectdlg.h @@ -12,7 +12,7 @@ #ifndef CHOOSESUBPROJECTDLG_H #define CHOOSESUBPROJECTDLG_H -#include <klistview.h> +#include <tdelistview.h> #include "choosesubprojectdlgbase.h" diff --git a/buildtools/qmake/choosesubprojectdlgbase.ui b/buildtools/qmake/choosesubprojectdlgbase.ui index d5f6566d..e9ef33f5 100644 --- a/buildtools/qmake/choosesubprojectdlgbase.ui +++ b/buildtools/qmake/choosesubprojectdlgbase.ui @@ -128,7 +128,7 @@ </tabstops> <layoutdefaults spacing="6" margin="11"/> <includehints> - <includehint>klistview.h</includehint> + <includehint>tdelistview.h</includehint> <includehint>kpushbutton.h</includehint> </includehints> </UI> diff --git a/buildtools/qmake/disablesubprojectdlg.cpp b/buildtools/qmake/disablesubprojectdlg.cpp index c05c70c9..9a5fbb1d 100644 --- a/buildtools/qmake/disablesubprojectdlg.cpp +++ b/buildtools/qmake/disablesubprojectdlg.cpp @@ -10,7 +10,7 @@ ***************************************************************************/ #include "disablesubprojectdlg.h" -#include <klistview.h> +#include <tdelistview.h> #include <tqstringlist.h> #include "scope.h" #include "qmakescopeitem.h" diff --git a/buildtools/qmake/disablesubprojectdlgbase.ui b/buildtools/qmake/disablesubprojectdlgbase.ui index c1d09af1..863e28f8 100644 --- a/buildtools/qmake/disablesubprojectdlgbase.ui +++ b/buildtools/qmake/disablesubprojectdlgbase.ui @@ -119,7 +119,7 @@ </connections> <layoutdefaults spacing="6" margin="11"/> <includehints> - <includehint>klistview.h</includehint> + <includehint>tdelistview.h</includehint> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> </includehints> diff --git a/buildtools/qmake/projectconfigurationdlg.h b/buildtools/qmake/projectconfigurationdlg.h index d02ff7e4..7452e9e6 100644 --- a/buildtools/qmake/projectconfigurationdlg.h +++ b/buildtools/qmake/projectconfigurationdlg.h @@ -22,7 +22,7 @@ //#include "trollprojectwidget.h" #include <tdeversion.h> #include <tqlistview.h> -#include <klistview.h> +#include <tdelistview.h> #include <tqmap.h> class QMakeScopeItem; diff --git a/buildtools/qmake/projectconfigurationdlgbase.ui b/buildtools/qmake/projectconfigurationdlgbase.ui index 24bcfeb1..0427a730 100644 --- a/buildtools/qmake/projectconfigurationdlgbase.ui +++ b/buildtools/qmake/projectconfigurationdlgbase.ui @@ -2886,7 +2886,7 @@ <includehint>kpushbutton.h</includehint> <includehint>kurlrequester.h</includehint> <includehint>kpushbutton.h</includehint> - <includehint>klistview.h</includehint> + <includehint>tdelistview.h</includehint> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/buildtools/qmake/trolllistview.h b/buildtools/qmake/trolllistview.h index 13d2d9a1..8c2c021f 100644 --- a/buildtools/qmake/trolllistview.h +++ b/buildtools/qmake/trolllistview.h @@ -20,7 +20,7 @@ #ifndef TROLLLISTVIEW_H #define TROLLLISTVIEW_H -#include <klistview.h> +#include <tdelistview.h> #include "trollprojectwidget.h" diff --git a/buildtools/qmake/trollprojectpart.cpp b/buildtools/qmake/trollprojectpart.cpp index a86be38a..4f125d68 100644 --- a/buildtools/qmake/trollprojectpart.cpp +++ b/buildtools/qmake/trollprojectpart.cpp @@ -28,7 +28,7 @@ #include <kstatusbar.h> #include <tqmessagebox.h> #include <kdevgenericfactory.h> -#include <kaction.h> +#include <tdeaction.h> #include <tdeparts/part.h> #include <kprocess.h> #include <tdeconfig.h> diff --git a/buildtools/qmake/trollprojectwidget.cpp b/buildtools/qmake/trollprojectwidget.cpp index 69f71bd4..19b74609 100644 --- a/buildtools/qmake/trollprojectwidget.cpp +++ b/buildtools/qmake/trollprojectwidget.cpp @@ -42,15 +42,15 @@ #include <tdefiledialog.h> #include <tqtooltip.h> #include <kdebug.h> -#include <klistview.h> +#include <tdelistview.h> #include <kmessagebox.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kregexp.h> #include <kurl.h> #include <tqmessagebox.h> #include <iostream> #include <tdeparts/part.h> -#include <kaction.h> +#include <tdeaction.h> #include <kprocess.h> #include <kinputdialog.h> #include <tdeversion.h> |