From: Aaron J. Seigo Date: Tue, 19 Dec 2006 02:26:06 +0000 (+0000) Subject: KStdAction -> KStandardAction X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/934ba42b0933a25109d45a5d96cbfef5f64d64f8 KStdAction -> KStandardAction svn path=/trunk/playground/utils/dolphin/; revision=614825 --- diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp index 4c04170d6..4bbd2d6a7 100644 --- a/src/dolphincontextmenu.cpp +++ b/src/dolphincontextmenu.cpp @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include "dolphinmainwindow.h" #include "dolphinview.h" @@ -119,7 +119,7 @@ void DolphinContextMenu::openViewportContextMenu() popup->insertItem(SmallIcon("filenew"), i18n("Create New"), createNewMenu); popup->insertSeparator(); - QAction* pasteAction = dolphin->actionCollection()->action(KStdAction::stdName(KStdAction::Paste)); + QAction* pasteAction = dolphin->actionCollection()->action(KStandardAction::stdName(KStandardAction::Paste)); popup->addAction(pasteAction); // setup 'View Mode' menu @@ -177,10 +177,10 @@ void DolphinContextMenu::openItemContextMenu() const KUrl::List urls = m_dolphinView->selectedUrls(); // insert 'Cut', 'Copy' and 'Paste' - const KStdAction::StdAction actionNames[] = { KStdAction::Cut, KStdAction::Copy, KStdAction::Paste }; - const int count = sizeof(actionNames) / sizeof(KStdAction::StdAction); + const KStandardAction::StdAction actionNames[] = { KStandardAction::Cut, KStandardAction::Copy, KStandardAction::Paste }; + const int count = sizeof(actionNames) / sizeof(KStandardAction::StdAction); for (int i = 0; i < count; ++i) { - QAction* action = dolphin->actionCollection()->action(KStdAction::stdName(actionNames[i])); + QAction* action = dolphin->actionCollection()->action(KStandardAction::stdName(actionNames[i])); if (action) popup->addAction(action); } diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index 640e7071c..c1b99d9a8 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include #include @@ -610,7 +610,7 @@ void DolphinMainWindow::slotDeleteFileFinished(KJob* job) void DolphinMainWindow::slotUndoAvailable(bool available) { - QAction* undoAction = actionCollection()->action(KStdAction::stdName(KStdAction::Undo)); + QAction* undoAction = actionCollection()->action(KStandardAction::stdName(KStandardAction::Undo)); if (undoAction != 0) { undoAction->setEnabled(available); } @@ -618,7 +618,7 @@ void DolphinMainWindow::slotUndoAvailable(bool available) void DolphinMainWindow::slotUndoTextChanged(const QString& text) { - QAction* undoAction = actionCollection()->action(KStdAction::stdName(KStdAction::Undo)); + QAction* undoAction = actionCollection()->action(KStandardAction::stdName(KStandardAction::Undo)); if (undoAction != 0) { undoAction->setText(text); } @@ -626,7 +626,7 @@ void DolphinMainWindow::slotUndoTextChanged(const QString& text) void DolphinMainWindow::slotRedoAvailable(bool available) { - QAction* redoAction = actionCollection()->action(KStdAction::stdName(KStdAction::Redo)); + QAction* redoAction = actionCollection()->action(KStandardAction::stdName(KStandardAction::Redo)); if (redoAction != 0) { redoAction->setEnabled(available); } @@ -634,7 +634,7 @@ void DolphinMainWindow::slotRedoAvailable(bool available) void DolphinMainWindow::slotRedoTextChanged(const QString& text) { - QAction* redoAction = actionCollection()->action(KStdAction::stdName(KStdAction::Redo)); + QAction* redoAction = actionCollection()->action(KStandardAction::stdName(KStandardAction::Redo)); if (redoAction != 0) { redoAction->setText(text); } @@ -696,7 +696,7 @@ void DolphinMainWindow::paste() void DolphinMainWindow::updatePasteAction() { - QAction* pasteAction = actionCollection()->action(KStdAction::stdName(KStdAction::Paste)); + QAction* pasteAction = actionCollection()->action(KStandardAction::stdName(KStandardAction::Paste)); if (pasteAction == 0) { return; } @@ -1174,11 +1174,11 @@ void DolphinMainWindow::setupActions() properties->setShortcut(Qt::Key_Alt | Qt::Key_Return); connect(properties, SIGNAL(triggered()), this, SLOT(properties())); - KStdAction::quit(this, SLOT(quit()), actionCollection()); + KStandardAction::quit(this, SLOT(quit()), actionCollection()); // setup 'Edit' menu UndoManager& undoManager = UndoManager::instance(); - KStdAction::undo(this, + KStandardAction::undo(this, SLOT(undo()), actionCollection()); connect(&undoManager, SIGNAL(undoAvailable(bool)), @@ -1186,7 +1186,7 @@ void DolphinMainWindow::setupActions() connect(&undoManager, SIGNAL(undoTextChanged(const QString&)), this, SLOT(slotUndoTextChanged(const QString&))); - KStdAction::redo(this, + KStandardAction::redo(this, SLOT(redo()), actionCollection()); connect(&undoManager, SIGNAL(redoAvailable(bool)), @@ -1194,9 +1194,9 @@ void DolphinMainWindow::setupActions() connect(&undoManager, SIGNAL(redoTextChanged(const QString&)), this, SLOT(slotRedoTextChanged(const QString&))); - KStdAction::cut(this, SLOT(cut()), actionCollection()); - KStdAction::copy(this, SLOT(copy()), actionCollection()); - KStdAction::paste(this, SLOT(paste()), actionCollection()); + KStandardAction::cut(this, SLOT(cut()), actionCollection()); + KStandardAction::copy(this, SLOT(copy()), actionCollection()); + KStandardAction::paste(this, SLOT(paste()), actionCollection()); KAction* selectAll = new KAction(i18n("Select All"), actionCollection(), "select_all"); selectAll->setShortcut(Qt::CTRL + Qt::Key_A); @@ -1207,11 +1207,11 @@ void DolphinMainWindow::setupActions() connect(invertSelection, SIGNAL(triggered()), this, SLOT(invertSelection())); // setup 'View' menu - KStdAction::zoomIn(this, + KStandardAction::zoomIn(this, SLOT(zoomIn()), actionCollection()); - KStdAction::zoomOut(this, + KStandardAction::zoomOut(this, SLOT(zoomOut()), actionCollection()); @@ -1280,10 +1280,10 @@ void DolphinMainWindow::setupActions() connect(adjustViewProps, SIGNAL(triggered()), this, SLOT(adjustViewProperties())); // setup 'Go' menu - KStdAction::back(this, SLOT(goBack()), actionCollection()); - KStdAction::forward(this, SLOT(goForward()), actionCollection()); - KStdAction::up(this, SLOT(goUp()), actionCollection()); - KStdAction::home(this, SLOT(goHome()), actionCollection()); + KStandardAction::back(this, SLOT(goBack()), actionCollection()); + KStandardAction::forward(this, SLOT(goForward()), actionCollection()); + KStandardAction::up(this, SLOT(goUp()), actionCollection()); + KStandardAction::home(this, SLOT(goHome()), actionCollection()); // setup 'Tools' menu KAction* openTerminal = new KAction(i18n("Open Terminal"), actionCollection(), "open_terminal"); @@ -1306,7 +1306,7 @@ void DolphinMainWindow::setupActions() connect(compareFiles, SIGNAL(triggered()), this, SLOT(compareFiles())); // setup 'Settings' menu - KStdAction::preferences(this, SLOT(editSettings()), actionCollection()); + KStandardAction::preferences(this, SLOT(editSettings()), actionCollection()); } void DolphinMainWindow::setupDockWidgets() @@ -1488,12 +1488,12 @@ void DolphinMainWindow::updateEditActions() void DolphinMainWindow::updateViewActions() { - QAction* zoomInAction = actionCollection()->action(KStdAction::stdName(KStdAction::ZoomIn)); + QAction* zoomInAction = actionCollection()->action(KStandardAction::stdName(KStandardAction::ZoomIn)); if (zoomInAction != 0) { zoomInAction->setEnabled(m_activeView->isZoomInPossible()); } - QAction* zoomOutAction = actionCollection()->action(KStdAction::stdName(KStdAction::ZoomOut)); + QAction* zoomOutAction = actionCollection()->action(KStandardAction::stdName(KStandardAction::ZoomOut)); if (zoomOutAction != 0) { zoomOutAction->setEnabled(m_activeView->isZoomOutPossible()); } @@ -1535,7 +1535,7 @@ void DolphinMainWindow::updateViewActions() void DolphinMainWindow::updateGoActions() { - QAction* goUpAction = actionCollection()->action(KStdAction::stdName(KStdAction::Up)); + QAction* goUpAction = actionCollection()->action(KStandardAction::stdName(KStandardAction::Up)); const KUrl& currentUrl = m_activeView->url(); goUpAction->setEnabled(currentUrl.upUrl() != currentUrl); }