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

List:       kde-commits
Subject:    [kde-baseapps/frameworks] lib/konq/src: kdelibs4support--, port to new connect api
From:       Montel Laurent <montel () kde ! org>
Date:       2014-10-06 21:18:53
Message-ID: E1XbFgD-0005P3-Az () scm ! kde ! org
[Download RAW message or body]

Git commit 8d423fb3084843f083434670b282b877bd4ef578 by Montel Laurent.
Committed on 06/10/2014 at 21:18.
Pushed by mlaurent into branch 'frameworks'.

kdelibs4support--, port to new connect api

M  +6    -6    lib/konq/src/konq_copytomenu.cpp
M  +1    -1    lib/konq/src/konq_historyprovider.cpp
M  +7    -12   lib/konq/src/konq_operations.cpp

http://commits.kde.org/kde-baseapps/8d423fb3084843f083434670b282b877bd4ef578

diff --git a/lib/konq/src/konq_copytomenu.cpp b/lib/konq/src/konq_copytomenu.cpp
index 1d17a46..0b363c9 100644
--- a/lib/konq/src/konq_copytomenu.cpp
+++ b/lib/konq/src/konq_copytomenu.cpp
@@ -21,7 +21,7 @@
 
 #include "konq_copytomenu.h"
 #include "konq_copytomenu_p.h"
-#include <kaction.h>
+#include <QAction>
 #include <kdebug.h>
 #include <kicon.h>
 #include <kglobal.h>
@@ -102,7 +102,7 @@ KonqCopyToMainMenu::KonqCopyToMainMenu(QMenu* parent, \
KonqCopyToMenuPrivate* _d,  : KMenu(parent), m_menuType(menuType),
       m_actionGroup(static_cast<QWidget *>(0)),
       d(_d),
-      m_recentDirsGroup(KGlobal::config(), m_menuType == Copy ? "kuick-copy" : \
"kuick-move") +      m_recentDirsGroup(KSharedConfig::openConfig(), m_menuType == \
Copy ? "kuick-copy" : "kuick-move")  {
     connect(this, &KonqCopyToMainMenu::aboutToShow, this, \
                &KonqCopyToMainMenu::slotAboutToShow);
     connect(&m_actionGroup, &QActionGroup::triggered, this, \
&KonqCopyToMainMenu::slotTriggered); @@ -157,8 +157,8 @@ void \
KonqCopyToMainMenu::slotAboutToShow()  #endif
 
     // Browse... action, shows a KFileDialog
-    KAction* browseAction = new KAction(i18nc("@title:menu in Copy To or Move To \
                submenu", "Browse..."), this);
-    connect(browseAction, &KAction::triggered, this, \
&KonqCopyToMainMenu::slotBrowse); +    QAction * browseAction = new \
QAction(i18nc("@title:menu in Copy To or Move To submenu", "Browse..."), this); +    \
connect(browseAction, &QAction::triggered, this, &KonqCopyToMainMenu::slotBrowse);  \
addAction(browseAction);  
     addSeparator(); // looks like Qt4 handles removing it automatically if it's last \
in the menu, nice. @@ -168,7 +168,7 @@ void KonqCopyToMainMenu::slotAboutToShow()
     Q_FOREACH(const QString& recentDir, recentDirs) {
         const KUrl url(recentDir);
         const QString text = KStringHandler::csqueeze(url.pathOrUrl(), 60); // \
                shorten very long paths (#61386)
-        KAction* act = new KAction(text, this);
+        QAction * act = new QAction(text, this);
         act->setData(url);
         m_actionGroup.addAction(act);
         addAction(act);
@@ -228,7 +228,7 @@ KonqCopyToDirectoryMenu::KonqCopyToDirectoryMenu(QMenu* parent, \
KonqCopyToMainMe  void KonqCopyToDirectoryMenu::slotAboutToShow()
 {
     clear();
-    KAction* act = new KAction(m_mainMenu->menuType() == Copy
+    QAction * act = new QAction(m_mainMenu->menuType() == Copy
                                ? i18nc("@title:menu", "Copy Here")
                                : i18nc("@title:menu", "Move Here"), this);
     act->setData(KUrl(m_path));
diff --git a/lib/konq/src/konq_historyprovider.cpp \
b/lib/konq/src/konq_historyprovider.cpp index 7910c6a..98b619d 100644
--- a/lib/konq/src/konq_historyprovider.cpp
+++ b/lib/konq/src/konq_historyprovider.cpp
@@ -100,7 +100,7 @@ private Q_SLOTS: // connected to DBUS signals
 public:
     KSharedConfig::Ptr konqConfig() {
         // We want to use konquerorrc even when this class isn't used in konqueror,
-        // this is why this doesn't say KGlobal::config().
+        // this is why this doesn't say KSharedConfig::openConfig().
         return KSharedConfig::openConfig("konquerorrc");
     }
 
diff --git a/lib/konq/src/konq_operations.cpp b/lib/konq/src/konq_operations.cpp
index 31e917f..5d84348 100644
--- a/lib/konq/src/konq_operations.cpp
+++ b/lib/konq/src/konq_operations.cpp
@@ -118,10 +118,8 @@ KonqOperations *KonqOperations::doPasteV2(QWidget *parent, const \
KUrl &destUrl,  if (copyJob) {
             op->setOperation(job, move ? MOVE : COPY, copyJob->destUrl());
             KIO::FileUndoManager::self()->recordJob(move ? \
                KIO::FileUndoManager::Move : KIO::FileUndoManager::Copy, \
                KUrl::List(), destUrl, job);
-            connect(copyJob, &KIO::CopyJob::copyingDone,
-                    op, &KonqOperations::slotCopyingDone);
-            connect(copyJob, &KIO::CopyJob::copyingLinkDone,
-                    op, &KonqOperations::slotCopyingLinkDone);
+            connect(copyJob, &KIO::CopyJob::copyingDone, op, \
&KonqOperations::slotCopyingDone); +            connect(copyJob, \
                &KIO::CopyJob::copyingLinkDone, op, \
                &KonqOperations::slotCopyingLinkDone);
         } else if (KIO::SimpleJob *simpleJob = qobject_cast<KIO::SimpleJob*>(job)) {
             op->setOperation(job, PUT, simpleJob->url());
             KIO::FileUndoManager::self()->recordJob(KIO::FileUndoManager::Put, \
KUrl::List(), simpleJob->url(), job); @@ -327,7 +325,7 @@ void \
KonqOperations::doDropFileCopy()  mlst.append(*it);
         if ( local && KDesktopFile::isDesktopFile((*it).toLocalFile()))
             isDesktopFile = true;
-        if ( local && (*it).path().startsWith(KGlobalSettings::desktopPath()))
+        if ( local && \
(*it).path().startsWith(QStandardPaths::writableLocation(QStandardPaths::DesktopLocation)))
  itemIsOnDesktop = true;
         if ( local || (*it).protocol() != "trash" )
             allItemsAreFromTrash = false;
@@ -335,7 +333,7 @@ void KonqOperations::doDropFileCopy()
 
     bool linkOnly = false; // if true, we'll show a popup menu, but with only "link" \
                in it (for confirmation)
     if (isDesktopFile && !KAuthorized::authorizeKAction("run_desktop_files") &&
-        (m_destUrl.path(KUrl::AddTrailingSlash) == KGlobalSettings::desktopPath()) ) \
{ +        (m_destUrl.path(KUrl::AddTrailingSlash) == \
QStandardPaths::writableLocation(QStandardPaths::DesktopLocation)) ) {  linkOnly = \
true;  } else if ( allItemsAreFromTrash && lst.first().path() == "/" ) {
         // Dropping a link to the trash: don't move the full contents, just make a \
link (#319660) @@ -503,10 +501,8 @@ void KonqOperations::doDropFileCopy()
     default : kError(1203) << "Unknown action " << (int)action << endl;
     }
     if (job) {
-        connect(job, &KIO::CopyJob::copyingDone,
-                this, &KonqOperations::slotCopyingDone);
-        connect(job, &KIO::CopyJob::copyingLinkDone,
-                this, &KonqOperations::slotCopyingLinkDone);
+        connect(job, &KIO::CopyJob::copyingDone, this, \
&KonqOperations::slotCopyingDone); +        connect(job, \
&KIO::CopyJob::copyingLinkDone, this, &KonqOperations::slotCopyingLinkDone);  return; \
// we still have stuff to do -> don't delete ourselves  }
     deleteLater();
@@ -590,8 +586,7 @@ void KonqOperations::setOperation( KIO::Job * job, Operation \
method, const KUrl  if ( job )
     {
         KJobWidgets::setWindow(job, parentWidget());
-        connect( job, &KIO::Job::result,
-                 this, &KonqOperations::slotResult );
+        connect( job, &KIO::Job::result, this, &KonqOperations::slotResult );
     }
     else // for link
         slotResult( 0L );


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