[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdepim] pimcommon/shorturl: Remove duplicate code
From: Montel Laurent <montel () kde ! org>
Date: 2013-11-01 6:27:43
Message-ID: E1Vc8Ct-00086G-MF () scm ! kde ! org
[Download RAW message or body]
Git commit f0679ca0ff40319bec09770fe23c628c5ed0e1b6 by Montel Laurent.
Committed on 01/11/2013 at 06:27.
Pushed by mlaurent into branch 'master'.
Remove duplicate code
M +8 -0 pimcommon/shorturl/abstractshorturl.cpp
M +6 -1 pimcommon/shorturl/abstractshorturl.h
M +1 -10 pimcommon/shorturl/googleshorturl.cpp
M +0 -3 pimcommon/shorturl/googleshorturl.h
M +1 -10 pimcommon/shorturl/migremeshorturl.cpp
M +0 -3 pimcommon/shorturl/migremeshorturl.h
M +1 -11 pimcommon/shorturl/tinyurlshorturl.cpp
M +0 -3 pimcommon/shorturl/tinyurlshorturl.h
http://commits.kde.org/kdepim/f0679ca0ff40319bec09770fe23c628c5ed0e1b6
diff --git a/pimcommon/shorturl/abstractshorturl.cpp \
b/pimcommon/shorturl/abstractshorturl.cpp index d273f1b..ce6f105 100644
--- a/pimcommon/shorturl/abstractshorturl.cpp
+++ b/pimcommon/shorturl/abstractshorturl.cpp
@@ -17,6 +17,8 @@
#include "abstractshorturl.h"
+#include <KLocale>
+
using namespace PimCommon;
AbstractShortUrl::AbstractShortUrl(QObject *parent)
: QObject(parent),
@@ -35,4 +37,10 @@ void AbstractShortUrl::shortUrl(const QString &url)
mOriginalUrl = url;
}
+void AbstractShortUrl::slotErrorFound(QNetworkReply::NetworkError error)
+{
+ mErrorFound = true;
+ Q_EMIT shortUrlFailed(i18n("Error reported by server: \'%1\'", error));
+}
+
#include "abstractshorturl.moc"
diff --git a/pimcommon/shorturl/abstractshorturl.h \
b/pimcommon/shorturl/abstractshorturl.h index ffe1959..f192c7e 100644
--- a/pimcommon/shorturl/abstractshorturl.h
+++ b/pimcommon/shorturl/abstractshorturl.h
@@ -18,9 +18,11 @@
#ifndef ABSTRACTSHORTURL_H
#define ABSTRACTSHORTURL_H
+#include "pimcommon_export.h"
+
#include <QObject>
+#include <QNetworkReply>
-#include "pimcommon_export.h"
namespace PimCommon {
class PIMCOMMON_EXPORT AbstractShortUrl : public QObject
@@ -37,6 +39,9 @@ Q_SIGNALS:
void shortUrlDone(const QString &url);
void shortUrlFailed(const QString &error);
+protected Q_SLOTS:
+ void slotErrorFound(QNetworkReply::NetworkError error);
+
protected:
QString mOriginalUrl;
bool mErrorFound;
diff --git a/pimcommon/shorturl/googleshorturl.cpp \
b/pimcommon/shorturl/googleshorturl.cpp index 21f2820..fd3cd87 100644
--- a/pimcommon/shorturl/googleshorturl.cpp
+++ b/pimcommon/shorturl/googleshorturl.cpp
@@ -17,8 +17,6 @@
#include "googleshorturl.h"
-#include <KLocale>
-
#include <QNetworkAccessManager>
#include <QNetworkRequest>
#include <QUrl>
@@ -48,7 +46,7 @@ void GoogleShortUrl::start()
const QString data = QString::fromLatin1("{\"longUrl\": \
\"%1/\"}").arg(mOriginalUrl);
QNetworkReply *reply = mNetworkAccessManager->post(request, data.toUtf8());
- connect(reply, SIGNAL(error(QNetworkReply::NetworkError)), this, \
SLOT(slotError(QNetworkReply::NetworkError))); + connect(reply, \
SIGNAL(error(QNetworkReply::NetworkError)), this, \
SLOT(slotErrorFound(QNetworkReply::NetworkError))); }
void GoogleShortUrl::slotShortUrlFinished(QNetworkReply *reply)
@@ -71,11 +69,4 @@ void GoogleShortUrl::slotShortUrlFinished(QNetworkReply *reply)
}
}
-void GoogleShortUrl::slotError(QNetworkReply::NetworkError error)
-{
- mErrorFound = true;
- Q_EMIT shortUrlFailed(i18n("Error reported by server: \'%1\'", error));
-}
-
-
#include "googleshorturl.moc"
diff --git a/pimcommon/shorturl/googleshorturl.h \
b/pimcommon/shorturl/googleshorturl.h index 4ab341f..ba9f0b4 100644
--- a/pimcommon/shorturl/googleshorturl.h
+++ b/pimcommon/shorturl/googleshorturl.h
@@ -20,8 +20,6 @@
#include "shorturl/abstractshorturl.h"
-#include <QNetworkReply>
-
class QNetworkAccessManager;
namespace PimCommon {
class GoogleShortUrl : public PimCommon::AbstractShortUrl
@@ -35,7 +33,6 @@ public:
private Q_SLOTS:
void slotShortUrlFinished(QNetworkReply*reply);
- void slotError(QNetworkReply::NetworkError error);
private:
QNetworkAccessManager *mNetworkAccessManager;
diff --git a/pimcommon/shorturl/migremeshorturl.cpp \
b/pimcommon/shorturl/migremeshorturl.cpp index 580076f..35cb3f7 100644
--- a/pimcommon/shorturl/migremeshorturl.cpp
+++ b/pimcommon/shorturl/migremeshorturl.cpp
@@ -18,8 +18,6 @@
#include "migremeshorturl.h"
-#include <KLocale>
-
#include <QNetworkAccessManager>
#include <QNetworkRequest>
#include <QUrl>
@@ -43,7 +41,7 @@ void MigremeShortUrl::start()
{
const QString requestUrl = \
QString::fromLatin1("http://migre.me/api.txt?url=%1").arg(mOriginalUrl);
QNetworkReply *reply = mNetworkAccessManager->get(QNetworkRequest(requestUrl));
- connect(reply, SIGNAL(error(QNetworkReply::NetworkError)), this, \
SLOT(slotError(QNetworkReply::NetworkError))); + connect(reply, \
SIGNAL(error(QNetworkReply::NetworkError)), this, \
SLOT(slotErrorFound(QNetworkReply::NetworkError))); }
void MigremeShortUrl::slotShortUrlFinished(QNetworkReply *reply)
@@ -58,12 +56,5 @@ void MigremeShortUrl::slotShortUrlFinished(QNetworkReply *reply)
}
}
-void MigremeShortUrl::slotError(QNetworkReply::NetworkError error)
-{
- mErrorFound = true;
- Q_EMIT shortUrlFailed(i18n("Error reported by server: \'%1\'", error));
-}
-
-
#include "migremeshorturl.moc"
diff --git a/pimcommon/shorturl/migremeshorturl.h \
b/pimcommon/shorturl/migremeshorturl.h index 63f2e39..97b166e 100644
--- a/pimcommon/shorturl/migremeshorturl.h
+++ b/pimcommon/shorturl/migremeshorturl.h
@@ -20,8 +20,6 @@
#define MIGREMESHORTURL_H
#include "abstractshorturl.h"
-#include <QNetworkReply>
-
class QNetworkAccessManager;
namespace PimCommon {
@@ -36,7 +34,6 @@ public:
private Q_SLOTS:
void slotShortUrlFinished(QNetworkReply*reply);
- void slotError(QNetworkReply::NetworkError error);
private:
QNetworkAccessManager *mNetworkAccessManager;
diff --git a/pimcommon/shorturl/tinyurlshorturl.cpp \
b/pimcommon/shorturl/tinyurlshorturl.cpp index a8fa426..fb17b45 100644
--- a/pimcommon/shorturl/tinyurlshorturl.cpp
+++ b/pimcommon/shorturl/tinyurlshorturl.cpp
@@ -18,8 +18,6 @@
#include "tinyurlshorturl.h"
-#include <KLocale>
-
#include <QNetworkAccessManager>
#include <QNetworkRequest>
#include <QUrl>
@@ -43,7 +41,7 @@ void TinyurlShortUrl::start()
{
const QString requestUrl = \
QString::fromLatin1("http://tinyurl.com/api-create.php?url=%1").arg(mOriginalUrl);
QNetworkReply *reply = mNetworkAccessManager->get(QNetworkRequest(requestUrl));
- connect(reply, SIGNAL(error(QNetworkReply::NetworkError)), this, \
SLOT(slotError(QNetworkReply::NetworkError))); + connect(reply, \
SIGNAL(error(QNetworkReply::NetworkError)), this, \
SLOT(slotErrorFound(QNetworkReply::NetworkError))); }
void TinyurlShortUrl::slotShortUrlFinished(QNetworkReply *reply)
@@ -58,12 +56,4 @@ void TinyurlShortUrl::slotShortUrlFinished(QNetworkReply *reply)
}
}
-void TinyurlShortUrl::slotError(QNetworkReply::NetworkError error)
-{
- mErrorFound = true;
- Q_EMIT shortUrlFailed(i18n("Error reported by server: \'%1\'", error));
-}
-
-
-
#include "tinyurlshorturl.moc"
diff --git a/pimcommon/shorturl/tinyurlshorturl.h \
b/pimcommon/shorturl/tinyurlshorturl.h index c6b7a36..1f21600 100644
--- a/pimcommon/shorturl/tinyurlshorturl.h
+++ b/pimcommon/shorturl/tinyurlshorturl.h
@@ -20,8 +20,6 @@
#define TINYURLSHORTURL_H
#include "abstractshorturl.h"
-#include <QNetworkReply>
-
class QNetworkAccessManager;
namespace PimCommon {
@@ -36,7 +34,6 @@ public:
private Q_SLOTS:
void slotShortUrlFinished(QNetworkReply*reply);
- void slotError(QNetworkReply::NetworkError error);
private:
QNetworkAccessManager *mNetworkAccessManager;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic