diff --git a/krusader/Panel/listpanel.cpp b/krusader/Panel/listpanel.cpp --- a/krusader/Panel/listpanel.cpp +++ b/krusader/Panel/listpanel.cpp @@ -561,7 +561,7 @@ sizePolicy.setVerticalPolicy(QSizePolicy::Ignored); sidebar->setSizePolicy(sizePolicy); connect(this, &ListPanel::pathChanged, sidebar, &Sidebar::onPanelPathChange); - connect(sidebar, &Sidebar::urlActivated, SLOTS, &KRslots::refresh); + connect(sidebar, &Sidebar::urlActivated, SLOTS, &KrSlots::refresh); sidebarSplitter->insertWidget(0, sidebar); } diff --git a/krusader/krglobal.h b/krusader/krglobal.h --- a/krusader/krglobal.h +++ b/krusader/krglobal.h @@ -31,7 +31,7 @@ class KMountMan; class KrArcHandler; class KrBookmarkHandler; -class KRslots; +class KrSlots; class KrusaderView; class UserAction; class JobMan; @@ -47,7 +47,7 @@ static KMountMan *mountMan; // krusader's Mount Manager static KrArcHandler *arcMan; //! Manages archives in several parts of the code static KrBookmarkHandler *bookman; - static KRslots *slot; + static KrSlots *slot; static KrusaderView *mainView; // The GUI static QWidget *mainWindow; static UserAction *userAction; diff --git a/krusader/krglobal.cpp b/krusader/krglobal.cpp --- a/krusader/krglobal.cpp +++ b/krusader/krglobal.cpp @@ -33,7 +33,7 @@ KMountMan *KrGlobal::mountMan = nullptr; KrArcHandler *KrGlobal::arcMan = nullptr; KrBookmarkHandler *KrGlobal::bookman = nullptr; -KRslots *KrGlobal::slot = nullptr; +KrSlots *KrGlobal::slot = nullptr; KrusaderView *KrGlobal::mainView = nullptr; QWidget *KrGlobal::mainWindow = nullptr; UserAction *KrGlobal::userAction = nullptr; diff --git a/krusader/krslots.h b/krusader/krslots.h --- a/krusader/krslots.h +++ b/krusader/krslots.h @@ -58,15 +58,15 @@ } }; -class KRslots : public QObject +class KrSlots : public QObject { Q_OBJECT public: enum compareMode { full }; - explicit KRslots(QObject *parent); - ~KRslots() override = default; + explicit KrSlots(QObject *parent); + ~KrSlots() override = default; public slots: void sendFileByEmail(const QList &filename); diff --git a/krusader/krslots.cpp b/krusader/krslots.cpp --- a/krusader/krslots.cpp +++ b/krusader/krslots.cpp @@ -96,11 +96,11 @@ #define ACTIVE_VIEW _mainWindow->activeView() -KRslots::KRslots(QObject *parent) : QObject(parent), _mainWindow(krApp) +KrSlots::KrSlots(QObject *parent) : QObject(parent), _mainWindow(krApp) { } -void KRslots::sendFileByEmail(const QList &urls) +void KrSlots::sendFileByEmail(const QList &urls) { if (urls.count() == 0) { KMessageBox::error(nullptr, i18n("No selected files to send.")); @@ -153,7 +153,7 @@ KMessageBox::error(nullptr, i18n("Error executing %1.", mailProg)); } -void KRslots::compareContent() +void KrSlots::compareContent() { const QStringList lstLeft = LEFT_PANEL->getSelectedNames(); const QStringList lstRight = RIGHT_PANEL->getSelectedNames(); @@ -200,7 +200,7 @@ return false; } -void KRslots::compareContent(const QUrl& url1, const QUrl& url2) +void KrSlots::compareContent(const QUrl& url1, const QUrl& url2) { QString diffProg; QStringList lst = KrServices::supportedTools(); @@ -243,30 +243,30 @@ } // GUI toggle slots -void KRslots::toggleFnkeys() +void KrSlots::toggleFnkeys() { if (MAIN_VIEW->fnKeys()->isVisible()) MAIN_VIEW->fnKeys()->hide(); else MAIN_VIEW->fnKeys()->show(); } -void KRslots::toggleCmdline() +void KrSlots::toggleCmdline() { if (MAIN_VIEW->cmdLine()->isVisible()) MAIN_VIEW->cmdLine()->hide(); else MAIN_VIEW->cmdLine()->show(); } -void KRslots::updateStatusbarVisibility() +void KrSlots::updateStatusbarVisibility() { krApp->statusBar()->setVisible(KrActions::actShowStatusBar->isChecked()); } -void KRslots::toggleTerminal() +void KrSlots::toggleTerminal() { MAIN_VIEW->setTerminalEmulator(KrActions::actToggleTerminal->isChecked()); } -void KRslots::insertFileName(bool fullPath) +void KrSlots::insertFileName(bool fullPath) { QString filename = ACTIVE_VIEW->getCurrentItem(); if (filename.isEmpty()) { @@ -294,23 +294,23 @@ } } -void KRslots::refresh(const QUrl &u) +void KrSlots::refresh(const QUrl &u) { ACTIVE_FUNC->openUrl(u); } -void KRslots::runKonfigurator(bool firstTime) +void KrSlots::runKonfigurator(bool firstTime) { auto *konfigurator = new Konfigurator(firstTime); - connect(konfigurator, &Konfigurator::configChanged, this, &KRslots::configChanged); + connect(konfigurator, &Konfigurator::configChanged, this, &KrSlots::configChanged); //FIXME - no need to exec konfigurator->exec(); delete konfigurator; } -void KRslots::configChanged(bool isGUIRestartNeeded) +void KrSlots::configChanged(bool isGUIRestartNeeded) { krConfig->sync(); @@ -346,30 +346,30 @@ } } -void KRslots::showHiddenFiles(bool show) +void KrSlots::showHiddenFiles(bool show) { KConfigGroup group(krConfig, "Look&Feel"); group.writeEntry("Show Hidden", show); MAIN_VIEW->leftManager()->reloadConfig(); MAIN_VIEW->rightManager()->reloadConfig(); } -void KRslots::swapPanels() +void KrSlots::swapPanels() { QUrl leftURL = LEFT_PANEL->virtualPath(); QUrl rightURL = RIGHT_PANEL->virtualPath(); LEFT_PANEL->func->openUrl(rightURL); RIGHT_PANEL->func->openUrl(leftURL); } -void KRslots::toggleSwapSides() +void KrSlots::toggleSwapSides() { MAIN_VIEW->swapSides(); } -void KRslots::search() +void KrSlots::search() { if (KrSearchDialog::SearchDialog != nullptr) { KConfigGroup group(krConfig, "Search"); @@ -384,7 +384,7 @@ KrSearchDialog::SearchDialog = new KrSearchDialog(); } -void KRslots::locate() +void KrSlots::locate() { if (!KrServices::cmdExist("locate")) { KMessageBox::error(krApp, i18n("Cannot find the 'locate' command. Please install the " @@ -402,7 +402,7 @@ LocateDlg::LocateDialog = new LocateDlg(krApp); } -void KRslots::runTerminal(const QString & dir) +void KrSlots::runTerminal(const QString & dir) { KProcess proc; proc.setWorkingDirectory(dir); @@ -425,12 +425,12 @@ KMessageBox::sorry(krApp, i18n("Error executing %1.", term)); } -void KRslots::homeTerminal() +void KrSlots::homeTerminal() { runTerminal(QDir::homePath()); } -void KRslots::multiRename() +void KrSlots::multiRename() { QStringList lst = KrServices::supportedTools(); int i = lst.indexOf("RENAME"); @@ -465,7 +465,7 @@ KMessageBox::error(nullptr, i18n("Error executing '%1'.", proc.program().join(" "))); } -void KRslots::rootKrusader() +void KrSlots::rootKrusader() { if (KMessageBox::warningContinueCancel( krApp, i18n("Improper operations in root mode can damage your operating system. " @@ -491,7 +491,7 @@ KMessageBox::error(nullptr, i18n("Error executing %1.", proc.program()[0])); } -void KRslots::slotSplit() +void KrSlots::slotSplit() { const QStringList list = ACTIVE_PANEL->gui->getSelectedNames(); QString name; @@ -530,7 +530,7 @@ } } -void KRslots::slotCombine() +void KrSlots::slotCombine() { const QStringList list = ACTIVE_PANEL->gui->getSelectedNames(); if (list.isEmpty()) { @@ -640,21 +640,21 @@ ACTIVE_PANEL->otherPanel()->func->refresh(); } -void KRslots::manageUseractions() +void KrSlots::manageUseractions() { ActionMan actionMan(MAIN_VIEW); } #ifdef SYNCHRONIZER_ENABLED -void KRslots::slotSynchronizeDirs(QStringList selected) +void KrSlots::slotSynchronizeDirs(QStringList selected) { SynchronizerGUI *synchronizerDialog = new SynchronizerGUI(MAIN_VIEW, LEFT_PANEL->virtualPath(), RIGHT_PANEL->virtualPath(), std::move(selected)); synchronizerDialog->show(); // destroyed on close } #endif -void KRslots::compareSetup() +void KrSlots::compareSetup() { for (int i = 0; KrActions::compareArray[i] != nullptr; i++) if ((*KrActions::compareArray[i])->isChecked()) { @@ -665,7 +665,7 @@ } /** called by actions actExec* to choose the built-in command line mode */ -void KRslots::execTypeSetup() +void KrSlots::execTypeSetup() { for (int i = 0; KrActions::execTypeArray[i] != nullptr; i++) if ((*KrActions::execTypeArray[i])->isChecked()) { @@ -679,13 +679,13 @@ } } -void KRslots::slotDiskUsage() +void KrSlots::slotDiskUsage() { DiskUsageGUI *diskUsageDialog = new DiskUsageGUI(ACTIVE_PANEL->virtualPath()); diskUsageDialog->askDirAndShow(); } -void KRslots::applicationStateChanged() +void KrSlots::applicationStateChanged() { if (MAIN_VIEW == nullptr) { /* CRASH FIX: it's possible that the method is called after destroying the main view */ return; @@ -700,15 +700,15 @@ } } -void KRslots::emptyTrash() +void KrSlots::emptyTrash() { KrTrashHandler::emptyTrash(); } #define OPEN_ID 100001 #define EMPTY_TRASH_ID 100002 -void KRslots::trashPopupMenu() +void KrSlots::trashPopupMenu() { QMenu trashMenu(krApp); QAction * act = trashMenu.addAction(Icon("document-open"), i18n("Open trash bin")); @@ -729,21 +729,21 @@ } //shows the JavaScript-Console -void KRslots::jsConsole() +void KrSlots::jsConsole() { #ifdef __KJSEMBED__ if (! krJS) krJS = new KrJS(); krJS->view()->show(); #endif } -void KRslots::addBookmark() +void KrSlots::addBookmark() { krBookMan->bookmarkCurrent(ACTIVE_PANEL->virtualPath()); } -void KRslots::cmdlinePopup() +void KrSlots::cmdlinePopup() { MAIN_VIEW->cmdLine()->popup(); } diff --git a/krusader/krusader.cpp b/krusader/krusader.cpp --- a/krusader/krusader.cpp +++ b/krusader/krusader.cpp @@ -114,7 +114,7 @@ // create the "krusader" App = this; krMainWindow = this; - SLOTS = new KRslots(this); + SLOTS = new KrSlots(this); setXMLFile("krusaderui.rc"); // kpart-related xml file plzWait = new KRPleaseWaitHandler(this); @@ -142,7 +142,7 @@ // create MountMan KrGlobal::mountMan = new KMountMan(this); - connect(KrGlobal::mountMan, &KMountMan::refreshPanel, SLOTS, &KRslots::refresh); + connect(KrGlobal::mountMan, &KMountMan::refreshPanel, SLOTS, &KrSlots::refresh); // create popular URLs container _popularUrls = new PopularUrls(this); diff --git a/krusader/main.cpp b/krusader/main.cpp --- a/krusader/main.cpp +++ b/krusader/main.cpp @@ -302,7 +302,7 @@ signal(SIGPIPE, sigterm_handler); signal(SIGHUP, sigterm_handler); - QObject::connect(&app, &QGuiApplication::applicationStateChanged, SLOTS, &KRslots::applicationStateChanged); + QObject::connect(&app, &QGuiApplication::applicationStateChanged, SLOTS, &KrSlots::applicationStateChanged); // hide splashscreen if (splash) {