]> cloud.milkyroute.net Git - dolphin.git/commitdiff
Fix Q_OS_WIN ifdef
authorElvis Angelaccio <elvis.angelaccio@kde.org>
Sat, 14 Oct 2017 10:49:29 +0000 (12:49 +0200)
committerElvis Angelaccio <elvis.angelaccio@kde.org>
Sat, 14 Oct 2017 10:49:29 +0000 (12:49 +0200)
This should fix my previous commit.

src/dolphinmainwindow.cpp

index 07e80d5869dd44a06842560b68188f66e29b2e88..41c51b9dd81979b6b0574d70bf37d5df9fa28d8d 100644 (file)
@@ -1004,9 +1004,9 @@ void DolphinMainWindow::setUrlAsCaption(const QUrl& url)
     setWindowTitle(schemePrefix + fileName);
 }
 
     setWindowTitle(schemePrefix + fileName);
 }
 
-#ifndef Q_OS_WIN
 void DolphinMainWindow::slotStorageTearDownFromPlacesRequested(const QString& mountPath)
 {
 void DolphinMainWindow::slotStorageTearDownFromPlacesRequested(const QString& mountPath)
 {
+#ifndef Q_OS_WIN
     if (m_terminalPanel->currentWorkingDirectory().startsWith(mountPath)) {
         m_tearDownFromPlacesRequested = true;
         m_terminalPanel->goHome();
     if (m_terminalPanel->currentWorkingDirectory().startsWith(mountPath)) {
         m_tearDownFromPlacesRequested = true;
         m_terminalPanel->goHome();
@@ -1014,16 +1014,18 @@ void DolphinMainWindow::slotStorageTearDownFromPlacesRequested(const QString& mo
     } else {
         m_placesPanel->proceedWithTearDown();
     }
     } else {
         m_placesPanel->proceedWithTearDown();
     }
+#endif
 }
 
 void DolphinMainWindow::slotStorageTearDownExternallyRequested(const QString& mountPath)
 {
 }
 
 void DolphinMainWindow::slotStorageTearDownExternallyRequested(const QString& mountPath)
 {
+#ifndef Q_OS_WIN
     if (m_terminalPanel->currentWorkingDirectory().startsWith(mountPath)) {
         m_tearDownFromPlacesRequested = false;
         m_terminalPanel->goHome();
     }
     if (m_terminalPanel->currentWorkingDirectory().startsWith(mountPath)) {
         m_tearDownFromPlacesRequested = false;
         m_terminalPanel->goHome();
     }
-}
 #endif
 #endif
+}
 
 void DolphinMainWindow::setupActions()
 {
 
 void DolphinMainWindow::setupActions()
 {