From: Montel Laurent Date: Sun, 31 Jul 2011 11:33:56 +0000 (+0200) Subject: normalize signals/slots X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/08d655c2bc107449ee322f8b826710b7e690950b normalize signals/slots --- diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp index 2eb4e92d0..617189715 100644 --- a/src/dolphincontextmenu.cpp +++ b/src/dolphincontextmenu.cpp @@ -86,8 +86,8 @@ DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent, if (m_keyInfo->isKeyPressed(Qt::Key_Shift) || m_keyInfo->isKeyLatched(Qt::Key_Shift)) { m_shiftPressed = true; } - connect(m_keyInfo, SIGNAL(keyPressed(Qt::Key, bool)), - this, SLOT(slotKeyModifierPressed(Qt::Key, bool))); + connect(m_keyInfo, SIGNAL(keyPressed(Qt::Key,bool)), + this, SLOT(slotKeyModifierPressed(Qt::Key,bool))); } m_removeAction = new QAction(this); diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index a379f31b0..73f18bdaa 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -152,16 +152,16 @@ DolphinMainWindow::DolphinMainWindow() : connect(undoManager, SIGNAL(undoAvailable(bool)), this, SLOT(slotUndoAvailable(bool))); - connect(undoManager, SIGNAL(undoTextChanged(const QString&)), - this, SLOT(slotUndoTextChanged(const QString&))); + connect(undoManager, SIGNAL(undoTextChanged(QString)), + this, SLOT(slotUndoTextChanged(QString))); connect(undoManager, SIGNAL(jobRecordingStarted(CommandType)), this, SLOT(clearStatusBar())); connect(undoManager, SIGNAL(jobRecordingFinished(CommandType)), this, SLOT(showCommand(CommandType))); - connect(DolphinSettings::instance().placesModel(), SIGNAL(errorMessage(const QString&)), - this, SLOT(showErrorMessage(const QString&))); - //connect(&DragAndDropHelper::instance(), SIGNAL(errorMessage(const QString&)), - // this, SLOT(showErrorMessage(const QString&))); + connect(DolphinSettings::instance().placesModel(), SIGNAL(errorMessage(QString)), + this, SLOT(showErrorMessage(QString))); + //connect(&DragAndDropHelper::instance(), SIGNAL(errorMessage(QString)), + // this, SLOT(showErrorMessage(QString))); const DolphinSettings& settings = DolphinSettings::instance(); @@ -193,7 +193,7 @@ DolphinMainWindow::DolphinMainWindow() : m_actionHandler->setCurrentView(view); m_remoteEncoding = new DolphinRemoteEncoding(this, m_actionHandler); - connect(this, SIGNAL(urlChanged(const KUrl&)), + connect(this, SIGNAL(urlChanged(KUrl)), m_remoteEncoding, SLOT(slotAboutToOpenUrl())); m_tabBar = new KTabBar(this); @@ -203,18 +203,18 @@ DolphinMainWindow::DolphinMainWindow() : this, SLOT(setActiveTab(int))); connect(m_tabBar, SIGNAL(tabCloseRequested(int)), this, SLOT(closeTab(int))); - connect(m_tabBar, SIGNAL(contextMenu(int, const QPoint&)), - this, SLOT(openTabContextMenu(int, const QPoint&))); + connect(m_tabBar, SIGNAL(contextMenu(int,QPoint)), + this, SLOT(openTabContextMenu(int,QPoint))); connect(m_tabBar, SIGNAL(newTabRequest()), this, SLOT(openNewTab())); - connect(m_tabBar, SIGNAL(testCanDecode(const QDragMoveEvent*, bool&)), - this, SLOT(slotTestCanDecode(const QDragMoveEvent*, bool&))); + connect(m_tabBar, SIGNAL(testCanDecode(const QDragMoveEvent*,bool&)), + this, SLOT(slotTestCanDecode(const QDragMoveEvent*,bool&))); connect(m_tabBar, SIGNAL(mouseMiddleClick(int)), this, SLOT(closeTab(int))); - connect(m_tabBar, SIGNAL(tabMoved(int, int)), - this, SLOT(slotTabMoved(int, int))); - connect(m_tabBar, SIGNAL(receivedDropEvent(int, QDropEvent*)), - this, SLOT(tabDropEvent(int, QDropEvent*))); + connect(m_tabBar, SIGNAL(tabMoved(int,int)), + this, SLOT(slotTabMoved(int,int))); + connect(m_tabBar, SIGNAL(receivedDropEvent(int,QDropEvent*)), + this, SLOT(tabDropEvent(int,QDropEvent*))); m_tabBar->blockSignals(true); // signals get unblocked after at least 2 tabs are open @@ -1656,7 +1656,7 @@ void DolphinMainWindow::setupActions() // setup 'Go' menu KAction* backAction = KStandardAction::back(this, SLOT(goBack()), actionCollection()); - connect(backAction, SIGNAL(triggered(Qt::MouseButtons, Qt::KeyboardModifiers)), this, SLOT(goBack(Qt::MouseButtons))); + connect(backAction, SIGNAL(triggered(Qt::MouseButtons,Qt::KeyboardModifiers)), this, SLOT(goBack(Qt::MouseButtons))); KShortcut backShortcut = backAction->shortcut(); backShortcut.setAlternate(Qt::Key_Backspace); backAction->setShortcut(backShortcut); @@ -1664,8 +1664,8 @@ void DolphinMainWindow::setupActions() m_recentTabsMenu = new KActionMenu(i18n("Recently Closed Tabs"), this); m_recentTabsMenu->setIcon(KIcon("edit-undo")); actionCollection()->addAction("closed_tabs", m_recentTabsMenu); - connect(m_recentTabsMenu->menu(), SIGNAL(triggered(QAction *)), - this, SLOT(restoreClosedTab(QAction *))); + connect(m_recentTabsMenu->menu(), SIGNAL(triggered(QAction*)), + this, SLOT(restoreClosedTab(QAction*))); QAction* action = new QAction(i18n("Empty Recently Closed Tabs"), m_recentTabsMenu); action->setIcon(KIcon("edit-clear-list")); @@ -1675,10 +1675,10 @@ void DolphinMainWindow::setupActions() m_recentTabsMenu->setEnabled(false); KAction* forwardAction = KStandardAction::forward(this, SLOT(goForward()), actionCollection()); - connect(forwardAction, SIGNAL(triggered(Qt::MouseButtons, Qt::KeyboardModifiers)), this, SLOT(goForward(Qt::MouseButtons))); + connect(forwardAction, SIGNAL(triggered(Qt::MouseButtons,Qt::KeyboardModifiers)), this, SLOT(goForward(Qt::MouseButtons))); KAction* upAction = KStandardAction::up(this, SLOT(goUp()), actionCollection()); - connect(upAction, SIGNAL(triggered(Qt::MouseButtons, Qt::KeyboardModifiers)), this, SLOT(goUp(Qt::MouseButtons))); + connect(upAction, SIGNAL(triggered(Qt::MouseButtons,Qt::KeyboardModifiers)), this, SLOT(goUp(Qt::MouseButtons))); KStandardAction::home(this, SLOT(goHome()), actionCollection()); @@ -1788,8 +1788,8 @@ void DolphinMainWindow::setupDockWidgets() addDockWidget(Qt::LeftDockWidgetArea, foldersDock); connect(this, SIGNAL(urlChanged(KUrl)), foldersPanel, SLOT(setUrl(KUrl))); - connect(foldersPanel, SIGNAL(changeUrl(KUrl, Qt::MouseButtons)), - this, SLOT(handlePlacesClick(KUrl, Qt::MouseButtons))); + connect(foldersPanel, SIGNAL(changeUrl(KUrl,Qt::MouseButtons)), + this, SLOT(handlePlacesClick(KUrl,Qt::MouseButtons))); // Setup "Terminal" #ifndef Q_OS_WIN @@ -1870,8 +1870,8 @@ void DolphinMainWindow::setupDockWidgets() addActionCloneToCollection(placesAction, "show_places_panel"); addDockWidget(Qt::LeftDockWidgetArea, placesDock); - connect(placesPanel, SIGNAL(urlChanged(KUrl, Qt::MouseButtons)), - this, SLOT(handlePlacesClick(KUrl, Qt::MouseButtons))); + connect(placesPanel, SIGNAL(urlChanged(KUrl,Qt::MouseButtons)), + this, SLOT(handlePlacesClick(KUrl,Qt::MouseButtons))); connect(this, SIGNAL(urlChanged(KUrl)), placesPanel, SLOT(setUrl(KUrl))); connect(placesDock, SIGNAL(visibilityChanged(bool)), @@ -2101,23 +2101,23 @@ void DolphinMainWindow::connectViewSignals(DolphinViewContainer* container) this, SLOT(slotRequestItemInfo(KFileItem))); connect(view, SIGNAL(activated()), this, SLOT(toggleActiveView())); - connect(view, SIGNAL(tabRequested(const KUrl&)), - this, SLOT(openNewTab(const KUrl&))); - connect(view, SIGNAL(requestContextMenu(KFileItem, const KUrl&, const QList&)), - this, SLOT(openContextMenu(KFileItem, const KUrl&, const QList&))); + connect(view, SIGNAL(tabRequested(KUrl)), + this, SLOT(openNewTab(KUrl))); + connect(view, SIGNAL(requestContextMenu(KFileItem,KUrl,QList)), + this, SLOT(openContextMenu(KFileItem,KUrl,QList))); connect(view, SIGNAL(startedPathLoading(KUrl)), this, SLOT(enableStopAction())); connect(view, SIGNAL(finishedPathLoading(KUrl)), this, SLOT(disableStopAction())); const KUrlNavigator* navigator = container->urlNavigator(); - connect(navigator, SIGNAL(urlChanged(const KUrl&)), - this, SLOT(changeUrl(const KUrl&))); + connect(navigator, SIGNAL(urlChanged(KUrl)), + this, SLOT(changeUrl(KUrl))); connect(navigator, SIGNAL(historyChanged()), this, SLOT(updateHistory())); connect(navigator, SIGNAL(editableStateChanged(bool)), this, SLOT(slotEditableStateChanged(bool))); - connect(navigator, SIGNAL(tabRequested(const KUrl&)), + connect(navigator, SIGNAL(tabRequested(KUrl)), this, SLOT(openNewTab(KUrl))); } diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp index 736ec6f4f..df1d8b738 100644 --- a/src/dolphinpart.cpp +++ b/src/dolphinpart.cpp @@ -96,13 +96,13 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantL this, SLOT(slotRequestItemInfo(KFileItem))); connect(m_view, SIGNAL(modeChanged(DolphinView::Mode,DolphinView::Mode)), this, SIGNAL(viewModeChanged())); // relay signal - connect(m_view, SIGNAL(redirection(KUrl, KUrl)), - this, SLOT(slotRedirection(KUrl, KUrl))); + connect(m_view, SIGNAL(redirection(KUrl,KUrl)), + this, SLOT(slotRedirection(KUrl,KUrl))); // Watch for changes that should result in updates to the // status bar text. connect(m_view, SIGNAL(itemCountChanged()), this, SLOT(updateStatusBar())); - connect(m_view, SIGNAL(selectionChanged(const KFileItemList)), this, SLOT(updateStatusBar())); + connect(m_view, SIGNAL(selectionChanged(KFileItemList)), this, SLOT(updateStatusBar())); m_actionHandler = new DolphinViewActionHandler(actionCollection(), this); m_actionHandler->setCurrentView(m_view); diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp index 8e00b0afc..dcfeca0fd 100644 --- a/src/dolphinviewcontainer.cpp +++ b/src/dolphinviewcontainer.cpp @@ -72,8 +72,8 @@ DolphinViewContainer::DolphinViewContainer(const KUrl& url, QWidget* parent) : m_topLayout->setMargin(0); m_urlNavigator = new KUrlNavigator(DolphinSettings::instance().placesModel(), url, this); - connect(m_urlNavigator, SIGNAL(urlsDropped(const KUrl&, QDropEvent*)), - this, SLOT(dropUrls(const KUrl&, QDropEvent*))); + connect(m_urlNavigator, SIGNAL(urlsDropped(KUrl,QDropEvent*)), + this, SLOT(dropUrls(KUrl,QDropEvent*))); connect(m_urlNavigator, SIGNAL(activated()), this, SLOT(activate())); connect(m_urlNavigator->editor(), SIGNAL(completionModeChanged(KGlobalSettings::Completion)), @@ -93,28 +93,28 @@ DolphinViewContainer::DolphinViewContainer(const KUrl& url, QWidget* parent) : connect(m_searchBox, SIGNAL(returnPressed(QString)), this, SLOT(requestFocus())); m_view = new DolphinView(url, this); - connect(m_view, SIGNAL(urlChanged(const KUrl&)), m_urlNavigator, SLOT(setUrl(const KUrl&))); + connect(m_view, SIGNAL(urlChanged(KUrl)), m_urlNavigator, SLOT(setUrl(KUrl))); connect(m_view, SIGNAL(writeStateChanged(bool)), this, SIGNAL(writeStateChanged(bool))); connect(m_view, SIGNAL(requestItemInfo(KFileItem)), this, SLOT(showItemInfo(KFileItem))); - connect(m_view, SIGNAL(errorMessage(const QString&)), this, SLOT(showErrorMessage(const QString&))); - connect(m_view, SIGNAL(infoMessage(const QString&)), this, SLOT(showInfoMessage(const QString&))); + connect(m_view, SIGNAL(errorMessage(QString)), this, SLOT(showErrorMessage(QString))); + connect(m_view, SIGNAL(infoMessage(QString)), this, SLOT(showInfoMessage(QString))); connect(m_view, SIGNAL(itemTriggered(KFileItem)), this, SLOT(slotItemTriggered(KFileItem))); - connect(m_view, SIGNAL(redirection(KUrl, KUrl)), this, SLOT(redirect(KUrl, KUrl))); + connect(m_view, SIGNAL(redirection(KUrl,KUrl)), this, SLOT(redirect(KUrl,KUrl))); connect(m_view, SIGNAL(startedPathLoading(KUrl)), this, SLOT(slotStartedPathLoading())); connect(m_view, SIGNAL(finishedPathLoading(KUrl)), this, SLOT(slotFinishedPathLoading())); connect(m_view, SIGNAL(itemCountChanged()), this, SLOT(delayedStatusBarUpdate())); connect(m_view, SIGNAL(pathLoadingProgress(int)), this, SLOT(updateProgress(int))); - connect(m_view, SIGNAL(infoMessage(const QString&)), this, SLOT(showInfoMessage(const QString&))); - connect(m_view, SIGNAL(errorMessage(const QString&)), this, SLOT(showErrorMessage(const QString&))); - connect(m_view, SIGNAL(urlIsFileError(const KUrl&)), this, SLOT(openFile(const KUrl&))); - connect(m_view, SIGNAL(selectionChanged(const KFileItemList&)), this, SLOT(delayedStatusBarUpdate())); - connect(m_view, SIGNAL(operationCompletedMessage(const QString&)), this, SLOT(showOperationCompletedMessage(const QString&))); - connect(m_view, SIGNAL(urlAboutToBeChanged(const KUrl&)), this, SLOT(slotViewUrlAboutToBeChanged(const KUrl&))); - - connect(m_urlNavigator, SIGNAL(urlAboutToBeChanged(const KUrl&)), - this, SLOT(slotUrlNavigatorLocationAboutToBeChanged(const KUrl&))); - connect(m_urlNavigator, SIGNAL(urlChanged(const KUrl&)), - this, SLOT(slotUrlNavigatorLocationChanged(const KUrl&))); + connect(m_view, SIGNAL(infoMessage(QString)), this, SLOT(showInfoMessage(QString))); + connect(m_view, SIGNAL(errorMessage(QString)), this, SLOT(showErrorMessage(QString))); + connect(m_view, SIGNAL(urlIsFileError(KUrl)), this, SLOT(openFile(KUrl))); + connect(m_view, SIGNAL(selectionChanged(KFileItemList)), this, SLOT(delayedStatusBarUpdate())); + connect(m_view, SIGNAL(operationCompletedMessage(QString)), this, SLOT(showOperationCompletedMessage(QString))); + connect(m_view, SIGNAL(urlAboutToBeChanged(KUrl)), this, SLOT(slotViewUrlAboutToBeChanged(KUrl))); + + connect(m_urlNavigator, SIGNAL(urlAboutToBeChanged(KUrl)), + this, SLOT(slotUrlNavigatorLocationAboutToBeChanged(KUrl))); + connect(m_urlNavigator, SIGNAL(urlChanged(KUrl)), + this, SLOT(slotUrlNavigatorLocationChanged(KUrl))); connect(m_urlNavigator, SIGNAL(historyChanged()), this, SLOT(slotHistoryChanged())); @@ -135,11 +135,11 @@ DolphinViewContainer::DolphinViewContainer(const KUrl& url, QWidget* parent) : // initialize filter bar m_filterBar = new FilterBar(this); m_filterBar->setVisible(settings->filterBar()); - connect(m_filterBar, SIGNAL(filterChanged(const QString&)), - this, SLOT(setNameFilter(const QString&))); + connect(m_filterBar, SIGNAL(filterChanged(QString)), + this, SLOT(setNameFilter(QString))); connect(m_filterBar, SIGNAL(closeRequest()), this, SLOT(closeFilterBar())); - connect(m_view, SIGNAL(urlChanged(const KUrl&)), + connect(m_view, SIGNAL(urlChanged(KUrl)), m_filterBar, SLOT(clear())); m_topLayout->addWidget(m_urlNavigator); diff --git a/src/filterbar/filterbar.cpp b/src/filterbar/filterbar.cpp index 3f4b7c219..f3076f010 100644 --- a/src/filterbar/filterbar.cpp +++ b/src/filterbar/filterbar.cpp @@ -46,8 +46,8 @@ FilterBar::FilterBar(QWidget* parent) : m_filterInput = new KLineEdit(this); m_filterInput->setLayoutDirection(Qt::LeftToRight); m_filterInput->setClearButtonShown(true); - connect(m_filterInput, SIGNAL(textChanged(const QString&)), - this, SIGNAL(filterChanged(const QString&))); + connect(m_filterInput, SIGNAL(textChanged(QString)), + this, SIGNAL(filterChanged(QString))); setFocusProxy(m_filterInput); // Apply layout diff --git a/src/kitemviews/kfileitemmodelrolesupdater.cpp b/src/kitemviews/kfileitemmodelrolesupdater.cpp index 325d08e18..4d36a4e05 100644 --- a/src/kitemviews/kfileitemmodelrolesupdater.cpp +++ b/src/kitemviews/kfileitemmodelrolesupdater.cpp @@ -493,8 +493,8 @@ void KFileItemModelRolesUpdater::startPreviewJob(const KFileItemList& items) job = KIO::filePreview(itemsSubSet, cacheSize, &m_enabledPlugins); } - connect(job, SIGNAL(gotPreview(const KFileItem&, const QPixmap&)), - this, SLOT(slotGotPreview(const KFileItem&, const QPixmap&))); + connect(job, SIGNAL(gotPreview(KFileItem,QPixmap)), + this, SLOT(slotGotPreview(KFileItem,QPixmap))); connect(job, SIGNAL(failed(KFileItem)), this, SLOT(slotPreviewFailed(KFileItem))); connect(job, SIGNAL(finished(KJob*)), diff --git a/src/kitemviews/kitemlistview.cpp b/src/kitemviews/kitemlistview.cpp index a0897420c..d5e2bf875 100644 --- a/src/kitemviews/kitemlistview.cpp +++ b/src/kitemviews/kitemlistview.cpp @@ -66,8 +66,8 @@ KItemListView::KItemListView(QGraphicsWidget* parent) : m_layouter->setSizeHintResolver(m_sizeHintResolver); m_animation = new KItemListViewAnimation(this); - connect(m_animation, SIGNAL(finished(QGraphicsWidget*, KItemListViewAnimation::AnimationType)), - this, SLOT(slotAnimationFinished(QGraphicsWidget*, KItemListViewAnimation::AnimationType))); + connect(m_animation, SIGNAL(finished(QGraphicsWidget*,KItemListViewAnimation::AnimationType)), + this, SLOT(slotAnimationFinished(QGraphicsWidget*,KItemListViewAnimation::AnimationType))); m_layoutTimer = new QTimer(this); m_layoutTimer->setInterval(300); diff --git a/src/panels/folders/folderspanel.cpp b/src/panels/folders/folderspanel.cpp index fe0f0b134..340e79d30 100644 --- a/src/panels/folders/folderspanel.cpp +++ b/src/panels/folders/folderspanel.cpp @@ -148,8 +148,8 @@ void FoldersPanel::showEvent(QShowEvent* event) m_dolphinModel = new DolphinModel(this); m_dolphinModel->setDirLister(m_dirLister); m_dolphinModel->setDropsAllowed(DolphinModel::DropOnDirectory); - connect(m_dolphinModel, SIGNAL(expand(const QModelIndex&)), - this, SLOT(expandToDir(const QModelIndex&))); + connect(m_dolphinModel, SIGNAL(expand(QModelIndex)), + this, SLOT(expandToDir(QModelIndex))); Q_ASSERT(!m_proxyModel); m_proxyModel = new DolphinSortFilterProxyModel(this); @@ -164,11 +164,11 @@ void FoldersPanel::showEvent(QShowEvent* event) new FolderExpander(m_treeView, m_proxyModel); - connect(m_treeView, SIGNAL(clicked(const QModelIndex&)), - this, SLOT(updateActiveView(const QModelIndex&))); - connect(m_treeView, SIGNAL(urlsDropped(const QModelIndex&, QDropEvent*)), - this, SLOT(dropUrls(const QModelIndex&, QDropEvent*))); - connect(m_treeView, SIGNAL(pressed(const QModelIndex&)), + connect(m_treeView, SIGNAL(clicked(QModelIndex)), + this, SLOT(updateActiveView(QModelIndex))); + connect(m_treeView, SIGNAL(urlsDropped(QModelIndex,QDropEvent*)), + this, SLOT(dropUrls(QModelIndex,QDropEvent*))); + connect(m_treeView, SIGNAL(pressed(QModelIndex)), this, SLOT(updateMouseButtons())); connect(m_treeView->horizontalScrollBar(), SIGNAL(sliderMoved(int)), diff --git a/src/panels/folders/ktreeview.cpp b/src/panels/folders/ktreeview.cpp index 6a492b400..765b934be 100644 --- a/src/panels/folders/ktreeview.cpp +++ b/src/panels/folders/ktreeview.cpp @@ -37,13 +37,13 @@ KTreeView::KTreeViewPrivate::KTreeViewPrivate(KTreeView *parent) : connect(timeLine, SIGNAL(frameChanged(int)), this, SLOT(updateVerticalScrollBar(int))); - connect(parent->verticalScrollBar(), SIGNAL(rangeChanged(int, int)), + connect(parent->verticalScrollBar(), SIGNAL(rangeChanged(int,int)), this, SLOT(startScrolling())); connect(parent->verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(startScrolling())); - connect(parent, SIGNAL(collapsed(const QModelIndex&)), + connect(parent, SIGNAL(collapsed(QModelIndex)), this, SLOT(startScrolling())); - connect(parent, SIGNAL(expanded(const QModelIndex&)), + connect(parent, SIGNAL(expanded(QModelIndex)), this, SLOT(startScrolling())); } diff --git a/src/panels/information/informationpanel.cpp b/src/panels/information/informationpanel.cpp index 9bfb711c6..d45ef8ea4 100644 --- a/src/panels/information/informationpanel.cpp +++ b/src/panels/information/informationpanel.cpp @@ -346,7 +346,7 @@ void InformationPanel::init() org::kde::KDirNotify* dirNotify = new org::kde::KDirNotify(QString(), QString(), QDBusConnection::sessionBus(), this); - connect(dirNotify, SIGNAL(FileRenamed(QString, QString)), SLOT(slotFileRenamed(QString, QString))); + connect(dirNotify, SIGNAL(FileRenamed(QString,QString)), SLOT(slotFileRenamed(QString,QString))); connect(dirNotify, SIGNAL(FilesAdded(QString)), SLOT(slotFilesAdded(QString))); connect(dirNotify, SIGNAL(FilesChanged(QStringList)), SLOT(slotFilesChanged(QStringList))); connect(dirNotify, SIGNAL(FilesRemoved(QStringList)), SLOT(slotFilesRemoved(QStringList))); diff --git a/src/panels/information/informationpanelcontent.cpp b/src/panels/information/informationpanelcontent.cpp index 1084fa085..101473172 100644 --- a/src/panels/information/informationpanelcontent.cpp +++ b/src/panels/information/informationpanelcontent.cpp @@ -176,10 +176,10 @@ void InformationPanelContent::showItem(const KFileItem& item) KIO::PreviewJob* job = KIO::filePreview(KFileItemList() << item, QSize(m_preview->width(), m_preview->height())); job->setScaleType(KIO::PreviewJob::Unscaled); - connect(job, SIGNAL(gotPreview(const KFileItem&, const QPixmap&)), - this, SLOT(showPreview(const KFileItem&, const QPixmap&))); - connect(job, SIGNAL(failed(const KFileItem&)), - this, SLOT(showIcon(const KFileItem&))); + connect(job, SIGNAL(gotPreview(KFileItem,QPixmap)), + this, SLOT(showPreview(KFileItem,QPixmap))); + connect(job, SIGNAL(failed(KFileItem)), + this, SLOT(showIcon(KFileItem))); } } diff --git a/src/panels/information/phononwidget.cpp b/src/panels/information/phononwidget.cpp index 5accf4d87..5f0c11158 100644 --- a/src/panels/information/phononwidget.cpp +++ b/src/panels/information/phononwidget.cpp @@ -210,7 +210,7 @@ void PhononWidget::play() } Q_ASSERT(m_media); - connect(m_media, SIGNAL(stateChanged(Phonon::State, Phonon::State)), + connect(m_media, SIGNAL(stateChanged(Phonon::State,Phonon::State)), this, SLOT(stateChanged(Phonon::State))); m_seekSlider->setMediaObject(m_media); @@ -221,7 +221,7 @@ void PhononWidget::stop() { if (m_media) { m_media->stop(); - disconnect(m_media, SIGNAL(stateChanged(Phonon::State, Phonon::State)), + disconnect(m_media, SIGNAL(stateChanged(Phonon::State,Phonon::State)), this, SLOT(stateChanged(Phonon::State))); emit playingStopped(); diff --git a/src/panels/places/placespanel.cpp b/src/panels/places/placespanel.cpp index e70fdf574..2581ca478 100644 --- a/src/panels/places/placespanel.cpp +++ b/src/panels/places/placespanel.cpp @@ -28,10 +28,10 @@ PlacesPanel::PlacesPanel(QWidget* parent) : m_mouseButtons(Qt::NoButton) { setDropOnPlaceEnabled(true); - connect(this, SIGNAL(urlsDropped(const KUrl&, QDropEvent*, QWidget*)), - this, SLOT(slotUrlsDropped(const KUrl&, QDropEvent*, QWidget*))); - connect(this, SIGNAL(urlChanged(const KUrl&)), - this, SLOT(emitExtendedUrlChangedSignal(const KUrl&))); + connect(this, SIGNAL(urlsDropped(KUrl,QDropEvent*,QWidget*)), + this, SLOT(slotUrlsDropped(KUrl,QDropEvent*,QWidget*))); + connect(this, SIGNAL(urlChanged(KUrl)), + this, SLOT(emitExtendedUrlChangedSignal(KUrl))); } PlacesPanel::~PlacesPanel() diff --git a/src/settings/applyviewpropsjob.cpp b/src/settings/applyviewpropsjob.cpp index dd9788851..59f1c0b86 100644 --- a/src/settings/applyviewpropsjob.cpp +++ b/src/settings/applyviewpropsjob.cpp @@ -38,8 +38,8 @@ ApplyViewPropsJob::ApplyViewPropsJob(const KUrl& dir, m_viewProps->setSortOrder(viewProps.sortOrder()); KIO::ListJob* listJob = KIO::listRecursive(dir, KIO::HideProgressInfo); - connect(listJob, SIGNAL(entries(KIO::Job*, const KIO::UDSEntryList&)), - SLOT(slotEntries(KIO::Job*, const KIO::UDSEntryList&))); + connect(listJob, SIGNAL(entries(KIO::Job*,KIO::UDSEntryList)), + SLOT(slotEntries(KIO::Job*,KIO::UDSEntryList))); addSubjob(listJob); } diff --git a/src/settings/startup/startupsettingspage.cpp b/src/settings/startup/startupsettingspage.cpp index d4bdca339..ce6139d1d 100644 --- a/src/settings/startup/startupsettingspage.cpp +++ b/src/settings/startup/startupsettingspage.cpp @@ -98,7 +98,7 @@ StartupSettingsPage::StartupSettingsPage(const KUrl& url, QWidget* parent) : loadSettings(); - connect(m_homeUrl, SIGNAL(textChanged(const QString&)), this, SLOT(slotSettingsChanged())); + connect(m_homeUrl, SIGNAL(textChanged(QString)), this, SLOT(slotSettingsChanged())); connect(m_splitView, SIGNAL(toggled(bool)), this, SLOT(slotSettingsChanged())); connect(m_editableUrl, SIGNAL(toggled(bool)), this, SLOT(slotSettingsChanged())); connect(m_showFullPath, SIGNAL(toggled(bool)), this, SLOT(slotSettingsChanged())); diff --git a/src/statusbar/dolphinstatusbar.cpp b/src/statusbar/dolphinstatusbar.cpp index b005d45c6..055c4ccb8 100644 --- a/src/statusbar/dolphinstatusbar.cpp +++ b/src/statusbar/dolphinstatusbar.cpp @@ -55,8 +55,8 @@ DolphinStatusBar::DolphinStatusBar(QWidget* parent, DolphinView* view) : m_showProgressBarTimer(0), m_messageTimeStamp() { - connect(m_view, SIGNAL(urlChanged(const KUrl&)), - this, SLOT(updateSpaceInfoContent(const KUrl&))); + connect(m_view, SIGNAL(urlChanged(KUrl)), + this, SLOT(updateSpaceInfoContent(KUrl))); // Initialize message label m_messageLabel = new KonqStatusBarMessageLabel(this); @@ -73,7 +73,7 @@ DolphinStatusBar::DolphinStatusBar(QWidget* parent, DolphinView* view) : connect(m_zoomSlider, SIGNAL(valueChanged(int)), this, SLOT(setZoomLevel(int))); connect(m_zoomSlider, SIGNAL(sliderMoved(int)), this, SLOT(showZoomSliderToolTip(int))); - connect(m_view, SIGNAL(zoomLevelChanged(int, int)), this, SLOT(slotZoomLevelChanged(int, int))); + connect(m_view, SIGNAL(zoomLevelChanged(int,int)), this, SLOT(slotZoomLevelChanged(int,int))); // Initialize space information m_spaceInfo = new StatusBarSpaceInfo(this); diff --git a/src/views/dolphinitemlistcontainer.cpp b/src/views/dolphinitemlistcontainer.cpp index 9c9ad6de3..93a06c5a3 100644 --- a/src/views/dolphinitemlistcontainer.cpp +++ b/src/views/dolphinitemlistcontainer.cpp @@ -56,11 +56,11 @@ DolphinItemListContainer::DolphinItemListContainer(KDirLister* dirLister, updateGridSize(); /* - connect(this, SIGNAL(clicked(const QModelIndex&)), - dolphinViewController, SLOT(requestTab(const QModelIndex&)));*/ + connect(this, SIGNAL(clicked(QModelIndex)), + dolphinViewController, SLOT(requestTab(QModelIndex)));*/ /* - connect(this, SIGNAL(entered(const QModelIndex&)), - dolphinViewController, SLOT(emitItemEntered(const QModelIndex&))); + connect(this, SIGNAL(entered(QModelIndex)), + dolphinViewController, SLOT(emitItemEntered(QModelIndex))); connect(this, SIGNAL(viewportEntered()), dolphinViewController, SLOT(emitViewportEntered()));*/ diff --git a/src/views/dolphinnewfilemenuobserver.cpp b/src/views/dolphinnewfilemenuobserver.cpp index bc3f7658f..1cb5739d7 100644 --- a/src/views/dolphinnewfilemenuobserver.cpp +++ b/src/views/dolphinnewfilemenuobserver.cpp @@ -36,18 +36,18 @@ DolphinNewFileMenuObserver& DolphinNewFileMenuObserver::instance() void DolphinNewFileMenuObserver::attach(const KNewFileMenu* menu) { - connect(menu, SIGNAL(fileCreated(const KUrl&)), - this, SIGNAL(itemCreated(const KUrl&))); - connect(menu, SIGNAL(directoryCreated(const KUrl&)), - this, SIGNAL(itemCreated(const KUrl&))); + connect(menu, SIGNAL(fileCreated(KUrl)), + this, SIGNAL(itemCreated(KUrl))); + connect(menu, SIGNAL(directoryCreated(KUrl)), + this, SIGNAL(itemCreated(KUrl))); } void DolphinNewFileMenuObserver::detach(const KNewFileMenu* menu) { - disconnect(menu, SIGNAL(fileCreated(const KUrl&)), - this, SIGNAL(itemCreated(const KUrl&))); - disconnect(menu, SIGNAL(directoryCreated(const KUrl&)), - this, SIGNAL(itemCreated(const KUrl&))); + disconnect(menu, SIGNAL(fileCreated(KUrl)), + this, SIGNAL(itemCreated(KUrl))); + disconnect(menu, SIGNAL(directoryCreated(KUrl)), + this, SIGNAL(itemCreated(KUrl))); } DolphinNewFileMenuObserver::DolphinNewFileMenuObserver() : diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp index bcc682876..83877dcba 100644 --- a/src/views/dolphinview.cpp +++ b/src/views/dolphinview.cpp @@ -100,29 +100,29 @@ DolphinView::DolphinView(const KUrl& url, QWidget* parent) : //m_viewModeController = new ViewModeController(this); //m_viewModeController->setUrl(url); - /*connect(m_viewModeController, SIGNAL(urlChanged(const KUrl&)), - this, SIGNAL(urlChanged(const KUrl&))); + /*connect(m_viewModeController, SIGNAL(urlChanged(KUrl)), + this, SIGNAL(urlChanged(KUrl))); - connect(m_dolphinViewController, SIGNAL(requestContextMenu(const QPoint&, const QList&)), - this, SLOT(openContextMenu(const QPoint&, const QList&))); - connect(m_dolphinViewController, SIGNAL(urlsDropped(const KFileItem&, const KUrl&, QDropEvent*)), - this, SLOT(dropUrls(const KFileItem&, const KUrl&, QDropEvent*))); + connect(m_dolphinViewController, SIGNAL(requestContextMenu(QPoint,QList)), + this, SLOT(openContextMenu(QPoint,QList))); + connect(m_dolphinViewController, SIGNAL(urlsDropped(KFileItem,KUrl,QDropEvent*)), + this, SLOT(dropUrls(KFileItem,KUrl,QDropEvent*))); connect(m_dolphinViewController, SIGNAL(sortingChanged(DolphinView::Sorting)), this, SLOT(updateSorting(DolphinView::Sorting))); connect(m_dolphinViewController, SIGNAL(sortOrderChanged(Qt::SortOrder)), this, SLOT(updateSortOrder(Qt::SortOrder))); connect(m_dolphinViewController, SIGNAL(sortFoldersFirstChanged(bool)), this, SLOT(updateSortFoldersFirst(bool))); - connect(m_dolphinViewController, SIGNAL(additionalInfoChanged(const QList&)), - this, SLOT(updateAdditionalInfo(const QList&)));*/ - //connect(m_dolphinViewController, SIGNAL(itemTriggered(const KFileItem&)), - // this, SLOT(triggerItem(const KFileItem&))); - //connect(m_dolphinViewController, SIGNAL(tabRequested(const KUrl&)), - // this, SIGNAL(tabRequested(const KUrl&))); + connect(m_dolphinViewController, SIGNAL(additionalInfoChanged(QList)), + this, SLOT(updateAdditionalInfo(QList)));*/ + //connect(m_dolphinViewController, SIGNAL(itemTriggered(KFileItem)), + // this, SLOT(triggerItem(KFileItem))); + //connect(m_dolphinViewController, SIGNAL(tabRequested(KUrl)), + // this, SIGNAL(tabRequested(KUrl))); /*connect(m_dolphinViewController, SIGNAL(activated()), this, SLOT(activate())); - connect(m_dolphinViewController, SIGNAL(itemEntered(const KFileItem&)), - this, SLOT(showHoverInformation(const KFileItem&))); + connect(m_dolphinViewController, SIGNAL(itemEntered(KFileItem)), + this, SLOT(showHoverInformation(KFileItem))); connect(m_dolphinViewController, SIGNAL(viewportEntered()), this, SLOT(clearHoverInformation())); connect(m_dolphinViewController, SIGNAL(urlChangeRequested(KUrl)), @@ -131,8 +131,8 @@ DolphinView::DolphinView(const KUrl& url, QWidget* parent) : // When a new item has been created by the "Create New..." menu, the item should // get selected and it must be assured that the item will get visible. As the // creation is done asynchronously, several signals must be checked: - connect(&DolphinNewFileMenuObserver::instance(), SIGNAL(itemCreated(const KUrl&)), - this, SLOT(observeCreatedItem(const KUrl&))); + connect(&DolphinNewFileMenuObserver::instance(), SIGNAL(itemCreated(KUrl)), + this, SLOT(observeCreatedItem(KUrl))); m_selectionChangedTimer = new QTimer(this); m_selectionChangedTimer->setSingleShot(true); @@ -147,16 +147,16 @@ DolphinView::DolphinView(const KUrl& url, QWidget* parent) : connect(m_dirLister, SIGNAL(redirection(KUrl,KUrl)), this, SLOT(slotRedirection(KUrl,KUrl))); connect(m_dirLister, SIGNAL(started(KUrl)), this, SLOT(slotDirListerStarted(KUrl))); connect(m_dirLister, SIGNAL(completed()), this, SLOT(slotDirListerCompleted())); - connect(m_dirLister, SIGNAL(refreshItems(const QList>&)), + connect(m_dirLister, SIGNAL(refreshItems(QList >)), this, SLOT(slotRefreshItems())); connect(m_dirLister, SIGNAL(clear()), this, SIGNAL(itemCountChanged())); connect(m_dirLister, SIGNAL(newItems(KFileItemList)), this, SIGNAL(itemCountChanged())); - connect(m_dirLister, SIGNAL(infoMessage(const QString&)), this, SIGNAL(infoMessage(const QString&))); - connect(m_dirLister, SIGNAL(errorMessage(const QString&)), this, SIGNAL(infoMessage(const QString&))); + connect(m_dirLister, SIGNAL(infoMessage(QString)), this, SIGNAL(infoMessage(QString))); + connect(m_dirLister, SIGNAL(errorMessage(QString)), this, SIGNAL(infoMessage(QString))); connect(m_dirLister, SIGNAL(percent(int)), this, SIGNAL(pathLoadingProgress(int))); - connect(m_dirLister, SIGNAL(urlIsFileError(const KUrl&)), this, SIGNAL(urlIsFileError(const KUrl&))); - connect(m_dirLister, SIGNAL(itemsDeleted(const KFileItemList&)), this, SIGNAL(itemCountChanged())); + connect(m_dirLister, SIGNAL(urlIsFileError(KUrl)), this, SIGNAL(urlIsFileError(KUrl))); + connect(m_dirLister, SIGNAL(itemsDeleted(KFileItemList)), this, SIGNAL(itemCountChanged())); m_container = new DolphinItemListContainer(m_dirLister, this); QHash visibleRoles; @@ -164,8 +164,8 @@ DolphinView::DolphinView(const KUrl& url, QWidget* parent) : m_container->setVisibleRoles(visibleRoles); KItemListController* controller = m_container->controller(); - connect(controller, SIGNAL(itemClicked(int, Qt::MouseButton)), - this, SLOT(slotItemClicked(int, Qt::MouseButton))); + connect(controller, SIGNAL(itemClicked(int,Qt::MouseButton)), + this, SLOT(slotItemClicked(int,Qt::MouseButton))); connect(controller, SIGNAL(itemExpansionToggleClicked(int)), this, SLOT(slotItemExpansionToggleClicked(int))); applyViewProperties(); @@ -879,7 +879,7 @@ KFileItem DolphinView::rootItem() const void DolphinView::observeCreatedItem(const KUrl& url) { m_createdItemUrl = url; - //connect(m_dirModel, SIGNAL(rowsInserted(const QModelIndex&, int, int)), + //connect(m_dirModel, SIGNAL(rowsInserted(QModelIndex,int,int)), // this, SLOT(selectAndScrollToCreatedItem())); } @@ -894,7 +894,7 @@ void DolphinView::selectAndScrollToCreatedItem() } } - disconnect(m_viewAccessor.dirModel(), SIGNAL(rowsInserted(const QModelIndex&, int, int)), + disconnect(m_viewAccessor.dirModel(), SIGNAL(rowsInserted(QModelIndex,int,int)), this, SLOT(selectAndScrollToCreatedItem()));*/ m_createdItemUrl = KUrl(); } diff --git a/src/views/dolphinviewactionhandler.cpp b/src/views/dolphinviewactionhandler.cpp index 87e828dfa..fbace9cd1 100644 --- a/src/views/dolphinviewactionhandler.cpp +++ b/src/views/dolphinviewactionhandler.cpp @@ -57,7 +57,7 @@ void DolphinViewActionHandler::setCurrentView(DolphinView* view) m_currentView = view; - connect(view, SIGNAL(modeChanged(DolphinView::Mode, DolphinView::Mode)), + connect(view, SIGNAL(modeChanged(DolphinView::Mode,DolphinView::Mode)), this, SLOT(updateViewActions())); connect(view, SIGNAL(previewsShownChanged(bool)), this, SLOT(slotPreviewsShownChanged(bool))); @@ -75,8 +75,8 @@ void DolphinViewActionHandler::setCurrentView(DolphinView* view) this, SLOT(slotHiddenFilesShownChanged(bool))); connect(view, SIGNAL(sortingChanged(DolphinView::Sorting)), this, SLOT(slotSortingChanged(DolphinView::Sorting))); - connect(view, SIGNAL(zoomLevelChanged(int, int)), - this, SLOT(slotZoomLevelChanged(int, int))); + connect(view, SIGNAL(zoomLevelChanged(int,int)), + this, SLOT(slotZoomLevelChanged(int,int))); } DolphinView* DolphinViewActionHandler::currentView() @@ -106,8 +106,8 @@ void DolphinViewActionHandler::createActions() moveToTrash->setText(i18nc("@action:inmenu File", "Move to Trash")); moveToTrash->setIcon(KIcon("user-trash")); moveToTrash->setShortcut(QKeySequence::Delete); - connect(moveToTrash, SIGNAL(triggered(Qt::MouseButtons, Qt::KeyboardModifiers)), - this, SLOT(slotTrashActivated(Qt::MouseButtons, Qt::KeyboardModifiers))); + connect(moveToTrash, SIGNAL(triggered(Qt::MouseButtons,Qt::KeyboardModifiers)), + this, SLOT(slotTrashActivated(Qt::MouseButtons,Qt::KeyboardModifiers))); KAction* deleteAction = m_actionCollection->addAction("delete"); deleteAction->setIcon(KIcon("edit-delete")); diff --git a/src/views/tooltips/tooltipmanager.cpp b/src/views/tooltips/tooltipmanager.cpp index e532bee82..8f18dbde4 100644 --- a/src/views/tooltips/tooltipmanager.cpp +++ b/src/views/tooltips/tooltipmanager.cpp @@ -44,8 +44,8 @@ ToolTipManager::ToolTipManager(QWidget* parent) : m_itemRect() { //m_dolphinModel = static_cast(m_proxyModel->sourceModel()); - //connect(parent, SIGNAL(entered(const QModelIndex&)), - // this, SLOT(requestToolTip(const QModelIndex&))); + //connect(parent, SIGNAL(entered(QModelIndex)), + // this, SLOT(requestToolTip(QModelIndex))); //connect(parent, SIGNAL(viewportEntered()), // this, SLOT(hideToolTip())); @@ -164,9 +164,9 @@ void ToolTipManager::startContentRetrieval() KIO::PreviewJob* job = KIO::filePreview(KFileItemList() << m_item, QSize(256, 256)); - connect(job, SIGNAL(gotPreview(const KFileItem&, const QPixmap&)), - this, SLOT(setPreviewPix(const KFileItem&, const QPixmap&))); - connect(job, SIGNAL(failed(const KFileItem&)), + connect(job, SIGNAL(gotPreview(KFileItem,QPixmap)), + this, SLOT(setPreviewPix(KFileItem,QPixmap))); + connect(job, SIGNAL(failed(KFileItem)), this, SLOT(previewFailed())); } diff --git a/src/views/versioncontrol/versioncontrolobserver.cpp b/src/views/versioncontrol/versioncontrolobserver.cpp index 02329866f..583e183fc 100644 --- a/src/views/versioncontrol/versioncontrolobserver.cpp +++ b/src/views/versioncontrol/versioncontrolobserver.cpp @@ -157,9 +157,9 @@ void VersionControlObserver::verifyDirectory() // The directory is versioned. Assume that the user will further browse through // versioned directories and decrease the verification timer. m_dirVerificationTimer->setInterval(100); - connect(m_dirLister, SIGNAL(refreshItems(const QList>&)), + connect(m_dirLister, SIGNAL(refreshItems(QList >)), this, SLOT(delayedDirectoryVerification())); - connect(m_dirLister, SIGNAL(newItems(const KFileItemList&)), + connect(m_dirLister, SIGNAL(newItems(KFileItemList)), this, SLOT(delayedDirectoryVerification())); } updateItemStates(); @@ -170,9 +170,9 @@ void VersionControlObserver::verifyDirectory() // value, so that browsing through non-versioned directories is not slown down // by an immediate verification. m_dirVerificationTimer->setInterval(500); - disconnect(m_dirLister, SIGNAL(refreshItems(const QList>&)), + disconnect(m_dirLister, SIGNAL(refreshItems(QList >)), this, SLOT(delayedDirectoryVerification())); - disconnect(m_dirLister, SIGNAL(newItems(const KFileItemList&)), + disconnect(m_dirLister, SIGNAL(newItems(KFileItemList)), this, SLOT(delayedDirectoryVerification())); }*/ }