From 46c45934f2457e4ce2f3e3ef7f1cf1740548d241 Mon Sep 17 00:00:00 2001 From: Tilman Keskinoz Date: Thu, 22 May 2003 21:15:14 +0000 Subject: Fix build on -CURRENT PR: 52572 Submitted by: KATO Tsuguru --- .../krss/files/patch-krss-amphetadeskinport.cpp | 11 +++++++++++ deskutils/krss/files/patch-krss-filterdialog.cpp | 13 +++++++++++-- deskutils/krss/files/patch-krss-filterhandler.cpp | 11 +++++++++++ deskutils/krss/files/patch-krss-krss.cpp | 17 +++++++++++++---- deskutils/krss/files/patch-krss-rssparser.cpp | 11 +++++++++++ deskutils/krss/files/patch-krss-schemeeditor.cpp | 11 +++++++++++ deskutils/krss/files/patch-krss-schemeparser.cpp | 21 +++++++++++++++------ deskutils/krss/files/patch-krss-schemetree.cpp | 21 +++++++++++++++------ deskutils/krss/files/patch-krss-sitehandler.cpp | 11 +++++++++++ deskutils/krss/files/patch-krss-syncdialog.cpp | 11 +++++++++++ 10 files changed, 120 insertions(+), 18 deletions(-) create mode 100644 deskutils/krss/files/patch-krss-amphetadeskinport.cpp create mode 100644 deskutils/krss/files/patch-krss-filterhandler.cpp create mode 100644 deskutils/krss/files/patch-krss-rssparser.cpp create mode 100644 deskutils/krss/files/patch-krss-schemeeditor.cpp create mode 100644 deskutils/krss/files/patch-krss-sitehandler.cpp create mode 100644 deskutils/krss/files/patch-krss-syncdialog.cpp (limited to 'deskutils/krss/files') diff --git a/deskutils/krss/files/patch-krss-amphetadeskinport.cpp b/deskutils/krss/files/patch-krss-amphetadeskinport.cpp new file mode 100644 index 000000000000..1a26e87c74df --- /dev/null +++ b/deskutils/krss/files/patch-krss-amphetadeskinport.cpp @@ -0,0 +1,11 @@ +--- krss/amphetadeskinport.cpp.orig Wed Feb 20 15:46:11 2002 ++++ krss/amphetadeskinport.cpp Wed May 21 10:21:02 2003 +@@ -38,6 +38,8 @@ + + #include "sitehandler.h" + ++using namespace std; ++ + + AmphetaDeskInport::AmphetaDeskInport(KApplication *app, SiteHandler *sitehandler, QWidget *parent, const char *name ) + : KDialogBase(parent,name,true,i18n("Import Sites from AmphetaDesk"),Details|User1|Close,Close,true,i18n("Import")), QXmlDefaultHandler() diff --git a/deskutils/krss/files/patch-krss-filterdialog.cpp b/deskutils/krss/files/patch-krss-filterdialog.cpp index 76c41ea5d1d6..52be83d10232 100644 --- a/deskutils/krss/files/patch-krss-filterdialog.cpp +++ b/deskutils/krss/files/patch-krss-filterdialog.cpp @@ -1,5 +1,5 @@ ---- krss/filterdialog.cpp~ Tue Oct 16 12:05:58 2001 -+++ krss/filterdialog.cpp Tue Sep 10 22:56:44 2002 +--- krss/filterdialog.cpp.orig Wed Oct 17 04:05:58 2001 ++++ krss/filterdialog.cpp Wed May 21 10:24:47 2003 @@ -18,6 +18,7 @@ #include "filterdialog.h" @@ -8,3 +8,12 @@ #include #include +@@ -27,6 +28,8 @@ + #include "filterviewbackend.h" + + #include "filterruledialog.h" ++ ++using namespace std; + + + FilterDialog::FilterDialog(QWidget *parent, const char *name ) diff --git a/deskutils/krss/files/patch-krss-filterhandler.cpp b/deskutils/krss/files/patch-krss-filterhandler.cpp new file mode 100644 index 000000000000..c39cab960e6d --- /dev/null +++ b/deskutils/krss/files/patch-krss-filterhandler.cpp @@ -0,0 +1,11 @@ +--- krss/filterhandler.cpp.orig Thu Oct 18 00:06:25 2001 ++++ krss/filterhandler.cpp Wed May 21 10:23:16 2003 +@@ -29,6 +29,8 @@ + + #include + ++using namespace std; ++ + FilterHandler::FilterHandler(FilterRule::Action defaultAction) + { + mFilters.setAutoDelete(true); diff --git a/deskutils/krss/files/patch-krss-krss.cpp b/deskutils/krss/files/patch-krss-krss.cpp index 082e7fd8f540..3eec48fff956 100644 --- a/deskutils/krss/files/patch-krss-krss.cpp +++ b/deskutils/krss/files/patch-krss-krss.cpp @@ -1,5 +1,5 @@ ---- krss/krss.cpp~ Wed Feb 20 09:00:22 2002 -+++ krss/krss.cpp Tue Sep 10 23:11:14 2002 +--- krss/krss.cpp.orig Thu Feb 21 02:00:22 2002 ++++ krss/krss.cpp Wed May 21 10:41:25 2003 @@ -24,6 +24,7 @@ #include #include @@ -17,7 +17,16 @@ // application specific includes #include "krss.h" -@@ -518,7 +519,7 @@ +@@ -62,6 +63,8 @@ + + #define ID_STATUS_MSG 1 + ++using namespace std; ++ + KrssApp::KrssApp(QWidget* , const char* name) + : KMainWindow(0, name) + { +@@ -518,7 +521,7 @@ { config->setGroup(QString("General")); QString mExec = config->readEntry(QString("Open URLs With"), QString("konqueror %url")); @@ -26,7 +35,7 @@ slotStatusMsg(i18n("Starting ") + mExec + QString("...")); -@@ -967,12 +968,12 @@ +@@ -967,12 +970,12 @@ config->setGroup(QString("General")); QStringList uh_list = config->readListEntry(QString("URL Handlers")); QString default_handler = config->readEntry(QString("Open URLs With"), QString("konqueror %url")); diff --git a/deskutils/krss/files/patch-krss-rssparser.cpp b/deskutils/krss/files/patch-krss-rssparser.cpp new file mode 100644 index 000000000000..6cb921b7176a --- /dev/null +++ b/deskutils/krss/files/patch-krss-rssparser.cpp @@ -0,0 +1,11 @@ +--- krss/rssparser.cpp.orig Wed Feb 20 14:39:36 2002 ++++ krss/rssparser.cpp Wed May 21 10:35:29 2003 +@@ -35,6 +35,8 @@ + #include "mychannelbaritem.h" + #include "filterhandler.h" + ++using namespace std; ++ + RSSParser::RSSParser() + : QXmlDefaultHandler() + { diff --git a/deskutils/krss/files/patch-krss-schemeeditor.cpp b/deskutils/krss/files/patch-krss-schemeeditor.cpp new file mode 100644 index 000000000000..29344a3e8199 --- /dev/null +++ b/deskutils/krss/files/patch-krss-schemeeditor.cpp @@ -0,0 +1,11 @@ +--- krss/schemeeditor.cpp.orig Mon Nov 26 10:08:12 2001 ++++ krss/schemeeditor.cpp Wed May 21 10:27:55 2003 +@@ -43,6 +43,8 @@ + #include "schemeparser.h" + #include "colourconverter.h" + ++using namespace std; ++ + SchemeEditor::SchemeEditor(QWidget *parent, const char *name ) + : QWidget(parent,name) + { diff --git a/deskutils/krss/files/patch-krss-schemeparser.cpp b/deskutils/krss/files/patch-krss-schemeparser.cpp index 217141dce40f..32fe5e3d82fe 100644 --- a/deskutils/krss/files/patch-krss-schemeparser.cpp +++ b/deskutils/krss/files/patch-krss-schemeparser.cpp @@ -1,12 +1,21 @@ ---- krss/schemeparser.cpp~ Sun Nov 25 17:12:50 2001 -+++ krss/schemeparser.cpp Tue Sep 10 22:58:36 2002 -@@ -342,9 +342,6 @@ +--- krss/schemeparser.cpp.orig Mon Nov 26 10:12:50 2001 ++++ krss/schemeparser.cpp Wed May 21 10:32:25 2003 +@@ -18,6 +18,8 @@ + #include "schemeparser.h" + #include + ++using namespace std; ++ + SchemeParser::SchemeParser() + { + schemetag = QString("scheme"); +@@ -341,9 +343,6 @@ + font.setUnderline(true); else font.setUnderline(false); - } +- } - else if(atts.qName(i).compare("charset") == 0) { - font.setCharSet((QFont::CharSet) atts.value(i).toInt()); -- } + } } if(mReadingChannel) { - if(mReadingTitle) { diff --git a/deskutils/krss/files/patch-krss-schemetree.cpp b/deskutils/krss/files/patch-krss-schemetree.cpp index 00a15957253e..f31c987602dd 100644 --- a/deskutils/krss/files/patch-krss-schemetree.cpp +++ b/deskutils/krss/files/patch-krss-schemetree.cpp @@ -1,6 +1,15 @@ ---- krss/schemetree.cpp~ Sun Nov 25 17:16:21 2001 -+++ krss/schemetree.cpp Tue Sep 10 23:01:49 2002 -@@ -178,7 +178,6 @@ +--- krss/schemetree.cpp.orig Mon Nov 26 10:16:21 2001 ++++ krss/schemetree.cpp Wed May 21 10:33:35 2003 +@@ -24,6 +24,8 @@ + + #include "colourconverter.h" + ++using namespace std; ++ + SchemeTree::SchemeTree() + { + clear(); +@@ -178,7 +180,6 @@ ctfelm.setAttribute("underline", "true"); else ctfelm.setAttribute("underline", "false"); @@ -8,7 +17,7 @@ ctelm.appendChild(ctfelm); QDomElement ctaelm = doc.createElement("align"); QDomText ctatxt = doc.createTextNode(QString::number(channelTitleAlign())); -@@ -220,7 +219,6 @@ +@@ -220,7 +221,6 @@ cdfelm.setAttribute("underline", "true"); else cdfelm.setAttribute("underline", "false"); @@ -16,7 +25,7 @@ cdelm.appendChild(cdfelm); QDomElement cdaelm = doc.createElement("align"); QDomText cdatxt = doc.createTextNode(QString::number(channelDescriptionAlign())); -@@ -251,7 +249,6 @@ +@@ -251,7 +251,6 @@ ntfelm.setAttribute("underline", "true"); else ntfelm.setAttribute("underline", "false"); @@ -24,7 +33,7 @@ ntelm.appendChild(ntfelm); QDomElement ntaelm = doc.createElement("align"); QDomText ntatxt = doc.createTextNode(QString::number(newsTitleAlign())); -@@ -283,7 +280,6 @@ +@@ -283,7 +282,6 @@ ndfelm.setAttribute("underline", "true"); else ndfelm.setAttribute("underline", "false"); diff --git a/deskutils/krss/files/patch-krss-sitehandler.cpp b/deskutils/krss/files/patch-krss-sitehandler.cpp new file mode 100644 index 000000000000..886fafe47c19 --- /dev/null +++ b/deskutils/krss/files/patch-krss-sitehandler.cpp @@ -0,0 +1,11 @@ +--- krss/sitehandler.cpp.orig Wed Feb 20 13:38:38 2002 ++++ krss/sitehandler.cpp Wed May 21 10:38:31 2003 +@@ -35,6 +35,8 @@ + #include "mychannelbar.h" + #include "editfeedlistviewitem.h" + ++using namespace std; ++ + SiteHandler::SiteHandler() + { + mReadingSites = mReadingSite = mReadingName = mReadingUsed = false; diff --git a/deskutils/krss/files/patch-krss-syncdialog.cpp b/deskutils/krss/files/patch-krss-syncdialog.cpp new file mode 100644 index 000000000000..9dbd3ce508e1 --- /dev/null +++ b/deskutils/krss/files/patch-krss-syncdialog.cpp @@ -0,0 +1,11 @@ +--- krss/syncdialog.cpp.orig Tue Sep 11 01:23:37 2001 ++++ krss/syncdialog.cpp Wed May 21 10:30:45 2003 +@@ -27,6 +27,8 @@ + + #include + ++using namespace std; ++ + SyncDialog::SyncDialog(KConfig *config, QWidget *parent, const char *name ) + : KDialogBase(parent,name,true,i18n("Sharing Feeds"),User1|Close,Close,true,i18n("Skip")) + { -- cgit v1.2.3