diff options
| author | Timothy Pearson <[email protected]> | 2013-02-01 23:23:27 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-01 23:23:27 -0600 |
| commit | c46f36d00839916c8b6cde8ed2ca54aeb40dba19 (patch) | |
| tree | 990b3fd4f5a01a1a86b43d158686456eae2bdc44 /quanta/components/cvsservice | |
| parent | 1e8f4c1ed6da13b851a7100e395d9243871c464d (diff) | |
| download | tdewebdev-c46f36d00839916c8b6cde8ed2ca54aeb40dba19.tar.gz tdewebdev-c46f36d00839916c8b6cde8ed2ca54aeb40dba19.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'quanta/components/cvsservice')
| -rw-r--r-- | quanta/components/cvsservice/cvscommitdlgs.ui | 2 | ||||
| -rw-r--r-- | quanta/components/cvsservice/cvsservice.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/quanta/components/cvsservice/cvscommitdlgs.ui b/quanta/components/cvsservice/cvscommitdlgs.ui index 6f79a85e..f63b910e 100644 --- a/quanta/components/cvsservice/cvscommitdlgs.ui +++ b/quanta/components/cvsservice/cvscommitdlgs.ui @@ -145,6 +145,6 @@ </tabstops> <layoutdefaults spacing="6" margin="11"/> <includehints> - <includehint>klistbox.h</includehint> + <includehint>tdelistbox.h</includehint> </includehints> </UI> diff --git a/quanta/components/cvsservice/cvsservice.cpp b/quanta/components/cvsservice/cvsservice.cpp index e423a221..6681d390 100644 --- a/quanta/components/cvsservice/cvsservice.cpp +++ b/quanta/components/cvsservice/cvsservice.cpp @@ -22,16 +22,16 @@ #include <tqtimer.h> //kde includes -#include <kaction.h> +#include <tdeaction.h> #include <kapplication.h> #include <kcombobox.h> #include <tdeversion.h> #include <kiconloader.h> #include <klineedit.h> -#include <klistbox.h> +#include <tdelistbox.h> #include <klocale.h> #include <kmessagebox.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> // CvsService #include <repository_stub.h> |