Merge branch 'release/21.04' addendum

[dolphin.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index a4b1b1963fc61683ccaf31bf214b25b926648443..fba45f43c431b9698e272c5d3676e1e8a3490a9f 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -21,7 +21,6 @@
 #include <KCrash>
 #include <KDBusService>
 #include <KLocalizedString>
-#include <KToolBar>
 #include <Kdelibs4ConfigMigrator>
 #include <KConfigGui>
 
@@ -38,7 +37,7 @@
 #endif
 #include <iostream>
 
-extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
+int main(int argc, char **argv)
 {
 #ifndef Q_OS_WIN
     // Prohibit using sudo or kdesu (but allow using the root user directly)
@@ -214,12 +213,6 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
             }
         }
     }
-    Qt::ToolBarArea area = mainWindow->toolBarArea(mainWindow->toolBar());
-    if (area != Qt::TopToolBarArea && area != Qt::BottomToolBarArea) {
-        // Migrate users with disabled tool bar positions.
-        // Remove this a few years from now (2020).
-        mainWindow->addToolBar(Qt::TopToolBarArea, mainWindow->toolBar());
-    }
 
 #ifdef HAVE_KUSERFEEDBACK
     auto feedbackProvider = DolphinFeedbackProvider::instance();