[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [calligra/kexi-frameworks7-staniek] kexi: Kexi: migrate manager: possibleProblemsInfoMsg() -> possib
From:       Jaroslaw Staniek <staniek () kde ! org>
Date:       2015-06-30 20:24:23
Message-ID: E1ZA24t-0006Ps-CS () scm ! kde ! org
[Download RAW message or body]

Git commit 7c513c7bb80276cb0a0f2edaae6e62dd714179a6 by Jaroslaw Staniek.
Committed on 30/06/2015 at 20:16.
Pushed by staniek into branch 'kexi-frameworks7-staniek'.

Kexi: migrate manager: possibleProblemsInfoMsg() -> possibleProblemsMessage()

M  +6    -6    kexi/main/startup/KexiStartup.cpp
M  +1    -1    kexi/migration/importtablewizard.cpp
M  +1    -1    kexi/migration/importwizard.cpp
M  +1    -1    kexi/migration/migratemanager.cpp
M  +1    -1    kexi/migration/migratemanager.h

http://commits.kde.org/calligra/7c513c7bb80276cb0a0f2edaae6e62dd714179a6

diff --git a/kexi/main/startup/KexiStartup.cpp b/kexi/main/startup/KexiStartup.cpp
index 953a9c6..bed12e5 100644
--- a/kexi/main/startup/KexiStartup.cpp
+++ b/kexi/main/startup/KexiStartup.cpp
@@ -862,10 +862,10 @@ tristate KexiStartupHandler::detectActionForFile(
 // qDebug() << "driver id:" << detectedDriverName;
 
     if (detectedDriverId->isEmpty()) {
-        QString possibleProblemsInfoMsg(Kexi::driverManager().possibleProblemsMessage());
                
-        if (!possibleProblemsInfoMsg.isEmpty()) {
-            possibleProblemsInfoMsg.prepend(QString::fromLatin1("<p>") + \
                xi18n("Possible problems:"));
-            possibleProblemsInfoMsg += QString::fromLatin1("</p>");
+        QString possibleProblemsMessage(Kexi::driverManager().possibleProblemsMessage());
 +        if (!possibleProblemsMessage.isEmpty()) {
+            possibleProblemsMessage.prepend(QString::fromLatin1("<p>") + \
xi18n("Possible problems:")); +            possibleProblemsMessage += \
QString::fromLatin1("</p>");  }
         if (!(options & SkipMessages)) {
             KMessageBox::detailedSorry(parent,
@@ -875,8 +875,8 @@ tristate KexiStartupHandler::detectActionForFile(
                      "type is %1%2.</para>%3",
                      mimename,
                      (mime.comment().isEmpty() ? QString() : QString::fromLatin1(" \
                (%1).").arg(mime.comment())),
-                     possibleProblemsInfoMsg.isEmpty() ? QString()
-                                                       : \
QString("<para>%1</para>").arg(possibleProblemsInfoMsg))); +                     \
possibleProblemsMessage.isEmpty() ? QString() +                                       \
: QString("<para>%1</para>").arg(possibleProblemsMessage)));  }
         return false;
     }
diff --git a/kexi/migration/importtablewizard.cpp \
b/kexi/migration/importtablewizard.cpp index 92e6d9b..e3213d4 100644
--- a/kexi/migration/importtablewizard.cpp
+++ b/kexi/migration/importtablewizard.cpp
@@ -563,7 +563,7 @@ KexiMigrate* ImportTableWizard::prepareImport(Kexi::ObjectStatus& \
result)  sourceDriverName = driverNameForSelectedSource();
     if (sourceDriverName.isEmpty())
         result.setStatus(xi18n("No appropriate migration driver found."),
-                            m_migrateManager->possibleProblemsInfoMsg());
+                            m_migrateManager->possibleProblemsMessage());
 
 
     // Get a source (migration) driver
diff --git a/kexi/migration/importwizard.cpp b/kexi/migration/importwizard.cpp
index 48042ab..d510184 100644
--- a/kexi/migration/importwizard.cpp
+++ b/kexi/migration/importwizard.cpp
@@ -757,7 +757,7 @@ KexiMigrate* ImportWizard::prepareImport(Kexi::ObjectStatus& \
result)  sourceDriverName = driverNameForSelectedSource();
         if (sourceDriverName.isEmpty())
             result.setStatus(xi18n("No appropriate migration driver found."),
-                             d->migrateManager.possibleProblemsInfoMsg());
+                             d->migrateManager.possibleProblemsMessage());
     }
 
     // Get a source (migration) driver
diff --git a/kexi/migration/migratemanager.cpp b/kexi/migration/migratemanager.cpp
index 7af98fd..e9a68cb 100644
--- a/kexi/migration/migratemanager.cpp
+++ b/kexi/migration/migratemanager.cpp
@@ -319,7 +319,7 @@ void MigrateManager::drv_clearServerResult()
     d_int->m_serverResultName.clear();
 }
 
-QString MigrateManager::possibleProblemsInfoMsg() const
+QString MigrateManager::possibleProblemsMessage() const
 {
     if (d_int->possibleProblems.isEmpty())
         return QString();
diff --git a/kexi/migration/migratemanager.h b/kexi/migration/migratemanager.h
index 666b624..22df4da 100644
--- a/kexi/migration/migratemanager.h
+++ b/kexi/migration/migratemanager.h
@@ -69,7 +69,7 @@ public:
     /*! HTML information about possible problems encountered.
      It's displayed in 'details' section, if an error encountered.
      Currently it contains a list of incompatible migration drivers. */
-    QString possibleProblemsInfoMsg() const;
+    QString possibleProblemsMessage() const;
 
     //! @return the list of file MIME types that are supported by migration drivers.
     //! Implements MigrateManagerInterface


[prev in list] [next in list] [prev in thread] [next in thread]