Get back names, and use "using" keyword to keep GCC silent on "method foo on base...

[dolphin.git] / src / dolphinviewcontainer.cpp

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 53b1c75293d05b103eef6d7787261cc4d1fc64b0..184dd2bee02539d1420da622c2f1f8f7bbe3ef15 100644 (file)
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -28,6 +28,7 @@
 #include <QtCore/QTimer>
 #include <QtGui/QScrollBar>
 
 #include <QtCore/QTimer>
 #include <QtGui/QScrollBar>
 

+#include <kdesktopfile.h>

 #include <kfileitemdelegate.h>
 #include <kfileplacesmodel.h>
 #include <kglobalsettings.h>
 #include <kfileitemdelegate.h>
 #include <kfileplacesmodel.h>
 #include <kglobalsettings.h>


@@ -85,8 +86,6 @@ DolphinViewContainer::DolphinViewContainer(const KUrl& url, QWidget* parent) :
             this, SLOT(dropUrls(const KUrl&, QDropEvent*)));
     connect(m_urlNavigator, SIGNAL(activated()),
             this, SLOT(activate()));
             this, SLOT(dropUrls(const KUrl&, QDropEvent*)));
     connect(m_urlNavigator, SIGNAL(activated()),
             this, SLOT(activate()));

-    //connect(m_urlNavigator, SIGNAL(tabRequested(const KUrl&)),
-    //        this,

     connect(m_urlNavigator->editor(), SIGNAL(completionModeChanged(KGlobalSettings::Completion)),
             this, SLOT(saveUrlCompletionMode(KGlobalSettings::Completion)));
 
     connect(m_urlNavigator->editor(), SIGNAL(completionModeChanged(KGlobalSettings::Completion)),
             this, SLOT(saveUrlCompletionMode(KGlobalSettings::Completion)));
 


@@ -309,7 +308,6 @@ void DolphinViewContainer::slotDirListerCompleted()
     } else {
         updateStatusBar();
     }
     } else {
         updateStatusBar();
     }

-    QMetaObject::invokeMethod(this, "restoreViewState", Qt::QueuedConnection);

 
     // Enable the 'File'->'Create New...' menu only if the directory
     // supports writing.
 
     // Enable the 'File'->'Create New...' menu only if the directory
     // supports writing.


@@ -371,13 +369,6 @@ void DolphinViewContainer::setNameFilter(const QString& nameFilter)
     delayedStatusBarUpdate();
 }
 
     delayedStatusBarUpdate();
 }
 

-void DolphinViewContainer::restoreViewState()
-{
-    QByteArray locationState = m_urlNavigator->locationState();
-    QDataStream stream(&locationState, QIODevice::ReadOnly);
-    m_view->restoreState(stream);
-}
-

 void DolphinViewContainer::activate()
 {
     setActive(true);
 void DolphinViewContainer::activate()
 {
     setActive(true);


@@ -460,12 +451,11 @@ void DolphinViewContainer::saveUrlCompletionMode(KGlobalSettings::Completion com
 
 void DolphinViewContainer::slotHistoryChanged()
 {
 
 void DolphinViewContainer::slotHistoryChanged()
 {

-    const int index = m_urlNavigator->historyIndex();
-    if (index > 0) {       
-        // The "Go Forward" action is enabled. Try to mark
-        // the previous directory as active item:
-        const KUrl url = m_urlNavigator->locationUrl(index - 1);
-        m_view->activateItem(url);
+    QByteArray locationState = m_urlNavigator->locationState();
+
+    if (!locationState.isEmpty()) {
+        QDataStream stream(&locationState, QIODevice::ReadOnly);
+        m_view->restoreState(stream);

     }
 }
 
     }
 }
 


@@ -494,6 +484,16 @@ void DolphinViewContainer::slotItemTriggered(const KFileItem& item)
         }
     }
 
         }
     }
 

+    if (item.mimetype() == "application/x-desktop") {
+        // redirect to the url in Type=Link desktop files
+        KDesktopFile desktopFile(url.toLocalFile());
+        if (desktopFile.hasLinkType()) {
+            url = desktopFile.readUrl();
+            m_view->setUrl(url);
+            return;
+        }
+    }
+

     item.run();
 }
 
     item.run();
 }