diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:23:27 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:23:27 -0600 |
commit | c46f36d00839916c8b6cde8ed2ca54aeb40dba19 (patch) | |
tree | 990b3fd4f5a01a1a86b43d158686456eae2bdc44 /quanta/dialogs/tagdialogs | |
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/dialogs/tagdialogs')
-rw-r--r-- | quanta/dialogs/tagdialogs/CMakeLists.txt | 2 | ||||
-rw-r--r-- | quanta/dialogs/tagdialogs/Makefile.am | 2 | ||||
-rw-r--r-- | quanta/dialogs/tagdialogs/colorcombo.cpp | 2 | ||||
-rw-r--r-- | quanta/dialogs/tagdialogs/colorcombo.h | 2 | ||||
-rw-r--r-- | quanta/dialogs/tagdialogs/listdlg.cpp | 2 | ||||
-rw-r--r-- | quanta/dialogs/tagdialogs/tagquictdelistdlg.cpp | 6 | ||||
-rw-r--r-- | quanta/dialogs/tagdialogs/tagquictdelistdlg.h | 2 | ||||
-rw-r--r-- | quanta/dialogs/tagdialogs/tagquictdelistdlgdata.cpp | 2 |
8 files changed, 10 insertions, 10 deletions
diff --git a/quanta/dialogs/tagdialogs/CMakeLists.txt b/quanta/dialogs/tagdialogs/CMakeLists.txt index 7d478f6d..6f29cb43 100644 --- a/quanta/dialogs/tagdialogs/CMakeLists.txt +++ b/quanta/dialogs/tagdialogs/CMakeLists.txt @@ -28,7 +28,7 @@ include_directories( tde_add_library( tagdialogs STATIC_PIC AUTOMOC SOURCES tagmisc.ui listdlg.cpp tagmaildlg.cpp - tagquicklistdlg.cpp tagquicklistdlgdata.cpp + tagquictdelistdlg.cpp tagquictdelistdlgdata.cpp tagdialog.cpp tagattr.cpp pictureview.cpp tagimgdlg.cpp tagxml.cpp tagwidget.cpp colorcombo.cpp tagimgdlgdata.cpp tagmiscdlg.cpp diff --git a/quanta/dialogs/tagdialogs/Makefile.am b/quanta/dialogs/tagdialogs/Makefile.am index ac7fd23f..8093e35e 100644 --- a/quanta/dialogs/tagdialogs/Makefile.am +++ b/quanta/dialogs/tagdialogs/Makefile.am @@ -1,7 +1,7 @@ noinst_LTLIBRARIES = libtagdialogs.la libtagdialogs_la_SOURCES = tagmisc.ui listdlg.cpp tagmaildlg.cpp \ - tagquicklistdlg.cpp tagquicklistdlgdata.cpp tagdialog.cpp tagattr.cpp pictureview.cpp \ + tagquictdelistdlg.cpp tagquictdelistdlgdata.cpp tagdialog.cpp tagattr.cpp pictureview.cpp \ tagimgdlg.cpp tagxml.cpp tagwidget.cpp colorcombo.cpp tagimgdlgdata.cpp \ tagmiscdlg.cpp tagmail.ui diff --git a/quanta/dialogs/tagdialogs/colorcombo.cpp b/quanta/dialogs/tagdialogs/colorcombo.cpp index ebe9a7fd..188f2ca0 100644 --- a/quanta/dialogs/tagdialogs/colorcombo.cpp +++ b/quanta/dialogs/tagdialogs/colorcombo.cpp @@ -49,7 +49,7 @@ #include <kglobal.h> #include <kglobalsettings.h> #include <kiconloader.h> -#include <klistbox.h> +#include <tdelistbox.h> #include <klocale.h> #include <kmessagebox.h> #include <kseparator.h> diff --git a/quanta/dialogs/tagdialogs/colorcombo.h b/quanta/dialogs/tagdialogs/colorcombo.h index f26bf9dd..0c05dc5a 100644 --- a/quanta/dialogs/tagdialogs/colorcombo.h +++ b/quanta/dialogs/tagdialogs/colorcombo.h @@ -31,7 +31,7 @@ #include <tqframe.h> #include <tqpixmap.h> #include <kcolordialog.h> -#include "kselect.h" +#include "tdeselect.h" /** diff --git a/quanta/dialogs/tagdialogs/listdlg.cpp b/quanta/dialogs/tagdialogs/listdlg.cpp index ba583b99..c9b20d5a 100644 --- a/quanta/dialogs/tagdialogs/listdlg.cpp +++ b/quanta/dialogs/tagdialogs/listdlg.cpp @@ -16,7 +16,7 @@ #include "listdlg.h" //kde include -#include <klistbox.h> +#include <tdelistbox.h> #include <klocale.h> //qt includes diff --git a/quanta/dialogs/tagdialogs/tagquictdelistdlg.cpp b/quanta/dialogs/tagdialogs/tagquictdelistdlg.cpp index 7a9edbdb..163abcc6 100644 --- a/quanta/dialogs/tagdialogs/tagquictdelistdlg.cpp +++ b/quanta/dialogs/tagdialogs/tagquictdelistdlg.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - tagquicklistdlg.cpp - description + tagquictdelistdlg.cpp - description ------------------- begin : Sun Nov 28 1999 copyright : (C) 1999 by Yacovlev Alexander & Dmitry Poplavsky @@ -14,8 +14,8 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include "tagquicklistdlg.h" -#include "tagquicklistdlg.moc" +#include "tagquictdelistdlg.h" +#include "tagquictdelistdlg.moc" #include <tqbuttongroup.h> #include <tqlabel.h> #include <tqspinbox.h> diff --git a/quanta/dialogs/tagdialogs/tagquictdelistdlg.h b/quanta/dialogs/tagdialogs/tagquictdelistdlg.h index 946efb67..5d242673 100644 --- a/quanta/dialogs/tagdialogs/tagquictdelistdlg.h +++ b/quanta/dialogs/tagdialogs/tagquictdelistdlg.h @@ -1,5 +1,5 @@ /*************************************************************************** - tagquicklistdlg.h - description + tagquictdelistdlg.h - description ------------------- begin : Sun Nov 28 1999 copyright : (C) 1999 by Yacovlev Alexander & Dmitry Poplavsky diff --git a/quanta/dialogs/tagdialogs/tagquictdelistdlgdata.cpp b/quanta/dialogs/tagdialogs/tagquictdelistdlgdata.cpp index 7f499c14..79522618 100644 --- a/quanta/dialogs/tagdialogs/tagquictdelistdlgdata.cpp +++ b/quanta/dialogs/tagdialogs/tagquictdelistdlgdata.cpp @@ -10,7 +10,7 @@ #include <kapplication.h> #include <klocale.h> #include <tqbuttongroup.h> -#include "tagquicklistdlg.h" +#include "tagquictdelistdlg.h" #include <tqspinbox.h> #include <tqlabel.h> #include <kpushbutton.h> |