diff options
7 files changed, 8 insertions, 11 deletions
diff --git a/installerbuilder/installerbase/installerbase.cpp b/installerbuilder/installerbase/installerbase.cpp index f62325db0..bf8fc270f 100644 --- a/installerbuilder/installerbase/installerbase.cpp +++ b/installerbuilder/installerbase/installerbase.cpp @@ -174,8 +174,7 @@ int main(int argc, char *argv[]) // install "our" default translator const QString ourLocaleFile = QString::fromLatin1(":/translations/%1.qm").arg(QLocale().name().toLower()); - if (QFile::exists(ourLocaleFile)) - { + if (QFile::exists(ourLocaleFile)) { QTranslator* const translator = new QTranslator(&app); translator->load(ourLocaleFile); app.installTranslator(translator); diff --git a/installerbuilder/libinstaller/component.cpp b/installerbuilder/libinstaller/component.cpp index 643b8e628..03e1ed335 100644 --- a/installerbuilder/libinstaller/component.cpp +++ b/installerbuilder/libinstaller/component.cpp @@ -112,7 +112,7 @@ void Component::loadDataFromPackage(const LocalPackage &package) setValue(QLatin1String("InstallDate"), package.installDate.toString()); setValue(scUncompressedSize, QString::number(package.uncompressedSize)); - QString dependstr = QLatin1String(""); + QString dependstr; foreach (const QString &val, package.dependencies) dependstr += val + QLatin1String(","); diff --git a/installerbuilder/libinstaller/getrepositoriesmetainfojob.cpp b/installerbuilder/libinstaller/getrepositoriesmetainfojob.cpp index 974ace1ff..63ceae278 100644 --- a/installerbuilder/libinstaller/getrepositoriesmetainfojob.cpp +++ b/installerbuilder/libinstaller/getrepositoriesmetainfojob.cpp @@ -110,8 +110,8 @@ void GetRepositoriesMetaInfoJob::reset() m_repositoryByTemporaryDirectory.clear(); setError(KDJob::NoError); + setErrorString(QString()); setCapabilities(Cancelable); - setErrorString(QLatin1String("")); } bool GetRepositoriesMetaInfoJob::isCanceled() const diff --git a/installerbuilder/libinstaller/getrepositorymetainfojob.cpp b/installerbuilder/libinstaller/getrepositorymetainfojob.cpp index 47adfb18e..ba7e1574a 100644 --- a/installerbuilder/libinstaller/getrepositorymetainfojob.cpp +++ b/installerbuilder/libinstaller/getrepositorymetainfojob.cpp @@ -357,7 +357,7 @@ void GetRepositoryMetaInfoJob::fetchNextMetaInfo() const QString repoUrl = m_repository.url().toString(); const QUrl url = QString::fromLatin1("%1/%2/%3meta.7z").arg(repoUrl, next, - online ? nextVersion : QLatin1String("")); + online ? nextVersion : QString()); if (!m_publicKey.isEmpty()) { const CryptoSignatureVerifier verifier(m_publicKey); diff --git a/installerbuilder/libinstaller/init.cpp b/installerbuilder/libinstaller/init.cpp index c4248a699..f3757546e 100644 --- a/installerbuilder/libinstaller/init.cpp +++ b/installerbuilder/libinstaller/init.cpp @@ -213,9 +213,6 @@ void QInstaller::init() // load 7z stuff, if we're a static lib ::initArchives(); - // proxy settings - //QNetworkProxyFactory::setUseSystemConfiguration( true ); - // qDebug -> verbose() qInstallMsgHandler(messageHandler); } diff --git a/installerbuilder/libinstaller/packagemanagercore_p.cpp b/installerbuilder/libinstaller/packagemanagercore_p.cpp index e17168745..36d064a33 100644 --- a/installerbuilder/libinstaller/packagemanagercore_p.cpp +++ b/installerbuilder/libinstaller/packagemanagercore_p.cpp @@ -576,11 +576,12 @@ void PackageManagerCorePrivate::initialize() disconnect(this, SIGNAL(uninstallationStarted()), ProgressCoordinator::instance(), SLOT(reset())); connect(this, SIGNAL(uninstallationStarted()), ProgressCoordinator::instance(), SLOT(reset())); + m_updaterApplication.updateSourcesInfo()->setFileName(QString()); m_updaterApplication.packagesInfo()->setFileName(componentsXmlPath()); - m_updaterApplication.updateSourcesInfo()->setFileName(QLatin1String("")); m_updaterApplication.packagesInfo()->setApplicationName(m_settings.applicationName()); m_updaterApplication.packagesInfo()->setApplicationVersion(m_settings.applicationVersion()); + if (isInstaller()) { m_updaterApplication.addUpdateSource(m_settings.applicationName(), m_settings.applicationName(), QString(), QUrl(QLatin1String("resource://metadata/")), 0); diff --git a/installerbuilder/libinstaller/packagemanagergui.cpp b/installerbuilder/libinstaller/packagemanagergui.cpp index ecd601ba6..bad452f8d 100644 --- a/installerbuilder/libinstaller/packagemanagergui.cpp +++ b/installerbuilder/libinstaller/packagemanagergui.cpp @@ -152,7 +152,7 @@ public: setPixmap(QWizard::WatermarkPixmap, QPixmap()); setLayout(new QVBoxLayout); - setSubTitle(QLatin1String("")); + setSubTitle(QString()); setTitle(widget->windowTitle()); m_widget->setProperty("complete", true); m_widget->setProperty("final", false); @@ -873,8 +873,8 @@ LicenseAgreementPage::LicenseAgreementPage(PackageManagerCore *core) void LicenseAgreementPage::entering() { m_licenseListWidget->clear(); + m_textBrowser->setText(QString()); m_licenseListWidget->setVisible(false); - m_textBrowser->setText(QLatin1String("")); packageManagerCore()->calculateComponentsToInstall(); foreach (QInstaller::Component *component, packageManagerCore()->orderedComponentsToInstall()) |