From 89b3f8216e4209dd9c69dd0683e888355ed853d6 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Mon, 10 Aug 2009 16:31:56 +0200
Subject: [PATCH] cpaster: compile fix for namespaced qt plus code cosmetics
QListWidget forward declaration was not namespaced.
---
src/plugins/cpaster/codepasterprotocol.h | 22 +++++++++++---------
src/plugins/cpaster/cpasterplugin.cpp | 10 ++++-----
src/plugins/cpaster/pastebindotcaprotocol.h | 8 ++++---
src/plugins/cpaster/pastebindotcomprotocol.h | 10 +++++----
src/plugins/cpaster/pasteview.cpp | 12 +++++------
src/plugins/cpaster/pasteview.h | 16 +++++++-------
src/plugins/cpaster/protocol.h | 10 ++++++---
7 files changed, 49 insertions(+), 39 deletions(-)
diff --git a/src/plugins/cpaster/codepasterprotocol.h b/src/plugins/cpaster/codepasterprotocol.h
index c67edd0104f..b6212efd1fc 100644
--- a/src/plugins/cpaster/codepasterprotocol.h
+++ b/src/plugins/cpaster/codepasterprotocol.h
@@ -29,6 +29,7 @@
#ifndef CODEPASTERPROTOCOL_H
#define CODEPASTERPROTOCOL_H
+
#include "protocol.h"
#include <QtGui/QListWidget>
@@ -38,7 +39,7 @@
namespace CodePaster {
- class CodePasterSettingsPage;
+class CodePasterSettingsPage;
class CodePasterProtocol : public Protocol
{
@@ -51,28 +52,29 @@ public:
bool canList() const;
bool hasSettings() const;
- Core::IOptionsPage* settingsPage();
+ Core::IOptionsPage *settingsPage();
void fetch(const QString &id);
void list(QListWidget *listWidget);
void paste(const QString &text,
- const QString &username = "",
- const QString &comment = "",
- const QString &description = "");
+ const QString &username = QString(),
+ const QString &comment = QString(),
+ const QString &description = QString());
public slots:
void fetchFinished();
void listFinished();
- void readPostResponseHeader(const QHttpResponseHeader&);
+ void readPostResponseHeader(const QHttpResponseHeader &);
private:
CodePasterSettingsPage *m_page;
QHttp http;
QNetworkAccessManager manager;
- QNetworkReply* reply;
- QNetworkReply* listReply;
- QListWidget* listWidget;
+ QNetworkReply *reply;
+ QNetworkReply *listReply;
+ QListWidget *listWidget;
QString fetchId;
};
-}
+} // namespace CodePaster
+
#endif // CODEPASTERPROTOCOL_H
diff --git a/src/plugins/cpaster/cpasterplugin.cpp b/src/plugins/cpaster/cpasterplugin.cpp
index 8c8f09118d6..36054f796a7 100644
--- a/src/plugins/cpaster/cpasterplugin.cpp
+++ b/src/plugins/cpaster/cpasterplugin.cpp
@@ -178,11 +178,11 @@ void CodepasterPlugin::post()
if (!view.show(username, description, comment, lst))
return; // User canceled post
- username = view.getUser();
- description = view.getDescription();
- comment = view.getComment();
- data = view.getContent();
- protocolName = view.getProtocol();
+ username = view.user();
+ description = view.description();
+ comment = view.comment();
+ data = view.content();
+ protocolName = view.protocol();
// Copied from cpaster. Otherwise lineendings will screw up
if (!data.contains("\r\n")) {
diff --git a/src/plugins/cpaster/pastebindotcaprotocol.h b/src/plugins/cpaster/pastebindotcaprotocol.h
index d6c2cc1725f..6861b9bb308 100644
--- a/src/plugins/cpaster/pastebindotcaprotocol.h
+++ b/src/plugins/cpaster/pastebindotcaprotocol.h
@@ -29,7 +29,9 @@
#ifndef PASTEBINDOTCAPROTOCOL_H
#define PASTEBINDOTCAPROTOCOL_H
+
#include "protocol.h"
+
#include <QtNetwork/QNetworkAccessManager>
#include <QtNetwork/QNetworkReply>
#include <QtNetwork/QHttp>
@@ -46,9 +48,9 @@ public:
void fetch(const QString &id);
void paste(const QString &text,
- const QString &username = "",
- const QString &comment = "",
- const QString &description = "");
+ const QString &username = QString(),
+ const QString &comment = QString(),
+ const QString &description = QString());
public slots:
void fetchFinished();
diff --git a/src/plugins/cpaster/pastebindotcomprotocol.h b/src/plugins/cpaster/pastebindotcomprotocol.h
index b7600d653fd..7d5afc7c309 100644
--- a/src/plugins/cpaster/pastebindotcomprotocol.h
+++ b/src/plugins/cpaster/pastebindotcomprotocol.h
@@ -29,7 +29,9 @@
#ifndef PASTEBINDOTCOMPROTOCOL_H
#define PASTEBINDOTCOMPROTOCOL_H
+
#include "protocol.h"
+
#include <QtNetwork/QNetworkAccessManager>
#include <QtNetwork/QNetworkReply>
#include <QtNetwork/QHttp>
@@ -51,14 +53,14 @@ public:
void fetch(const QString &id);
void paste(const QString &text,
- const QString &username = "",
- const QString &comment = "",
- const QString &description = "");
+ const QString &username = QString(),
+ const QString &comment = QString(),
+ const QString &description = QString());
public slots:
void fetchFinished();
void postRequestFinished(int id, bool error);
- void readPostResponseHeader(const QHttpResponseHeader&);
+ void readPostResponseHeader(const QHttpResponseHeader &);
private:
PasteBinDotComSettings *settings;
diff --git a/src/plugins/cpaster/pasteview.cpp b/src/plugins/cpaster/pasteview.cpp
index 2466a8a290e..63043e32a57 100644
--- a/src/plugins/cpaster/pasteview.cpp
+++ b/src/plugins/cpaster/pasteview.cpp
@@ -94,7 +94,7 @@ PasteView::~PasteView()
{
}
-QString PasteView::getUser()
+QString PasteView::user() const
{
const QString username = m_ui.uiUsername->text();
if (username.isEmpty() || username == tr("<Username>"))
@@ -102,7 +102,7 @@ QString PasteView::getUser()
return username;
}
-QString PasteView::getDescription()
+QString PasteView::description() const
{
const QString description = m_ui.uiDescription->text();
if (description == tr("<Description>"))
@@ -110,7 +110,7 @@ QString PasteView::getDescription()
return description;
}
-QString PasteView::getComment()
+QString PasteView::comment() const
{
const QString comment = m_ui.uiComment->toPlainText();
if (comment == tr("<Comment>"))
@@ -118,7 +118,7 @@ QString PasteView::getComment()
return comment;
}
-QByteArray PasteView::getContent()
+QByteArray PasteView::content() const
{
QByteArray newContent;
for (int i = 0; i < m_ui.uiPatchList->count(); ++i) {
@@ -129,14 +129,14 @@ QByteArray PasteView::getContent()
return newContent;
}
-QString PasteView::getProtocol()
+QString PasteView::protocol() const
{
return m_ui.protocolBox->currentText();
}
void PasteView::contentChanged()
{
- m_ui.uiPatchView->setPlainText(getContent());
+ m_ui.uiPatchView->setPlainText(content());
}
int PasteView::show(const QString &user, const QString &description, const QString &comment,
diff --git a/src/plugins/cpaster/pasteview.h b/src/plugins/cpaster/pasteview.h
index 7554e6be9c3..ef66f20a558 100644
--- a/src/plugins/cpaster/pasteview.h
+++ b/src/plugins/cpaster/pasteview.h
@@ -30,12 +30,12 @@
#ifndef PASTEVIEW_H
#define PASTEVIEW_H
-#include <QDialog>
-#include <QByteArray>
-
#include "splitter.h"
#include "ui_pasteview.h"
+#include <QDialog>
+#include <QByteArray>
+
class PasteView : public QDialog
{
Q_OBJECT
@@ -48,11 +48,11 @@ public:
void addProtocol(const QString &protocol, bool defaultProtocol = false);
- QString getUser();
- QString getDescription();
- QString getComment();
- QByteArray getContent();
- QString getProtocol();
+ QString user() const;
+ QString description() const;
+ QString comment() const;
+ QByteArray content() const;
+ QString protocol() const;
private slots:
void contentChanged();
diff --git a/src/plugins/cpaster/protocol.h b/src/plugins/cpaster/protocol.h
index 5b45326c06c..d8c7e975be1 100644
--- a/src/plugins/cpaster/protocol.h
+++ b/src/plugins/cpaster/protocol.h
@@ -26,8 +26,10 @@
** contact the sales department at http://www.qtsoftware.com/contact.
**
**************************************************************************/
+
#ifndef PROTOCOL_H
#define PROTOCOL_H
+
#include "settingspage.h"
#include <coreplugin/dialogs/ioptionspage.h>
@@ -35,7 +37,9 @@
#include <QtCore/QObject>
#include <QtCore/QString>
+QT_BEGIN_NAMESPACE
class QListWidget;
+QT_END_NAMESPACE
class Protocol : public QObject
{
@@ -55,9 +59,9 @@ public:
virtual void fetch(const QString &id) = 0;
virtual void list(QListWidget *listWidget);
virtual void paste(const QString &text,
- const QString &username = "",
- const QString &comment = "",
- const QString &description = "") = 0;
+ const QString &username = QString(),
+ const QString &comment = QString(),
+ const QString &description = QString()) = 0;
signals:
void pasteDone(const QString &link);
--
GitLab