diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:21:55 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:21:55 -0600 |
commit | d318087925a540a204c9d3820d5a09fbda58b8b2 (patch) | |
tree | b8dde6aa5d6559b81c6667d8364a4364c27bcba4 /korn | |
parent | 6cc5f72b33f1d281de3e1bf809b1b5e77d5c96cf (diff) | |
download | tdepim-d318087925a540a204c9d3820d5a09fbda58b8b2.tar.gz tdepim-d318087925a540a204c9d3820d5a09fbda58b8b2.zip |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'korn')
-rw-r--r-- | korn/boxcontaineritem.cpp | 6 | ||||
-rw-r--r-- | korn/dockeditem.cpp | 2 | ||||
-rw-r--r-- | korn/hvitem.cpp | 4 | ||||
-rw-r--r-- | korn/kornboxcfgimpl.cpp | 2 | ||||
-rw-r--r-- | korn/subjectsdlg.h | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/korn/boxcontaineritem.cpp b/korn/boxcontaineritem.cpp index ad4c40bd1..f59fa7b5e 100644 --- a/korn/boxcontaineritem.cpp +++ b/korn/boxcontaineritem.cpp @@ -21,7 +21,7 @@ #include "mailsubject.h" #include <kaboutapplication.h> -#include <kactioncollection.h> +#include <tdeactioncollection.h> #include <kapplication.h> #include <kbugreport.h> #include <tdeconfig.h> @@ -31,9 +31,9 @@ #include <kiconloader.h> #include <klocale.h> #include <kpassivepopup.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kprocess.h> -#include <kshortcut.h> +#include <tdeshortcut.h> #include <tqbitmap.h> #include <tqcolor.h> diff --git a/korn/dockeditem.cpp b/korn/dockeditem.cpp index 7e2b53a89..fb24c821b 100644 --- a/korn/dockeditem.cpp +++ b/korn/dockeditem.cpp @@ -26,7 +26,7 @@ #include <kglobal.h> #include <kiconloader.h> #include <kpassivepopup.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <klocale.h> #include <tqbitmap.h> diff --git a/korn/hvitem.cpp b/korn/hvitem.cpp index fef3dbefa..2cee96650 100644 --- a/korn/hvitem.cpp +++ b/korn/hvitem.cpp @@ -20,11 +20,11 @@ #include "label.h" -#include <kactioncollection.h> +#include <tdeactioncollection.h> #include <kapplication.h> #include <kdebug.h> #include <kpassivepopup.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kstdaction.h> #include <tqcursor.h> diff --git a/korn/kornboxcfgimpl.cpp b/korn/kornboxcfgimpl.cpp index 785b94fb7..92f81be8f 100644 --- a/korn/kornboxcfgimpl.cpp +++ b/korn/kornboxcfgimpl.cpp @@ -27,7 +27,7 @@ class TDEConfig; #include <kcolorbutton.h> #include <kdebug.h> #include <tdefiledialog.h> -#include <kfontdialog.h> +#include <tdefontdialog.h> #include <klocale.h> #include <kicondialog.h> #include <kurlrequester.h> diff --git a/korn/subjectsdlg.h b/korn/subjectsdlg.h index 189f1a70d..cdf7bccfa 100644 --- a/korn/subjectsdlg.h +++ b/korn/subjectsdlg.h @@ -2,7 +2,7 @@ #define KornSubjectsDlg_h #include<kdialogbase.h> -#include <klistview.h> +#include <tdelistview.h> #include<tqvaluevector.h> #include <kpushbutton.h> |