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

List:       kde-commits
Subject:    [calligra/kexi-frameworks7-staniek] kexi/main: Kexi: Wrap KexiMainWindow::migrateManager() with empt
From:       Jaroslaw Staniek <staniek () kde ! org>
Date:       2015-06-30 20:24:22
Message-ID: E1ZA24s-0006Ps-7o () scm ! kde ! org
[Download RAW message or body]

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

Kexi: Wrap KexiMainWindow::migrateManager() with empty implementation

Temp. solution, removes crashes before the Migration module is ported

M  +11   -3    kexi/main/KexiMainWindow.cpp
M  +16   -1    kexi/main/KexiMainWindow_p.h

http://commits.kde.org/calligra/16094af09301d16192d8555b9a3658d2b1829be4

diff --git a/kexi/main/KexiMainWindow.cpp b/kexi/main/KexiMainWindow.cpp
index eba233a..ad4b3ab 100644
--- a/kexi/main/KexiMainWindow.cpp
+++ b/kexi/main/KexiMainWindow.cpp
@@ -4246,15 +4246,23 @@ KexiUserFeedbackAgent* KexiMainWindow::userFeedback=
Agent() const
     return &d->userFeedback;
 }
 =

+//! @todo KEXI3 remove when Migation is ported
+KexiMigrateManagerTemp::~KexiMigrateManagerTemp() {}
+
+QStringList KexiMigrateManagerTemp::supportedFileMimeTypes() { return QStr=
ingList(); }
+
 KexiMigrateManagerInterface* KexiMainWindow::migrateManager()
 {
-/*! @todo KEXI3
     if (d->migrateManager.isNull()) {
+        //! @todo KEXI3
+#if 0
         d->migrateManager.reset(new KexiMigration::MigrateManager());
+#else
+        // tmp
+        d->migrateManager.reset(new KexiMigrateManagerTemp());
+#endif
     }
     return d->migrateManager.data();
-    */
-    return 0;
 }
 =

 void KexiMainWindow::toggleFullScreen(bool isFullScreen)
diff --git a/kexi/main/KexiMainWindow_p.h b/kexi/main/KexiMainWindow_p.h
index 62bb1d4..2c302ec 100644
--- a/kexi/main/KexiMainWindow_p.h
+++ b/kexi/main/KexiMainWindow_p.h
@@ -418,6 +418,16 @@ private:
 //! @internal safer dictionary
 typedef QMap< int, KexiWindow* > KexiWindowDict;
 =

+//! @todo KEXI3 remove when Migation is ported
+class KexiMigrateManagerTemp : public QObject, public KexiMigrateManagerIn=
terface
+{
+public:
+    virtual ~KexiMigrateManagerTemp();
+
+    //! Implement to return the list offile MIME types that are supported =
by migration drivers
+    virtual QStringList supportedFileMimeTypes();
+};
+
 //! @internal
 class KexiMainWindow::Private
 {
@@ -644,7 +654,12 @@ public:
 =

     KexiUserFeedbackAgent userFeedback;
 =

-    //! @todo KEXI3 QScopedPointer<KexiMigration::MigrateManager> migrateM=
anager;
+    //! @todo KEXI3
+#if 0
+    QScopedPointer<KexiMigration::MigrateManager> migrateManager;
+#else
+    QScopedPointer<KexiMigrateManagerTemp> migrateManager;
+#endif
 =

 private:
     //! @todo move to KexiProject

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