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

List:       kde-commits
Subject:    [calligra/frameworks] /: Port slotFileOpenRecent to new signature of KRecentFilesAction::urlSelected
From:       Friedrich W. H. Kossebau <kossebau () kde ! org>
Date:       2015-03-31 19:15:56
Message-ID: E1Yd1dk-0005CX-NS () scm ! kde ! org
[Download RAW message or body]

Git commit bb4aecc51b4e2e5851a25ab96db4c2353a387fc3 by Friedrich W. H. Kossebau.
Committed on 31/03/2015 at 19:14.
Pushed by kossebau into branch 'frameworks'.

Port slotFileOpenRecent to new signature of KRecentFilesAction::urlSelected

M  +2    -2    gemini/desktopviewproxy.cpp
M  +1    -1    gemini/desktopviewproxy.h
M  +2    -2    krita/gemini/desktopviewproxy.cpp
M  +1    -1    krita/gemini/desktopviewproxy.h
M  +2    -2    krita/ui/KisMainWindow.cpp
M  +1    -1    krita/ui/KisMainWindow.h
M  +2    -2    libs/main/KoMainWindow.cpp
M  +1    -1    libs/main/KoMainWindow.h

http://commits.kde.org/calligra/bb4aecc51b4e2e5851a25ab96db4c2353a387fc3

diff --git a/gemini/desktopviewproxy.cpp b/gemini/desktopviewproxy.cpp
index 5567ee3..e52ef02 100644
--- a/gemini/desktopviewproxy.cpp
+++ b/gemini/desktopviewproxy.cpp
@@ -92,7 +92,7 @@ DesktopViewProxy::DesktopViewProxy(MainWindow* mainWindow, \
                KoMainWindow* parent)
     // Recent files need a touch more work, as they aren't simply an action.
     KRecentFilesAction* recent = \
qobject_cast<KRecentFilesAction*>(d->desktopView->actionCollection()->action("file_open_recent"));
  recent->disconnect(d->desktopView);
-    connect(recent, SIGNAL(urlSelected(KUrl)), this, \
SLOT(slotFileOpenRecent(KUrl))); +    connect(recent, SIGNAL(urlSelected(QUrl)), \
this, SLOT(slotFileOpenRecent(QUrl)));  recent->clear();
     recent->loadEntries(KGlobal::config()->group("RecentFiles"));
 
@@ -171,7 +171,7 @@ void DesktopViewProxy::loadExistingAsNew()
     d->isImporting = false;
 }
 
-void DesktopViewProxy::slotFileOpenRecent(const KUrl& url)
+void DesktopViewProxy::slotFileOpenRecent(const QUrl& url)
 {
     QProcess::startDetached(qApp->applicationFilePath(), QStringList() << \
url.toLocalFile(), QDir::currentPath());  }
diff --git a/gemini/desktopviewproxy.h b/gemini/desktopviewproxy.h
index 33a689a..7bfd0e3 100644
--- a/gemini/desktopviewproxy.h
+++ b/gemini/desktopviewproxy.h
@@ -42,7 +42,7 @@ public Q_SLOTS:
     bool fileSaveAs();
     void reload();
     void loadExistingAsNew();
-    void slotFileOpenRecent(const KUrl &url);
+    void slotFileOpenRecent(const QUrl &url);
 
 Q_SIGNALS:
     void documentSaved();
diff --git a/krita/gemini/desktopviewproxy.cpp b/krita/gemini/desktopviewproxy.cpp
index f7afe00..d19aa88 100644
--- a/krita/gemini/desktopviewproxy.cpp
+++ b/krita/gemini/desktopviewproxy.cpp
@@ -94,7 +94,7 @@ DesktopViewProxy::DesktopViewProxy(MainWindow* mainWindow, \
                KisMainWindow* parent
     // Recent files need a touch more work, as they aren't simply an action.
     KRecentFilesAction* recent = \
qobject_cast<KRecentFilesAction*>(d->desktopView->actionCollection()->action("file_open_recent"));
  recent->disconnect(d->desktopView);
-    connect(recent, SIGNAL(urlSelected(KUrl)), this, \
SLOT(slotFileOpenRecent(KUrl))); +    connect(recent, SIGNAL(urlSelected(QUrl)), \
this, SLOT(slotFileOpenRecent(QUrl)));  recent->clear();
     recent->loadEntries(KGlobal::config()->group("RecentFiles"));
 
@@ -175,7 +175,7 @@ void DesktopViewProxy::loadExistingAsNew()
     d->isImporting = false;
 }
 
-void DesktopViewProxy::slotFileOpenRecent(const KUrl& url)
+void DesktopViewProxy::slotFileOpenRecent(const QUrl& url)
 {
     QProcess::startDetached(qApp->applicationFilePath(), QStringList() << \
url.toLocalFile(), QDir::currentPath());  }
diff --git a/krita/gemini/desktopviewproxy.h b/krita/gemini/desktopviewproxy.h
index b998a9b..26c752d 100644
--- a/krita/gemini/desktopviewproxy.h
+++ b/krita/gemini/desktopviewproxy.h
@@ -44,7 +44,7 @@ public Q_SLOTS:
     bool fileSaveAs();
     void reload();
     void loadExistingAsNew();
-    void slotFileOpenRecent(const KUrl &url);
+    void slotFileOpenRecent(const QUrl &url);
 
     void toggleShowJustTheCanvas(bool toggled);
 
diff --git a/krita/ui/KisMainWindow.cpp b/krita/ui/KisMainWindow.cpp
index d4af78d..5b2f4b8 100644
--- a/krita/ui/KisMainWindow.cpp
+++ b/krita/ui/KisMainWindow.cpp
@@ -1144,7 +1144,7 @@ void KisMainWindow::slotFileOpen()
     }
 }
 
-void KisMainWindow::slotFileOpenRecent(const KUrl & url)
+void KisMainWindow::slotFileOpenRecent(const QUrl & url)
 {
     // Create a copy, because the original KUrl in the map of recent files in
     // KRecentFilesAction may get deleted.
@@ -2007,7 +2007,7 @@ void KisMainWindow::createActions()
     actionManager->createStandardAction(KStandardAction::New, this, \
                SLOT(slotFileNew()));
     actionManager->createStandardAction(KStandardAction::Open, this, \
SLOT(slotFileOpen()));  
-    d->recentFiles = KStandardAction::openRecent(this, SLOT(slotFileOpenRecent(const \
KUrl&)), actionCollection()); +    d->recentFiles = KStandardAction::openRecent(this, \
                SLOT(slotFileOpenRecent(QUrl)), actionCollection());
     connect(d->recentFiles, SIGNAL(recentListCleared()), this, \
SLOT(saveRecentFiles()));  KSharedConfigPtr configPtr = \
KisFactory::componentData().config();  \
                d->recentFiles->loadEntries(configPtr->group("RecentFiles"));
diff --git a/krita/ui/KisMainWindow.h b/krita/ui/KisMainWindow.h
index a52e5f2..3df1229 100644
--- a/krita/ui/KisMainWindow.h
+++ b/krita/ui/KisMainWindow.h
@@ -204,7 +204,7 @@ public Q_SLOTS:
      *  If the current document is empty, the opened document replaces it.
      *  If not a new mainwindow will be opened for showing the opened file.
      */
-    void slotFileOpenRecent(const KUrl &);
+    void slotFileOpenRecent(const QUrl &);
 
     /**
      * @brief slotPreferences open the preferences dialog
diff --git a/libs/main/KoMainWindow.cpp b/libs/main/KoMainWindow.cpp
index 0b1c4aaa2..523218d 100644
--- a/libs/main/KoMainWindow.cpp
+++ b/libs/main/KoMainWindow.cpp
@@ -289,7 +289,7 @@ KoMainWindow::KoMainWindow(const QByteArray nativeMimeType, const \
KComponentData  
     actionCollection()->addAction(KStandardAction::New, "file_new", this, \
                SLOT(slotFileNew()));
     actionCollection()->addAction(KStandardAction::Open, "file_open", this, \
                SLOT(slotFileOpen()));
-    d->recent = KStandardAction::openRecent(this, SLOT(slotFileOpenRecent(const \
KUrl&)), actionCollection()); +    d->recent = KStandardAction::openRecent(this, \
                SLOT(slotFileOpenRecent(QUrl)), actionCollection());
     connect(d->recent, SIGNAL(recentListCleared()), this, SLOT(saveRecentFiles()));
     d->saveAction = actionCollection()->addAction(KStandardAction::Save,  \
                "file_save", this, SLOT(slotFileSave()));
     d->saveActionAs = actionCollection()->addAction(KStandardAction::SaveAs,  \
"file_save_as", this, SLOT(slotFileSaveAs())); @@ -1333,7 +1333,7 @@ void \
KoMainWindow::slotFileOpen()  (void) openDocument(url);
 }
 
-void KoMainWindow::slotFileOpenRecent(const KUrl & url)
+void KoMainWindow::slotFileOpenRecent(const QUrl & url)
 {
     // Create a copy, because the original KUrl in the map of recent files in
     // KRecentFilesAction may get deleted.
diff --git a/libs/main/KoMainWindow.h b/libs/main/KoMainWindow.h
index eeae5d6..386eda7 100644
--- a/libs/main/KoMainWindow.h
+++ b/libs/main/KoMainWindow.h
@@ -227,7 +227,7 @@ public Q_SLOTS:
      *  If the current document is empty, the opened document replaces it.
      *  If not a new mainwindow will be opened for showing the opened file.
      */
-    void slotFileOpenRecent(const KUrl &);
+    void slotFileOpenRecent(const QUrl &);
 
     /**
      *  Saves the current document with the current name.


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