diff options
| author | Montel Laurent <[email protected]> | 2011-07-31 13:33:56 +0200 |
|---|---|---|
| committer | Montel Laurent <[email protected]> | 2011-07-31 13:33:56 +0200 |
| commit | 08d655c2bc107449ee322f8b826710b7e690950b (patch) | |
| tree | 6268fe56b9d4bb7fdad68841836c3265fb178284 /src/views | |
| parent | f23e9496f303995557b744c03178f5dbd9b35016 (diff) | |
normalize signals/slots
Diffstat (limited to 'src/views')
| -rw-r--r-- | src/views/dolphinitemlistcontainer.cpp | 8 | ||||
| -rw-r--r-- | src/views/dolphinnewfilemenuobserver.cpp | 16 | ||||
| -rw-r--r-- | src/views/dolphinview.cpp | 50 | ||||
| -rw-r--r-- | src/views/dolphinviewactionhandler.cpp | 10 | ||||
| -rw-r--r-- | src/views/tooltips/tooltipmanager.cpp | 10 | ||||
| -rw-r--r-- | src/views/versioncontrol/versioncontrolobserver.cpp | 8 |
6 files changed, 51 insertions, 51 deletions
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<QAction*>&)), - this, SLOT(openContextMenu(const QPoint&, const QList<QAction*>&))); - 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<QAction*>)), + this, SLOT(openContextMenu(QPoint,QList<QAction*>))); + 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<DolphinView::AdditionalInfo>&)), - this, SLOT(updateAdditionalInfo(const QList<DolphinView::AdditionalInfo>&)));*/ - //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<DolphinView::AdditionalInfo>)), + this, SLOT(updateAdditionalInfo(QList<DolphinView::AdditionalInfo>)));*/ + //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<QPair<KFileItem,KFileItem>>&)), + connect(m_dirLister, SIGNAL(refreshItems(QList<QPair<KFileItem,KFileItem> >)), 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<QByteArray, int> 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<DolphinModel*>(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<QPair<KFileItem,KFileItem>>&)), + connect(m_dirLister, SIGNAL(refreshItems(QList<QPair<KFileItem,KFileItem> >)), 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<QPair<KFileItem,KFileItem>>&)), + disconnect(m_dirLister, SIGNAL(refreshItems(QList<QPair<KFileItem,KFileItem> >)), this, SLOT(delayedDirectoryVerification())); - disconnect(m_dirLister, SIGNAL(newItems(const KFileItemList&)), + disconnect(m_dirLister, SIGNAL(newItems(KFileItemList)), this, SLOT(delayedDirectoryVerification())); }*/ } |
