From cfb328d59024a251690b6e47c9f8d343fd8c241c Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 15 Feb 2013 21:59:38 -0600 Subject: Rename additional header files to avoid conflicts with KDE4 --- knode/articlewidget.cpp | 6 +++--- knode/headerview.cpp | 2 +- knode/knaccountmanager.cpp | 4 ++-- knode/knarticle.cpp | 2 +- knode/knarticlecollection.cpp | 4 ++-- knode/knarticlefactory.cpp | 4 ++-- knode/knarticlefilter.cpp | 2 +- knode/knarticlemanager.cpp | 6 +++--- knode/kncleanup.cpp | 4 ++-- knode/kncollectionview.cpp | 2 +- knode/kncomposer.cpp | 8 ++++---- knode/kncomposer.h | 2 +- knode/knconfig.cpp | 6 +++--- knode/knconfigmanager.cpp | 2 +- knode/knconfigpages.cpp | 2 +- knode/knconfigwidgets.cpp | 4 ++-- knode/knconvert.cpp | 4 ++-- knode/kndisplayedheader.cpp | 2 +- knode/knfilterconfigwidget.cpp | 2 +- knode/knfilterdialog.cpp | 4 ++-- knode/knfiltermanager.cpp | 4 ++-- knode/knfolder.cpp | 2 +- knode/knfoldermanager.cpp | 4 ++-- knode/kngroup.cpp | 2 +- knode/kngroupbrowser.cpp | 2 +- knode/kngroupdialog.cpp | 6 +++--- knode/kngroupmanager.cpp | 4 ++-- knode/kngrouppropdlg.cpp | 2 +- knode/kngroupselectdialog.cpp | 4 ++-- knode/knjobdata.cpp | 2 +- knode/knmainwidget.cpp | 6 +++--- knode/knnetaccess.cpp | 4 ++-- knode/knnntpclient.cpp | 2 +- knode/knode.cpp | 4 ++-- knode/knode_options.h | 2 +- knode/knprotocolclient.cpp | 2 +- knode/knsearchdialog.cpp | 2 +- knode/knserverinfo.cpp | 4 ++-- knode/knstatusfilter.cpp | 2 +- knode/knstringfilter.cpp | 2 +- knode/main.cpp | 2 +- knode/utilities.cpp | 8 ++++---- 42 files changed, 72 insertions(+), 72 deletions(-) (limited to 'knode') diff --git a/knode/articlewidget.cpp b/knode/articlewidget.cpp index e6dca1cc..1af971b3 100644 --- a/knode/articlewidget.cpp +++ b/knode/articlewidget.cpp @@ -35,13 +35,13 @@ #include #include #include -#include +#include #include -#include +#include #include #include #include -#include +#include #include #include diff --git a/knode/headerview.cpp b/knode/headerview.cpp index 1952f813..06210b2a 100644 --- a/knode/headerview.cpp +++ b/knode/headerview.cpp @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include #include diff --git a/knode/knaccountmanager.cpp b/knode/knaccountmanager.cpp index ddc66afd..7eac9000 100644 --- a/knode/knaccountmanager.cpp +++ b/knode/knaccountmanager.cpp @@ -18,8 +18,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/knode/knarticle.cpp b/knode/knarticle.cpp index fe475b1b..24ffe720 100644 --- a/knode/knarticle.cpp +++ b/knode/knarticle.cpp @@ -15,7 +15,7 @@ */ -#include +#include #include #include diff --git a/knode/knarticlecollection.cpp b/knode/knarticlecollection.cpp index d39d4d83..e0a0af85 100644 --- a/knode/knarticlecollection.cpp +++ b/knode/knarticlecollection.cpp @@ -16,8 +16,8 @@ #include -#include -#include +#include +#include #include #include "knglobals.h" diff --git a/knode/knarticlefactory.cpp b/knode/knarticlefactory.cpp index 6a20c4dd..9e801a6e 100644 --- a/knode/knarticlefactory.cpp +++ b/knode/knarticlefactory.cpp @@ -16,8 +16,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/knode/knarticlefilter.cpp b/knode/knarticlefilter.cpp index 65acb7c0..8a708e29 100644 --- a/knode/knarticlefilter.cpp +++ b/knode/knarticlefilter.cpp @@ -14,7 +14,7 @@ #include #include -#include +#include #include #include "kngroup.h" diff --git a/knode/knarticlemanager.cpp b/knode/knarticlemanager.cpp index f5a59c57..e70f6243 100644 --- a/knode/knarticlemanager.cpp +++ b/knode/knarticlemanager.cpp @@ -12,13 +12,13 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, US */ -#include +#include #include #include -#include +#include #include #include -#include +#include #include "articlewidget.h" #include "knmainwidget.h" diff --git a/knode/kncleanup.cpp b/knode/kncleanup.cpp index f2078d71..33714840 100644 --- a/knode/kncleanup.cpp +++ b/knode/kncleanup.cpp @@ -19,8 +19,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/knode/kncollectionview.cpp b/knode/kncollectionview.cpp index a8e9088c..8a02fed2 100644 --- a/knode/kncollectionview.cpp +++ b/knode/kncollectionview.cpp @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include "knglobals.h" diff --git a/knode/kncomposer.cpp b/knode/kncomposer.cpp index afebca1a..678b38eb 100644 --- a/knode/kncomposer.cpp +++ b/knode/kncomposer.cpp @@ -24,8 +24,8 @@ using KPIM::AddressesDialog; using TDERecentAddress::RecentAddresses; #include #include -#include -#include +#include +#include #include #include #include @@ -36,7 +36,7 @@ using TDERecentAddress::RecentAddresses; #include #include #include -#include +#include #include #include #include @@ -57,7 +57,7 @@ using TDERecentAddress::RecentAddresses; #include "knnntpaccount.h" #include "knarticlefactory.h" #include -#include +#include #include #include #include diff --git a/knode/kncomposer.h b/knode/kncomposer.h index d12a0513..27cdade4 100644 --- a/knode/kncomposer.h +++ b/knode/kncomposer.h @@ -26,7 +26,7 @@ #include #include -#include +#include #include class TQGroupBox; diff --git a/knode/knconfig.cpp b/knode/knconfig.cpp index b2bfb8bf..8a218eb2 100644 --- a/knode/knconfig.cpp +++ b/knode/knconfig.cpp @@ -19,10 +19,10 @@ #include #include -#include -#include +#include +#include #include -#include +#include #include #include #include diff --git a/knode/knconfigmanager.cpp b/knode/knconfigmanager.cpp index 95e342d5..a07a9c5e 100644 --- a/knode/knconfigmanager.cpp +++ b/knode/knconfigmanager.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include diff --git a/knode/knconfigpages.cpp b/knode/knconfigpages.cpp index 9fa15394..237ff41b 100644 --- a/knode/knconfigpages.cpp +++ b/knode/knconfigpages.cpp @@ -15,7 +15,7 @@ #include #include -#include +#include #include "knglobals.h" #include "knconfig.h" diff --git a/knode/knconfigwidgets.cpp b/knode/knconfigwidgets.cpp index 2ae1e1f0..3d4948a4 100644 --- a/knode/knconfigwidgets.cpp +++ b/knode/knconfigwidgets.cpp @@ -18,9 +18,9 @@ #include #include -#include +#include #include -#include +#include #include #include #include diff --git a/knode/knconvert.cpp b/knode/knconvert.cpp index 19e2c56a..20a63ffa 100644 --- a/knode/knconvert.cpp +++ b/knode/knconvert.cpp @@ -17,10 +17,10 @@ #include #include -#include +#include #include #include -#include +#include #include #include #include diff --git a/knode/kndisplayedheader.cpp b/knode/kndisplayedheader.cpp index 65b16522..ffca72cf 100644 --- a/knode/kndisplayedheader.cpp +++ b/knode/kndisplayedheader.cpp @@ -12,7 +12,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, US */ -#include +#include #include "kndisplayedheader.h" diff --git a/knode/knfilterconfigwidget.cpp b/knode/knfilterconfigwidget.cpp index 3c7daee1..4ba0f45f 100644 --- a/knode/knfilterconfigwidget.cpp +++ b/knode/knfilterconfigwidget.cpp @@ -17,7 +17,7 @@ #include #include -#include +#include #include "knstringfilter.h" #include "knstatusfilter.h" diff --git a/knode/knfilterdialog.cpp b/knode/knfilterdialog.cpp index e9ebf66e..6a0e972a 100644 --- a/knode/knfilterdialog.cpp +++ b/knode/knfilterdialog.cpp @@ -18,8 +18,8 @@ #include #include -#include -#include +#include +#include #include #include "knglobals.h" diff --git a/knode/knfiltermanager.cpp b/knode/knfiltermanager.cpp index 9efc23dc..2264dd29 100644 --- a/knode/knfiltermanager.cpp +++ b/knode/knfiltermanager.cpp @@ -14,8 +14,8 @@ #include -#include -#include +#include +#include #include #include #include diff --git a/knode/knfolder.cpp b/knode/knfolder.cpp index 5be7535c..ee4449fa 100644 --- a/knode/knfolder.cpp +++ b/knode/knfolder.cpp @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include diff --git a/knode/knfoldermanager.cpp b/knode/knfoldermanager.cpp index 661e1b6c..2b6d1cc1 100644 --- a/knode/knfoldermanager.cpp +++ b/knode/knfoldermanager.cpp @@ -14,8 +14,8 @@ #include -#include -#include +#include +#include #include #include diff --git a/knode/kngroup.cpp b/knode/kngroup.cpp index 087eb737..95de1a5b 100644 --- a/knode/kngroup.cpp +++ b/knode/kngroup.cpp @@ -14,7 +14,7 @@ #include -#include +#include #include #include diff --git a/knode/kngroupbrowser.cpp b/knode/kngroupbrowser.cpp index be91593a..f2379f51 100644 --- a/knode/kngroupbrowser.cpp +++ b/knode/kngroupbrowser.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include diff --git a/knode/kngroupdialog.cpp b/knode/kngroupdialog.cpp index 4498898f..8c9a1746 100644 --- a/knode/kngroupdialog.cpp +++ b/knode/kngroupdialog.cpp @@ -21,10 +21,10 @@ #include #include -#include +#include #include -#include -#include +#include +#include #include #include "utilities.h" diff --git a/knode/kngroupmanager.cpp b/knode/kngroupmanager.cpp index 92ed1666..706e9d9b 100644 --- a/knode/kngroupmanager.cpp +++ b/knode/kngroupmanager.cpp @@ -16,8 +16,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/knode/kngrouppropdlg.cpp b/knode/kngrouppropdlg.cpp index 3ad2fee7..a6a90578 100644 --- a/knode/kngrouppropdlg.cpp +++ b/knode/kngrouppropdlg.cpp @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include "knglobals.h" diff --git a/knode/kngroupselectdialog.cpp b/knode/kngroupselectdialog.cpp index 6767d3f6..3d137b8a 100644 --- a/knode/kngroupselectdialog.cpp +++ b/knode/kngroupselectdialog.cpp @@ -19,8 +19,8 @@ #include #include -#include -#include +#include +#include #include "utilities.h" #include "kngroupselectdialog.h" diff --git a/knode/knjobdata.cpp b/knode/knjobdata.cpp index 0d626983..7d4ac912 100644 --- a/knode/knjobdata.cpp +++ b/knode/knjobdata.cpp @@ -14,7 +14,7 @@ #include -#include +#include #include #include diff --git a/knode/knmainwidget.cpp b/knode/knmainwidget.cpp index 7a1f407c..bfb895d0 100644 --- a/knode/knmainwidget.cpp +++ b/knode/knmainwidget.cpp @@ -21,14 +21,14 @@ #include #include #include -#include +#include #include #include #include -#include +#include #include #include -#include +#include #include #include "broadcaststatus.h" diff --git a/knode/knnetaccess.cpp b/knode/knnetaccess.cpp index 299a1200..747f6d4c 100644 --- a/knode/knnetaccess.cpp +++ b/knode/knnetaccess.cpp @@ -17,8 +17,8 @@ #include -#include -#include +#include +#include #include #include #include diff --git a/knode/knnntpclient.cpp b/knode/knnntpclient.cpp index 8cedae08..2ba465be 100644 --- a/knode/knnntpclient.cpp +++ b/knode/knnntpclient.cpp @@ -15,7 +15,7 @@ */ #include -#include +#include #include #include diff --git a/knode/knode.cpp b/knode/knode.cpp index a29cb7db..175d1845 100644 --- a/knode/knode.cpp +++ b/knode/knode.cpp @@ -21,10 +21,10 @@ #include #include #include -#include +#include #include #include -#include +#include #include #include "broadcaststatus.h" diff --git a/knode/knode_options.h b/knode/knode_options.h index f8329e38..c7c44691 100644 --- a/knode/knode_options.h +++ b/knode/knode_options.h @@ -18,7 +18,7 @@ #define KNODE_OPTIONS_H #include -#include +#include static TDECmdLineOptions knode_options[] = { diff --git a/knode/knprotocolclient.cpp b/knode/knprotocolclient.cpp index 8289d02e..9a10ca77 100644 --- a/knode/knprotocolclient.cpp +++ b/knode/knprotocolclient.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include diff --git a/knode/knsearchdialog.cpp b/knode/knsearchdialog.cpp index 45c59cb4..737bece2 100644 --- a/knode/knsearchdialog.cpp +++ b/knode/knsearchdialog.cpp @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include #include diff --git a/knode/knserverinfo.cpp b/knode/knserverinfo.cpp index 6af554ce..3d4e4ded 100644 --- a/knode/knserverinfo.cpp +++ b/knode/knserverinfo.cpp @@ -13,9 +13,9 @@ */ -#include +#include #include -#include +#include #include #include using namespace KWallet; diff --git a/knode/knstatusfilter.cpp b/knode/knstatusfilter.cpp index a1379a26..ec098d9c 100644 --- a/knode/knstatusfilter.cpp +++ b/knode/knstatusfilter.cpp @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include "knarticle.h" diff --git a/knode/knstringfilter.cpp b/knode/knstringfilter.cpp index 4f69f7ea..ba594a9f 100644 --- a/knode/knstringfilter.cpp +++ b/knode/knstringfilter.cpp @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include diff --git a/knode/main.cpp b/knode/main.cpp index f7f1a835..ab833dd7 100644 --- a/knode/main.cpp +++ b/knode/main.cpp @@ -16,7 +16,7 @@ #include #include -#include +#include #include "knapplication.h" #include "resource.h" diff --git a/knode/utilities.cpp b/knode/utilities.cpp index 2274d2ef..05483813 100644 --- a/knode/utilities.cpp +++ b/knode/utilities.cpp @@ -17,12 +17,12 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include -#include +#include #include #include "knwidgets.h" -- cgit v1.2.3