X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/37327c9b0aae112c5890703cba1f0157043007e0..9e8e58147:/src/main.cpp diff --git a/src/main.cpp b/src/main.cpp index a4b1b1963..fba45f43c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -21,7 +21,6 @@ #include #include #include -#include #include #include @@ -38,7 +37,7 @@ #endif #include -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();