summaryrefslogtreecommitdiffstats
path: root/src/sdk
diff options
context:
space:
mode:
authorkh1 <karsten.heimrich@digia.com>2014-09-03 15:01:44 +0200
committerKarsten Heimrich <karsten.heimrich@digia.com>2014-09-05 10:53:15 +0200
commitb73ef0fa7e24e48204a4560b03eb95721bcd2d4c (patch)
tree59952a0401b2547ef6307e8287d5180fc317304b /src/sdk
parentb7fba68fc38f92099a7dd8ce25a4ef31f2a024ea (diff)
Fix some std::cout usage.
Fixes missing timestamps and some propably wrong conversion. Change-Id: I6106e1ea61d0840d132dd3b44cd746f023e795af Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Diffstat (limited to 'src/sdk')
-rw-r--r--src/sdk/installerbase.cpp15
1 files changed, 6 insertions, 9 deletions
diff --git a/src/sdk/installerbase.cpp b/src/sdk/installerbase.cpp
index 4d13339cd..33f8d39e3 100644
--- a/src/sdk/installerbase.cpp
+++ b/src/sdk/installerbase.cpp
@@ -64,8 +64,6 @@
#include <QTemporaryFile>
#include <QTranslator>
-#include <iostream>
-
InstallerBase::InstallerBase(int &argc, char *argv[])
: SDKApp<QApplication>(argc, argv)
, m_core(0)
@@ -108,10 +106,9 @@ int InstallerBase::run()
&magicMarker, cookie);
if (QInstaller::isVerbose()) {
- using namespace std;
- cout << "Language:" << QLocale().uiLanguages().value(0,
- QLatin1String("No UI language set")).constData() << endl;
- cout << "Arguments: " << arguments().join(QLatin1String(", ")).constData() << endl;
+ qDebug() << "Language:" << QLocale().uiLanguages().value(0,
+ QLatin1String("No UI language set")).toUtf8().constData();
+ qDebug() << "Arguments: " << arguments().join(QLatin1String(", ")).toUtf8().constData();
}
registerMetaResources(resources); // the base class will unregister the resources
@@ -282,13 +279,13 @@ int InstallerBase::run()
void InstallerBase::dumpResourceTree() const
{
- std::cout << "Resource tree:" << std::endl;
+ qDebug() << "Resource tree:";
QDirIterator it(QLatin1String(":/"), QDir::NoDotAndDotDot | QDir::AllEntries | QDir::Hidden,
QDirIterator::Subdirectories);
while (it.hasNext()) {
if (it.next().startsWith(QLatin1String(":/qt-project.org")))
continue;
- std::cout << " " << it.filePath().constData() << std::endl;
+ qDebug() << " " << it.filePath().toUtf8().constData();
}
}
@@ -296,6 +293,6 @@ QStringList InstallerBase::repositories(const QString &list) const
{
const QStringList items = list.split(QLatin1Char(','), QString::SkipEmptyParts);
foreach (const QString &item, items)
- std::cout << "Adding custom repository:" << item.constData() << std::endl;
+ qDebug() << "Adding custom repository:" << item.toUtf8().constData();
return items;
}