summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Jenssen <tim.jenssen@nokia.com>2012-01-16 16:11:36 +0100
committerTim Jenssen <tim.jenssen@nokia.com>2012-01-17 12:06:20 +0100
commit649382c8b982f8485fedcfb676f7add7189a3b47 (patch)
tree08d845a03114b89f8979a766ba78cde34c2cb0f5
parent376804db8788bfde1985b9d2bbc14af68e9c9260 (diff)
Remove unused functions from verbose class.
Change-Id: I2b02ab64eaf77a26ed476984c3af4f688415d13e Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
-rw-r--r--installerbuilder/common/utils.cpp10
-rw-r--r--installerbuilder/common/utils.h31
2 files changed, 0 insertions, 41 deletions
diff --git a/installerbuilder/common/utils.cpp b/installerbuilder/common/utils.cpp
index ee3f89b9d..21f95ea90 100644
--- a/installerbuilder/common/utils.cpp
+++ b/installerbuilder/common/utils.cpp
@@ -98,21 +98,11 @@ std::ostream &QInstaller::stdverbose()
return null;
}
-std::ostream &QInstaller::operator<<(std::ostream &os, const QUrl &url)
-{
- return os << "QUrl( " << url.toString() << ")";
-}
-
std::ostream &QInstaller::operator<<(std::ostream &os, const QString &string)
{
return os << qPrintable(string);
}
-std::ostream &QInstaller::operator<<(std::ostream &os, const QByteArray &array)
-{
- return os << '"' << QString::fromAscii( array ) << '"';
-}
-
//TODO from kdupdaterfiledownloader.cpp, use that one once merged
QByteArray QInstaller::calculateHash(QIODevice *device, QCryptographicHash::Algorithm algo)
{
diff --git a/installerbuilder/common/utils.h b/installerbuilder/common/utils.h
index 898b2b111..e620a4dd2 100644
--- a/installerbuilder/common/utils.h
+++ b/installerbuilder/common/utils.h
@@ -55,18 +55,7 @@ namespace QInstaller {
bool INSTALLER_EXPORT isVerbose();
INSTALLER_EXPORT std::ostream& stdverbose();
- INSTALLER_EXPORT std::ostream& operator<<(std::ostream &os, const QUrl &url);
INSTALLER_EXPORT std::ostream& operator<<(std::ostream &os, const QString &string);
- INSTALLER_EXPORT std::ostream& operator<<(std::ostream &os, const QByteArray &array);
- template <typename T>
- std::ostream& operator<<(std::ostream &os, const QList<T> &list)
- {
- os << "(";
- for (typename QList<T>::const_iterator it = list.begin(); it != list.end(); ++it)
- os << *it;
- os << ");";
- return os;
- }
class VerboseWriter;
INSTALLER_EXPORT VerboseWriter &verbose();
@@ -80,27 +69,7 @@ namespace QInstaller {
static VerboseWriter *instance();
- inline VerboseWriter &operator<<(bool t) { stdverbose() << t; stream << (t ? "true" : "false"); return *this; }
- inline VerboseWriter &operator<<(int t) { stdverbose() << t; stream << t; return *this; }
- inline VerboseWriter &operator<<(qint64 t) { stdverbose() << t; stream << t; return *this; }
- inline VerboseWriter &operator<<(quint64 t) { stdverbose() << t; stream << t; return *this; }
- inline VerboseWriter &operator<<(double t) { stdverbose() << t; stream << t; return *this; }
- inline VerboseWriter &operator<<(std::string &t) { stdverbose() << t; stream << QString::fromStdString(t); return *this; }
- inline VerboseWriter &operator<<(const QByteArray &t) { stdverbose() << t; stream << t; return *this; }
- inline VerboseWriter &operator<<(const QString &t) { stdverbose() << t; stream << t; return *this; }
- inline VerboseWriter &operator<<(const QStringRef &t) { return verbose() << t.toString(); }
- inline VerboseWriter &operator<<(const QLatin1String &t) { stdverbose() << t; stream << t; return *this; }
inline VerboseWriter &operator<<(const char *t) { stdverbose() << t; stream << t; return *this; }
- inline VerboseWriter &operator<<(const QUrl &t) { return verbose() << t.toString(); }
- template <typename T>
- VerboseWriter &operator<<(const QList<T> &list)
- {
- verbose() << "List ( ";
- for (typename QList< T >::const_iterator it = list.begin(); it != list.end(); ++it)
- verbose() << *it <<"; ";
- return verbose() << ");";
- }
-
inline VerboseWriter &operator<<(std::ostream& (*f)(std::ostream &s)) { stdverbose() << *f; stream << "\n"; return *this; }
public slots:
void setOutputStream(const QString &fileName);