From 1bc48a6ae2706e13093955e8181ac2f58a7ec3ac Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Fri, 5 Jan 2024 10:33:17 +0900 Subject: [PATCH] Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines Signed-off-by: Michele Calgaro --- src/bookmarkselector.cpp | 8 +-- src/bookmarkssettingspage.cpp | 32 ++++----- src/bookmarkssidebarpage.cpp | 16 ++--- src/dolphin.cpp | 124 +++++++++++++++++----------------- src/dolphindetailsview.cpp | 52 +++++++------- src/dolphiniconsview.cpp | 34 +++++----- src/dolphinstatusbar.cpp | 8 +-- src/dolphinview.cpp | 100 +++++++++++++-------------- src/editbookmarkdialog.cpp | 8 +-- src/filterbar.cpp | 10 +-- src/generalsettingspage.cpp | 12 ++-- src/iconsviewsettingspage.cpp | 8 +-- src/infosidebarpage.cpp | 36 +++++----- src/sidebarpage.cpp | 4 +- src/sidebars.cpp | 8 +-- src/statusbarmessagelabel.cpp | 6 +- src/statusbarspaceinfo.cpp | 12 ++-- src/undomanager.cpp | 10 +-- src/urlbutton.cpp | 6 +- src/urlnavigator.cpp | 20 +++--- src/urlnavigatorbutton.cpp | 12 ++-- src/viewpropertiesdialog.cpp | 28 ++++---- 22 files changed, 277 insertions(+), 277 deletions(-) diff --git a/src/bookmarkselector.cpp b/src/bookmarkselector.cpp index 632cee4..2e1bf3d 100644 --- a/src/bookmarkselector.cpp +++ b/src/bookmarkselector.cpp @@ -43,13 +43,13 @@ BookmarkSelector::BookmarkSelector(URLNavigator* parent) : m_bookmarksMenu = new TQPopupMenu(this); KBookmarkManager* manager = DolphinSettings::instance().bookmarkManager(); - connect(manager, TQT_SIGNAL(changed(const TQString&, const TQString&)), - this, TQT_SLOT(updateBookmarks())); + connect(manager, TQ_SIGNAL(changed(const TQString&, const TQString&)), + this, TQ_SLOT(updateBookmarks())); updateBookmarks(); - connect(m_bookmarksMenu, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotBookmarkActivated(int))); + connect(m_bookmarksMenu, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotBookmarkActivated(int))); setPopup(m_bookmarksMenu); } diff --git a/src/bookmarkssettingspage.cpp b/src/bookmarkssettingspage.cpp index 851abe7..334f699 100644 --- a/src/bookmarkssettingspage.cpp +++ b/src/bookmarkssettingspage.cpp @@ -61,12 +61,12 @@ BookmarksSettingsPage::BookmarksSettingsPage(TQWidget*parent) : m_listView->setColumnAlignment(0, TQt::AlignHCenter); m_listView->setAllColumnsShowFocus(true); m_listView->setSorting(-1); - connect(m_listView, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(updateButtons())); - connect(m_listView, TQT_SIGNAL(pressed(TQListViewItem*)), - this, TQT_SLOT(slotBookmarkPressed(TQListViewItem*))); - connect(m_listView, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT(slotBookmarkDoubleClicked(TQListViewItem*, const TQPoint&, int))); + connect(m_listView, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(updateButtons())); + connect(m_listView, TQ_SIGNAL(pressed(TQListViewItem*)), + this, TQ_SLOT(slotBookmarkPressed(TQListViewItem*))); + connect(m_listView, TQ_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT(slotBookmarkDoubleClicked(TQListViewItem*, const TQPoint&, int))); TQVBox* buttonBox = new TQVBox(hBox); buttonBox->setSpacing(spacing); @@ -74,28 +74,28 @@ BookmarksSettingsPage::BookmarksSettingsPage(TQWidget*parent) : const TQSizePolicy buttonSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Maximum); m_addButton = new KPushButton(i18n("Add..."), buttonBox); - connect(m_addButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotAddButtonClicked())); + connect(m_addButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotAddButtonClicked())); m_addButton->setSizePolicy(buttonSizePolicy); m_editButton = new KPushButton(i18n("Edit..."), buttonBox); - connect(m_editButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotEditButtonClicked())); + connect(m_editButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotEditButtonClicked())); m_editButton->setSizePolicy(buttonSizePolicy); m_removeButton = new KPushButton(i18n("Remove"), buttonBox); - connect(m_removeButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotRemoveButtonClicked())); + connect(m_removeButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotRemoveButtonClicked())); m_removeButton->setSizePolicy(buttonSizePolicy); m_moveUpButton = new KPushButton(i18n("Move Up"), buttonBox); - connect(m_moveUpButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotMoveUpButtonClicked())); + connect(m_moveUpButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotMoveUpButtonClicked())); m_moveUpButton->setSizePolicy(buttonSizePolicy); m_moveDownButton = new KPushButton(i18n("Move Down"), buttonBox); - connect(m_moveDownButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotMoveDownButtonClicked())); + connect(m_moveDownButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotMoveDownButtonClicked())); m_moveDownButton->setSizePolicy(buttonSizePolicy); // Add a dummy widget with no restriction regarding a vertical resizing. diff --git a/src/bookmarkssidebarpage.cpp b/src/bookmarkssidebarpage.cpp index 175879e..036b1fa 100644 --- a/src/bookmarkssidebarpage.cpp +++ b/src/bookmarkssidebarpage.cpp @@ -43,14 +43,14 @@ BookmarksSidebarPage::BookmarksSidebarPage(TQWidget* parent) : m_bookmarksList->setPaletteBackgroundColor(colorGroup().background()); layout->addWidget(m_bookmarksList); - connect(m_bookmarksList, TQT_SIGNAL(mouseButtonClicked(int, TQListBoxItem*, const TQPoint&)), - this, TQT_SLOT(slotMouseButtonClicked(int, TQListBoxItem*))); - connect(m_bookmarksList, TQT_SIGNAL(contextMenuRequested(TQListBoxItem*, const TQPoint&)), - this, TQT_SLOT(slotContextMenuRequested(TQListBoxItem*, const TQPoint&))); + connect(m_bookmarksList, TQ_SIGNAL(mouseButtonClicked(int, TQListBoxItem*, const TQPoint&)), + this, TQ_SLOT(slotMouseButtonClicked(int, TQListBoxItem*))); + connect(m_bookmarksList, TQ_SIGNAL(contextMenuRequested(TQListBoxItem*, const TQPoint&)), + this, TQ_SLOT(slotContextMenuRequested(TQListBoxItem*, const TQPoint&))); KBookmarkManager* manager = DolphinSettings::instance().bookmarkManager(); - connect(manager, TQT_SIGNAL(changed(const TQString&, const TQString&)), - this, TQT_SLOT(updateBookmarks())); + connect(manager, TQ_SIGNAL(changed(const TQString&, const TQString&)), + this, TQ_SLOT(updateBookmarks())); updateBookmarks(); } @@ -234,8 +234,8 @@ void BookmarksSidebarPage::connectToActiveView() { DolphinView* view = Dolphin::mainWin().activeView(); adjustSelection(view->url()); - connect(view, TQT_SIGNAL(signalURLChanged(const KURL&)), - this, TQT_SLOT(slotURLChanged(const KURL&))); + connect(view, TQ_SIGNAL(signalURLChanged(const KURL&)), + this, TQ_SLOT(slotURLChanged(const KURL&))); } BookmarksListBox::BookmarksListBox(TQWidget* parent) : diff --git a/src/dolphin.cpp b/src/dolphin.cpp index acf0e63..819f59d 100644 --- a/src/dolphin.cpp +++ b/src/dolphin.cpp @@ -553,10 +553,10 @@ void Dolphin::deleteItems() ) == KMessageBox::Continue; if (del) { TDEIO::Job* job = TDEIO::del(list); - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(slotHandleJobError(TDEIO::Job*))); - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(slotDeleteFileFinished(TDEIO::Job*))); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(slotHandleJobError(TDEIO::Job*))); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(slotDeleteFileFinished(TDEIO::Job*))); } } @@ -1148,8 +1148,8 @@ void Dolphin::init() setAutoSaveSettings(); TQClipboard* clipboard = TQApplication::clipboard(); - connect(clipboard, TQT_SIGNAL(dataChanged()), - this, TQT_SLOT(updatePasteAction())); + connect(clipboard, TQ_SIGNAL(dataChanged()), + this, TQ_SLOT(updatePasteAction())); updatePasteAction(); updateGoActions(); @@ -1180,173 +1180,173 @@ void Dolphin::setupActions() { // setup 'File' menu TDEAction* createFolder = new TDEAction(i18n("Folder..."), "Ctrl+N", - this, TQT_SLOT(createFolder()), + this, TQ_SLOT(createFolder()), actionCollection(), "create_folder"); createFolder->setIcon("folder"); new TDEAction(i18n("Rename"), KKey(Key_F2), - this, TQT_SLOT(rename()), + this, TQ_SLOT(rename()), actionCollection(), "rename"); TDEAction* moveToTrashAction = new TDEAction(i18n("Move to Trash"), KKey(Key_Delete), - this, TQT_SLOT(moveToTrash()), + this, TQ_SLOT(moveToTrash()), actionCollection(), "move_to_trash"); moveToTrashAction->setIcon("edittrash"); TDEAction* deleteAction = new TDEAction(i18n("Delete"), "Shift+Delete", - this, TQT_SLOT(deleteItems()), + this, TQ_SLOT(deleteItems()), actionCollection(), "delete"); deleteAction->setIcon("edit-delete"); new TDEAction(i18n("Propert&ies"), "edit", "Alt+Return", - this, TQT_SLOT(properties()), + this, TQ_SLOT(properties()), actionCollection(), "properties"); - KStdAction::quit(this, TQT_SLOT(quit()), actionCollection()); + KStdAction::quit(this, TQ_SLOT(quit()), actionCollection()); // setup 'Edit' menu UndoManager& undoManager = UndoManager::instance(); KStdAction::undo(&undoManager, - TQT_SLOT(undo()), + TQ_SLOT(undo()), actionCollection()); - connect(&undoManager, TQT_SIGNAL(undoAvailable(bool)), - this, TQT_SLOT(slotUndoAvailable(bool))); - connect(&undoManager, TQT_SIGNAL(undoTextChanged(const TQString&)), - this, TQT_SLOT(slotUndoTextChanged(const TQString&))); + connect(&undoManager, TQ_SIGNAL(undoAvailable(bool)), + this, TQ_SLOT(slotUndoAvailable(bool))); + connect(&undoManager, TQ_SIGNAL(undoTextChanged(const TQString&)), + this, TQ_SLOT(slotUndoTextChanged(const TQString&))); KStdAction::redo(&undoManager, - TQT_SLOT(redo()), + TQ_SLOT(redo()), actionCollection()); - connect(&undoManager, TQT_SIGNAL(redoAvailable(bool)), - this, TQT_SLOT(slotRedoAvailable(bool))); - connect(&undoManager, TQT_SIGNAL(redoTextChanged(const TQString&)), - this, TQT_SLOT(slotRedoTextChanged(const TQString&))); + connect(&undoManager, TQ_SIGNAL(redoAvailable(bool)), + this, TQ_SLOT(slotRedoAvailable(bool))); + connect(&undoManager, TQ_SIGNAL(redoTextChanged(const TQString&)), + this, TQ_SLOT(slotRedoTextChanged(const TQString&))); - KStdAction::cut(this, TQT_SLOT(cut()), actionCollection()); - KStdAction::copy(this, TQT_SLOT(copy()), actionCollection()); - KStdAction::paste(this, TQT_SLOT(paste()), actionCollection()); + KStdAction::cut(this, TQ_SLOT(cut()), actionCollection()); + KStdAction::copy(this, TQ_SLOT(copy()), actionCollection()); + KStdAction::paste(this, TQ_SLOT(paste()), actionCollection()); new TDEAction(i18n("Select All"), "Ctrl+A", - this, TQT_SLOT(selectAll()), + this, TQ_SLOT(selectAll()), actionCollection(), "select_all"); new TDEAction(i18n("Invert Selection"), "Ctrl+Shift+A", - this, TQT_SLOT(invertSelection()), + this, TQ_SLOT(invertSelection()), actionCollection(), "invert_selection"); // setup 'View' menu KStdAction::zoomIn(this, - TQT_SLOT(zoomIn()), + TQ_SLOT(zoomIn()), actionCollection()); KStdAction::zoomOut(this, - TQT_SLOT(zoomOut()), + TQ_SLOT(zoomOut()), actionCollection()); TDERadioAction* iconsView = new TDERadioAction(i18n("Icons"), "Ctrl+1", - this, TQT_SLOT(setIconsView()), + this, TQ_SLOT(setIconsView()), actionCollection(), "icons"); iconsView->setExclusiveGroup("view_mode"); iconsView->setIcon("view_icon"); TDERadioAction* detailsView = new TDERadioAction(i18n("Details"), "Ctrl+2", - this, TQT_SLOT(setDetailsView()), + this, TQ_SLOT(setDetailsView()), actionCollection(), "details"); detailsView->setExclusiveGroup("view_mode"); detailsView->setIcon("view_text"); TDERadioAction* previewsView = new TDERadioAction(i18n("Previews"), "Ctrl+3", - this, TQT_SLOT(setPreviewsView()), + this, TQ_SLOT(setPreviewsView()), actionCollection(), "previews"); previewsView->setExclusiveGroup("view_mode"); previewsView->setIcon("gvdirpart"); TDERadioAction* sortByName = new TDERadioAction(i18n("By Name"), 0, - this, TQT_SLOT(sortByName()), + this, TQ_SLOT(sortByName()), actionCollection(), "by_name"); sortByName->setExclusiveGroup("sort"); TDERadioAction* sortBySize = new TDERadioAction(i18n("By Size"), 0, - this, TQT_SLOT(sortBySize()), + this, TQ_SLOT(sortBySize()), actionCollection(), "by_size"); sortBySize->setExclusiveGroup("sort"); TDERadioAction* sortByDate = new TDERadioAction(i18n("By Date"), 0, - this, TQT_SLOT(sortByDate()), + this, TQ_SLOT(sortByDate()), actionCollection(), "by_date"); sortByDate->setExclusiveGroup("sort"); - new TDEToggleAction(i18n("Descending"), 0, this, TQT_SLOT(toggleSortOrder()), + new TDEToggleAction(i18n("Descending"), 0, this, TQ_SLOT(toggleSortOrder()), actionCollection(), "descending"); new TDEToggleAction(i18n("Show Hidden Files"), "Alt+.", - this, TQT_SLOT(showHiddenFiles()), + this, TQ_SLOT(showHiddenFiles()), actionCollection(), "show_hidden_files"); TDEToggleAction* splitAction = new TDEToggleAction(i18n("Split View"), "F10", - this, TQT_SLOT(toggleSplitView()), + this, TQ_SLOT(toggleSplitView()), actionCollection(), "split_view"); splitAction->setIcon("view_left_right"); TDEAction* reloadAction = new TDEAction(i18n("Reload"), "F5", - this, TQT_SLOT(reloadView()), + this, TQ_SLOT(reloadView()), actionCollection(), "reload"); reloadAction->setIcon("reload"); TDEAction* stopAction = new TDEAction(i18n("Stop"), 0, - this, TQT_SLOT(stopLoading()), + this, TQ_SLOT(stopLoading()), actionCollection(), "stop"); stopAction->setIcon("process-stop"); new TDEAction(i18n("Edit Location"), "Ctrl+L", - this, TQT_SLOT(editLocation()), + this, TQ_SLOT(editLocation()), actionCollection(), "edit_location"); new TDEAction(i18n("Browse"), "Ctrl+B", - this, TQT_SLOT(browse()), + this, TQ_SLOT(browse()), actionCollection(), "browse"); new TDEToggleAction(i18n("Left Sidebar"), "F8", - this, TQT_SLOT(toggleleftSidebar()), + this, TQ_SLOT(toggleleftSidebar()), actionCollection(), "leftsidebar"); new TDEToggleAction(i18n("Right Sidebar"), "F9", - this, TQT_SLOT(togglerightSidebar()), + this, TQ_SLOT(togglerightSidebar()), actionCollection(), "rightsidebar"); new TDEAction(i18n("Adjust View Properties..."), 0, - this, TQT_SLOT(adjustViewProperties()), + this, TQ_SLOT(adjustViewProperties()), actionCollection(), "view_properties"); // setup 'Go' menu - KStdAction::back(this, TQT_SLOT(goBack()), actionCollection()); - KStdAction::forward(this, TQT_SLOT(goForward()), actionCollection()); - KStdAction::up(this, TQT_SLOT(goUp()), actionCollection()); - KStdAction::home(this, TQT_SLOT(goHome()), actionCollection()); + KStdAction::back(this, TQ_SLOT(goBack()), actionCollection()); + KStdAction::forward(this, TQ_SLOT(goForward()), actionCollection()); + KStdAction::up(this, TQ_SLOT(goUp()), actionCollection()); + KStdAction::home(this, TQ_SLOT(goHome()), actionCollection()); // setup 'Tools' menu TDEAction* openTerminalAction = new TDEAction(i18n("Open Terminal"), "F4", - this, TQT_SLOT(openTerminal()), + this, TQ_SLOT(openTerminal()), actionCollection(), "open_terminal"); openTerminalAction->setIcon("konsole"); TDEAction* findFileAction = new TDEAction(i18n("Find File..."), "Ctrl+F", - this, TQT_SLOT(findFile()), + this, TQ_SLOT(findFile()), actionCollection(), "find_file"); findFileAction->setIcon("filefind"); new TDEToggleAction(i18n("Show Filter Bar"), "filter", "/", - this, TQT_SLOT(showFilterBar()), + this, TQ_SLOT(showFilterBar()), actionCollection(), "show_filter_bar"); TDEAction* compareFilesAction = new TDEAction(i18n("Compare Files"), 0, - this, TQT_SLOT(compareFiles()), + this, TQ_SLOT(compareFiles()), actionCollection(), "compare_files"); compareFilesAction->setIcon("kompare"); compareFilesAction->setEnabled(false); // setup 'Settings' menu - KStdAction::preferences(this, TQT_SLOT(editSettings()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(editSettings()), actionCollection()); } void Dolphin::setupCreateNewMenuActions() @@ -1414,8 +1414,8 @@ void Dolphin::setupCreateNewMenuActions() TDEAction* action = new TDEAction(entry.name); action->setIcon(entry.icon); action->setName((*it).index().ascii()); - connect(action, TQT_SIGNAL(activated()), - this, TQT_SLOT(createFile())); + connect(action, TQ_SIGNAL(activated()), + this, TQ_SLOT(createFile())); const TQChar section = ((*it).index()[0]); switch (section) { @@ -1599,8 +1599,8 @@ void Dolphin::addPendingUndoJob(TDEIO::Job* job, const KURL::List& source, const KURL& dest) { - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(addUndoOperation(TDEIO::Job*))); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(addUndoOperation(TDEIO::Job*))); UndoInfo undoInfo; undoInfo.id = job->progressId(); @@ -1623,8 +1623,8 @@ void Dolphin::openleftSidebar() m_leftsidebar = new leftSidebar(m_splitter); m_leftsidebar->show(); - connect(m_leftsidebar, TQT_SIGNAL(urlChanged(const KURL&)), - this, TQT_SLOT(slotURLChangeRequest(const KURL&))); + connect(m_leftsidebar, TQ_SIGNAL(urlChanged(const KURL&)), + this, TQ_SLOT(slotURLChangeRequest(const KURL&))); m_splitter->setCollapsible(m_leftsidebar, false); m_splitter->setResizeMode(m_leftsidebar, TQSplitter::KeepSize); m_splitter->moveToFirst(m_leftsidebar); @@ -1643,8 +1643,8 @@ void Dolphin::openrightSidebar() m_rightsidebar = new rightSidebar(m_splitter); m_rightsidebar->show(); - connect(m_rightsidebar, TQT_SIGNAL(urlChanged(const KURL&)), - this, TQT_SLOT(slotURLChangeRequest(const KURL&))); + connect(m_rightsidebar, TQ_SIGNAL(urlChanged(const KURL&)), + this, TQ_SLOT(slotURLChangeRequest(const KURL&))); m_splitter->setCollapsible(m_rightsidebar, false); m_splitter->setResizeMode(m_rightsidebar, TQSplitter::KeepSize); m_splitter->moveToLast(m_rightsidebar); diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp index 7031e82..391b4b6 100644 --- a/src/dolphindetailsview.cpp +++ b/src/dolphindetailsview.cpp @@ -49,8 +49,8 @@ DolphinDetailsView::DolphinDetailsView(DolphinView* parent) : m_rubber(0) { m_resizeTimer = new TQTimer(this); - connect(m_resizeTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(updateColumnsWidth())); + connect(m_resizeTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(updateColumnsWidth())); setAcceptDrops(true); setSelectionMode(KFile::Extended); @@ -63,30 +63,30 @@ DolphinDetailsView::DolphinDetailsView(DolphinView* parent) : Dolphin& dolphin = Dolphin::mainWin(); - connect(this, TQT_SIGNAL(onItem(TQListViewItem*)), - this, TQT_SLOT(slotOnItem(TQListViewItem*))); - connect(this, TQT_SIGNAL(onViewport()), - this, TQT_SLOT(slotOnViewport())); - connect(this, TQT_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT(slotContextMenuRequested(TQListViewItem*, const TQPoint&, int))); - connect(this, TQT_SIGNAL(selectionChanged()), - &dolphin, TQT_SLOT(slotSelectionChanged())); - connect(&dolphin, TQT_SIGNAL(activeViewChanged()), - this, TQT_SLOT(slotActivationUpdate())); - connect(this, TQT_SIGNAL(itemRenamed(TQListViewItem*, const TQString&, int)), - this, TQT_SLOT(slotItemRenamed(TQListViewItem*, const TQString&, int))); - connect(this, TQT_SIGNAL(dropped(TQDropEvent*, const KURL::List&, const KURL&)), - parent, TQT_SLOT(slotURLListDropped(TQDropEvent*, const KURL::List&, const KURL&))); + connect(this, TQ_SIGNAL(onItem(TQListViewItem*)), + this, TQ_SLOT(slotOnItem(TQListViewItem*))); + connect(this, TQ_SIGNAL(onViewport()), + this, TQ_SLOT(slotOnViewport())); + connect(this, TQ_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT(slotContextMenuRequested(TQListViewItem*, const TQPoint&, int))); + connect(this, TQ_SIGNAL(selectionChanged()), + &dolphin, TQ_SLOT(slotSelectionChanged())); + connect(&dolphin, TQ_SIGNAL(activeViewChanged()), + this, TQ_SLOT(slotActivationUpdate())); + connect(this, TQ_SIGNAL(itemRenamed(TQListViewItem*, const TQString&, int)), + this, TQ_SLOT(slotItemRenamed(TQListViewItem*, const TQString&, int))); + connect(this, TQ_SIGNAL(dropped(TQDropEvent*, const KURL::List&, const KURL&)), + parent, TQ_SLOT(slotURLListDropped(TQDropEvent*, const KURL::List&, const KURL&))); TQClipboard* clipboard = TQApplication::clipboard(); - connect(clipboard, TQT_SIGNAL(dataChanged()), - this, TQT_SLOT(slotUpdateDisabledItems())); + connect(clipboard, TQ_SIGNAL(dataChanged()), + this, TQ_SLOT(slotUpdateDisabledItems())); TQHeader* viewHeader = header(); viewHeader->setResizeEnabled(false); viewHeader->setMovingEnabled(false); - connect(viewHeader, TQT_SIGNAL(clicked(int)), - this, TQT_SLOT(slotHeaderClicked(int))); + connect(viewHeader, TQ_SIGNAL(clicked(int)), + this, TQ_SLOT(slotHeaderClicked(int))); setMouseTracking(true); setDefaultRenameAction(TQListView::Accept); @@ -425,8 +425,8 @@ void DolphinDetailsView::contentsMouseReleaseEvent(TQMouseEvent* event) } if (m_scrollTimer != 0) { - disconnect(m_scrollTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotAutoScroll())); + disconnect(m_scrollTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotAutoScroll())); m_scrollTimer->stop(); delete m_scrollTimer; m_scrollTimer = 0; @@ -582,14 +582,14 @@ void DolphinDetailsView::slotAutoScroll() if (scroll) { if (m_scrollTimer == 0) { m_scrollTimer = new TQTimer( this ); - connect(m_scrollTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotAutoScroll())); + connect(m_scrollTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotAutoScroll())); m_scrollTimer->start(100, false); } } else if (m_scrollTimer != 0) { - disconnect(m_scrollTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotAutoScroll())); + disconnect(m_scrollTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotAutoScroll())); m_scrollTimer->stop(); delete m_scrollTimer; m_scrollTimer = 0; diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp index 6d0084e..f2e898e 100644 --- a/src/dolphiniconsview.cpp +++ b/src/dolphiniconsview.cpp @@ -49,24 +49,24 @@ DolphinIconsView::DolphinIconsView(DolphinView* parent, LayoutMode layoutMode) : setSelectionMode(KFile::Extended); Dolphin& dolphin = Dolphin::mainWin(); - connect(this, TQT_SIGNAL(onItem(TQIconViewItem*)), - this, TQT_SLOT(slotOnItem(TQIconViewItem*))); - connect(this, TQT_SIGNAL(onViewport()), - this, TQT_SLOT(slotOnViewport())); - connect(this, TQT_SIGNAL(contextMenuRequested(TQIconViewItem*, const TQPoint&)), - this, TQT_SLOT(slotContextMenuRequested(TQIconViewItem*, const TQPoint&))); - connect(this, TQT_SIGNAL(selectionChanged()), - &dolphin, TQT_SLOT(slotSelectionChanged())); - connect(&dolphin, TQT_SIGNAL(activeViewChanged()), - this, TQT_SLOT(slotActivationUpdate())); - connect(this, TQT_SIGNAL(itemRenamed(TQIconViewItem*, const TQString&)), - this, TQT_SLOT(slotItemRenamed(TQIconViewItem*, const TQString&))); - connect(this, TQT_SIGNAL(dropped(TQDropEvent*, const KURL::List&, const KURL&)), - parent, TQT_SLOT(slotURLListDropped(TQDropEvent*, const KURL::List&, const KURL&))); + connect(this, TQ_SIGNAL(onItem(TQIconViewItem*)), + this, TQ_SLOT(slotOnItem(TQIconViewItem*))); + connect(this, TQ_SIGNAL(onViewport()), + this, TQ_SLOT(slotOnViewport())); + connect(this, TQ_SIGNAL(contextMenuRequested(TQIconViewItem*, const TQPoint&)), + this, TQ_SLOT(slotContextMenuRequested(TQIconViewItem*, const TQPoint&))); + connect(this, TQ_SIGNAL(selectionChanged()), + &dolphin, TQ_SLOT(slotSelectionChanged())); + connect(&dolphin, TQ_SIGNAL(activeViewChanged()), + this, TQ_SLOT(slotActivationUpdate())); + connect(this, TQ_SIGNAL(itemRenamed(TQIconViewItem*, const TQString&)), + this, TQ_SLOT(slotItemRenamed(TQIconViewItem*, const TQString&))); + connect(this, TQ_SIGNAL(dropped(TQDropEvent*, const KURL::List&, const KURL&)), + parent, TQ_SLOT(slotURLListDropped(TQDropEvent*, const KURL::List&, const KURL&))); TQClipboard* clipboard = TQApplication::clipboard(); - connect(clipboard, TQT_SIGNAL(dataChanged()), - this, TQT_SLOT(slotUpdateDisabledItems())); + connect(clipboard, TQ_SIGNAL(dataChanged()), + this, TQ_SLOT(slotUpdateDisabledItems())); // KFileIconView creates two actions for zooming, which are directly connected to the // slots KFileIconView::zoomIn() and KFileIconView::zoomOut(). As this behavior is not @@ -111,7 +111,7 @@ void DolphinIconsView::endItemUpdates() // has been finished. Using a delay of 300 ms is a temporary workaround // until the DolphinIconsView will implement the previews by it's own in // future releases. - TQTimer::singleShot(300, this, TQT_SLOT(slotUpdateDisabledItems())); + TQTimer::singleShot(300, this, TQ_SLOT(slotUpdateDisabledItems())); const KFileIconViewItem* item = static_cast(firstItem()); if (item != 0) { diff --git a/src/dolphinstatusbar.cpp b/src/dolphinstatusbar.cpp index 543bb47..4b69112 100644 --- a/src/dolphinstatusbar.cpp +++ b/src/dolphinstatusbar.cpp @@ -48,16 +48,16 @@ DolphinStatusBar::DolphinStatusBar(DolphinView* parent) : m_progressBar->hide(); m_progressTimer = new TQTimer(this); - connect(m_progressTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotProgressTimer())); + connect(m_progressTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotProgressTimer())); const TQSize size(m_progressBar->sizeHint()); m_progressBar->setMaximumWidth(size.width()); setMinimumHeight(size.height()); m_messageLabel->setMinimumTextHeight(size.height()); - connect(parent, TQT_SIGNAL(signalURLChanged(const KURL&)), - this, TQT_SLOT(slotURLChanged(const KURL&))); + connect(parent, TQ_SIGNAL(signalURLChanged(const KURL&)), + this, TQ_SLOT(slotURLChanged(const KURL&))); } diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp index 52a957d..88a966c 100644 --- a/src/dolphinview.cpp +++ b/src/dolphinview.cpp @@ -63,22 +63,22 @@ DolphinView::DolphinView(TQWidget *parent, Dolphin& dolphin = Dolphin::mainWin(); - connect(this, TQT_SIGNAL(signalModeChanged()), - &dolphin, TQT_SLOT(slotViewModeChanged())); - connect(this, TQT_SIGNAL(signalShowHiddenFilesChanged()), - &dolphin, TQT_SLOT(slotShowHiddenFilesChanged())); - connect(this, TQT_SIGNAL(signalSortingChanged(DolphinView::Sorting)), - &dolphin, TQT_SLOT(slotSortingChanged(DolphinView::Sorting))); - connect(this, TQT_SIGNAL(signalSortOrderChanged(TQt::SortOrder)), - &dolphin, TQT_SLOT(slotSortOrderChanged(TQt::SortOrder))); + connect(this, TQ_SIGNAL(signalModeChanged()), + &dolphin, TQ_SLOT(slotViewModeChanged())); + connect(this, TQ_SIGNAL(signalShowHiddenFilesChanged()), + &dolphin, TQ_SLOT(slotShowHiddenFilesChanged())); + connect(this, TQ_SIGNAL(signalSortingChanged(DolphinView::Sorting)), + &dolphin, TQ_SLOT(slotSortingChanged(DolphinView::Sorting))); + connect(this, TQ_SIGNAL(signalSortOrderChanged(TQt::SortOrder)), + &dolphin, TQ_SLOT(slotSortOrderChanged(TQt::SortOrder))); m_urlNavigator = new URLNavigator(url, this); - connect(m_urlNavigator, TQT_SIGNAL(urlChanged(const KURL&)), - this, TQT_SLOT(slotURLChanged(const KURL&))); - connect(m_urlNavigator, TQT_SIGNAL(urlChanged(const KURL&)), - &dolphin, TQT_SLOT(slotURLChanged(const KURL&))); - connect(m_urlNavigator, TQT_SIGNAL(historyChanged()), - &dolphin, TQT_SLOT(slotHistoryChanged())); + connect(m_urlNavigator, TQ_SIGNAL(urlChanged(const KURL&)), + this, TQ_SLOT(slotURLChanged(const KURL&))); + connect(m_urlNavigator, TQ_SIGNAL(urlChanged(const KURL&)), + &dolphin, TQ_SLOT(slotURLChanged(const KURL&))); + connect(m_urlNavigator, TQ_SIGNAL(historyChanged()), + &dolphin, TQ_SLOT(slotHistoryChanged())); m_statusBar = new DolphinStatusBar(this); @@ -86,22 +86,22 @@ DolphinView::DolphinView(TQWidget *parent, m_dirLister->setAutoUpdate(true); m_dirLister->setMainWindow(this); m_dirLister->setShowingDotFiles(showHiddenFiles); - connect(m_dirLister, TQT_SIGNAL(clear()), - this, TQT_SLOT(slotClear())); - connect(m_dirLister, TQT_SIGNAL(percent(int)), - this, TQT_SLOT(slotPercent(int))); - connect(m_dirLister, TQT_SIGNAL(deleteItem(KFileItem*)), - this, TQT_SLOT(slotDeleteItem(KFileItem*))); - connect(m_dirLister, TQT_SIGNAL(completed()), - this, TQT_SLOT(slotCompleted())); - connect(m_dirLister, TQT_SIGNAL(infoMessage(const TQString&)), - this, TQT_SLOT(slotInfoMessage(const TQString&))); - connect(m_dirLister, TQT_SIGNAL(errorMessage(const TQString&)), - this, TQT_SLOT(slotErrorMessage(const TQString&))); - connect(m_dirLister, TQT_SIGNAL(refreshItems (const KFileItemList&)), - this, TQT_SLOT(slotRefreshItems(const KFileItemList&))); - connect(m_dirLister, TQT_SIGNAL(newItems(const KFileItemList&)), - this, TQT_SLOT(slotAddItems(const KFileItemList&))); + connect(m_dirLister, TQ_SIGNAL(clear()), + this, TQ_SLOT(slotClear())); + connect(m_dirLister, TQ_SIGNAL(percent(int)), + this, TQ_SLOT(slotPercent(int))); + connect(m_dirLister, TQ_SIGNAL(deleteItem(KFileItem*)), + this, TQ_SLOT(slotDeleteItem(KFileItem*))); + connect(m_dirLister, TQ_SIGNAL(completed()), + this, TQ_SLOT(slotCompleted())); + connect(m_dirLister, TQ_SIGNAL(infoMessage(const TQString&)), + this, TQ_SLOT(slotInfoMessage(const TQString&))); + connect(m_dirLister, TQ_SIGNAL(errorMessage(const TQString&)), + this, TQ_SLOT(slotErrorMessage(const TQString&))); + connect(m_dirLister, TQ_SIGNAL(refreshItems (const KFileItemList&)), + this, TQ_SLOT(slotRefreshItems(const KFileItemList&))); + connect(m_dirLister, TQ_SIGNAL(newItems(const KFileItemList&)), + this, TQ_SLOT(slotAddItems(const KFileItemList&))); m_iconSize = TDEIcon::SizeMedium; @@ -111,8 +111,8 @@ DolphinView::DolphinView(TQWidget *parent, m_filterBar = new FilterBar(this); m_filterBar->hide(); m_topLayout->addWidget(m_filterBar); - connect(m_filterBar, TQT_SIGNAL(signalFilterChanged(const TQString&)), - this, TQT_SLOT(slotChangeNameFilter(const TQString&))); + connect(m_filterBar, TQ_SIGNAL(signalFilterChanged(const TQString&)), + this, TQ_SLOT(slotChangeNameFilter(const TQString&))); m_topLayout->addWidget(m_statusBar); } @@ -652,7 +652,7 @@ void DolphinView::triggerIconsViewItem(TQIconViewItem* item) if ((item != 0) && !isSelectionActive) { // Updating the URL must be done outside the scope of this slot, // as iconview items will get deleted. - TQTimer::singleShot(0, this, TQT_SLOT(updateURL())); + TQTimer::singleShot(0, this, TQ_SLOT(updateURL())); Dolphin::mainWin().setActiveView(this); } } @@ -668,7 +668,7 @@ void DolphinView::triggerDetailsViewItem(TQListViewItem* item, if (m_detailsView->isOnFilename(item, pos)) { // Updating the URL must be done outside the scope of this slot, // as listview items will get deleted. - TQTimer::singleShot(0, this, TQT_SLOT(updateURL())); + TQTimer::singleShot(0, this, TQ_SLOT(updateURL())); Dolphin::mainWin().setActiveView(this); } else { @@ -831,7 +831,7 @@ void DolphinView::slotCompleted() // Prevent a flickering of the icon view widget by giving a small // timeslot to swallow asynchronous update events. m_iconsView->setUpdatesEnabled(false); - TQTimer::singleShot(10, this, TQT_SLOT(slotDelayedUpdate())); + TQTimer::singleShot(10, this, TQ_SLOT(slotDelayedUpdate())); } if (m_detailsView != 0) { @@ -861,7 +861,7 @@ void DolphinView::slotErrorMessage(const TQString& msg) void DolphinView::slotRefreshItems(const KFileItemList& /* list */) { - TQTimer::singleShot(0, this, TQT_SLOT(reload())); + TQTimer::singleShot(0, this, TQ_SLOT(reload())); } void DolphinView::slotAddItems(const KFileItemList& list) @@ -900,12 +900,12 @@ void DolphinView::createView() m_topLayout->insertWidget(1, m_iconsView); setFocusProxy(m_iconsView); - connect(m_iconsView, TQT_SIGNAL(executed(TQIconViewItem*)), - this, TQT_SLOT(triggerIconsViewItem(TQIconViewItem*))); - connect(m_iconsView, TQT_SIGNAL(returnPressed(TQIconViewItem*)), - this, TQT_SLOT(triggerIconsViewItem(TQIconViewItem*))); - connect(m_iconsView, TQT_SIGNAL(signalRequestActivation()), - this, TQT_SLOT(slotGrabActivation())); + connect(m_iconsView, TQ_SIGNAL(executed(TQIconViewItem*)), + this, TQ_SLOT(triggerIconsViewItem(TQIconViewItem*))); + connect(m_iconsView, TQ_SIGNAL(returnPressed(TQIconViewItem*)), + this, TQ_SLOT(triggerIconsViewItem(TQIconViewItem*))); + connect(m_iconsView, TQ_SIGNAL(signalRequestActivation()), + this, TQ_SLOT(slotGrabActivation())); m_iconsView->endItemUpdates(); m_iconsView->show(); @@ -918,12 +918,12 @@ void DolphinView::createView() m_topLayout->insertWidget(1, m_detailsView); setFocusProxy(m_detailsView); - connect(m_detailsView, TQT_SIGNAL(executed(TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT(triggerDetailsViewItem(TQListViewItem*, const TQPoint&, int))); - connect(m_detailsView, TQT_SIGNAL(returnPressed(TQListViewItem*)), - this, TQT_SLOT(triggerDetailsViewItem(TQListViewItem*))); - connect(m_detailsView, TQT_SIGNAL(signalRequestActivation()), - this, TQT_SLOT(slotGrabActivation())); + connect(m_detailsView, TQ_SIGNAL(executed(TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT(triggerDetailsViewItem(TQListViewItem*, const TQPoint&, int))); + connect(m_detailsView, TQ_SIGNAL(returnPressed(TQListViewItem*)), + this, TQ_SLOT(triggerDetailsViewItem(TQListViewItem*))); + connect(m_detailsView, TQ_SIGNAL(signalRequestActivation()), + this, TQ_SLOT(slotGrabActivation())); m_detailsView->show(); m_detailsView->setFocus(); break; @@ -933,8 +933,8 @@ void DolphinView::createView() break; } - connect(scrollView(), TQT_SIGNAL(contentsMoving(int, int)), - this, TQT_SLOT(slotContentsMoving(int, int))); + connect(scrollView(), TQ_SIGNAL(contentsMoving(int, int)), + this, TQ_SLOT(slotContentsMoving(int, int))); startDirLister(m_urlNavigator->url()); } diff --git a/src/editbookmarkdialog.cpp b/src/editbookmarkdialog.cpp index f326783..397deed 100644 --- a/src/editbookmarkdialog.cpp +++ b/src/editbookmarkdialog.cpp @@ -73,8 +73,8 @@ EditBookmarkDialog::EditBookmarkDialog(const TQString& title, m_iconName = icon; m_iconButton = new TQPushButton(SmallIcon(m_iconName), TQString(), grid); m_iconButton->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); - connect(m_iconButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(selectIcon())); + connect(m_iconButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(selectIcon())); // create name widgets new TQLabel(i18n("Name:"), grid); @@ -93,8 +93,8 @@ EditBookmarkDialog::EditBookmarkDialog(const TQString& title, TQPushButton* selectLocationButton = new TQPushButton(SmallIcon("folder"), TQString(), locationBox); selectLocationButton->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); - connect(selectLocationButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(selectLocation())); + connect(selectLocationButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(selectLocation())); topLayout->addWidget(grid); } diff --git a/src/filterbar.cpp b/src/filterbar.cpp index 1db8835..8cd63bb 100644 --- a/src/filterbar.cpp +++ b/src/filterbar.cpp @@ -54,11 +54,11 @@ FilterBar::FilterBar(TQWidget *parent, const char *name) : layout->addWidget(m_close); layout->addSpacing(gap); - connect(m_filterInput, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SIGNAL(signalFilterChanged(const TQString&))); - connect(m_close, TQT_SIGNAL(clicked()), this, TQT_SLOT(hide())); - connect(m_close, TQT_SIGNAL(clicked()), - &Dolphin::mainWin(), TQT_SLOT(slotShowFilterBarChanged())); + connect(m_filterInput, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SIGNAL(signalFilterChanged(const TQString&))); + connect(m_close, TQ_SIGNAL(clicked()), this, TQ_SLOT(hide())); + connect(m_close, TQ_SIGNAL(clicked()), + &Dolphin::mainWin(), TQ_SLOT(slotShowFilterBarChanged())); } FilterBar::~FilterBar() diff --git a/src/generalsettingspage.cpp b/src/generalsettingspage.cpp index 27926a1..69538ea 100644 --- a/src/generalsettingspage.cpp +++ b/src/generalsettingspage.cpp @@ -71,18 +71,18 @@ GeneralSettingsPage::GeneralSettingsPage(TQWidget* parent) : m_homeURL = new TQLineEdit(settings.homeURL().prettyURL(), homeURLBox); TQPushButton* selectHomeURLButton = new TQPushButton(SmallIcon("folder"), TQString(), homeURLBox); - connect(selectHomeURLButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(selectHomeURL())); + connect(selectHomeURLButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(selectHomeURL())); TQHBox* buttonBox = new TQHBox(homeGroup); buttonBox->setSizePolicy(sizePolicy); buttonBox->setSpacing(spacing); TQPushButton* useCurrentButton = new TQPushButton(i18n("Use current location"), buttonBox); - connect(useCurrentButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(useCurrentLocation())); + connect(useCurrentButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(useCurrentLocation())); TQPushButton* useDefaultButton = new TQPushButton(i18n("Use default location"), buttonBox); - connect(useDefaultButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(useDefaulLocation())); + connect(useDefaultButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(useDefaulLocation())); // create 'Default View Mode' group TQButtonGroup* buttonGroup = new TQButtonGroup(3, TQt::Vertical, i18n("Default View Mode"), vBox); diff --git a/src/iconsviewsettingspage.cpp b/src/iconsviewsettingspage.cpp index ffb4e9f..7f3871b 100644 --- a/src/iconsviewsettingspage.cpp +++ b/src/iconsviewsettingspage.cpp @@ -78,8 +78,8 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinIconsView::LayoutMode mode, m_iconSizeSlider = new TQSlider(0, 5, 1, 0, TQt::Horizontal, iconSizeVBox); m_iconSizeSlider->setValue(sliderValue(settings->iconSize())); m_iconSizeSlider->setTickmarks(TQSlider::Below); - connect(m_iconSizeSlider, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotIconSizeChanged(int))); + connect(m_iconSizeSlider, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotIconSizeChanged(int))); new TQLabel(i18n("Large"), iconSizeVBox); m_iconSizeViewer = new PixmapViewer(iconSizeGroup); @@ -100,8 +100,8 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinIconsView::LayoutMode mode, m_previewSizeSlider = new TQSlider(0, 5, 1, 0, TQt::Horizontal, previewSizeVBox); m_previewSizeSlider->setValue(sliderValue(settings->previewSize())); m_previewSizeSlider->setTickmarks(TQSlider::Below); - connect(m_previewSizeSlider, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotPreviewSizeChanged(int))); + connect(m_previewSizeSlider, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotPreviewSizeChanged(int))); new TQLabel(i18n("Large"), previewSizeVBox); m_previewSizeViewer = new PixmapViewer(previewSizeGroup); diff --git a/src/infosidebarpage.cpp b/src/infosidebarpage.cpp index 5bfefbf..48f7efe 100644 --- a/src/infosidebarpage.cpp +++ b/src/infosidebarpage.cpp @@ -60,8 +60,8 @@ InfoSidebarPage::InfoSidebarPage(TQWidget* parent) : const int spacing = KDialog::spacingHint(); m_timer = new TQTimer(this); - connect(m_timer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotTimeout())); + connect(m_timer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotTimeout())); TQVBoxLayout* layout = new TQVBoxLayout(this); layout->setSpacing(spacing); @@ -106,8 +106,8 @@ InfoSidebarPage::InfoSidebarPage(TQWidget* parent) : layout->addWidget(m_actionBox); layout->addWidget(dummy); - connect(&Dolphin::mainWin(), TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(showItemInfo())); + connect(&Dolphin::mainWin(), TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(showItemInfo())); connectToActiveView(); } @@ -173,10 +173,10 @@ void InfoSidebarPage::showItemInfo() TDEIO::PreviewJob* job = TDEIO::filePreview(list, m_preview->width(), TDEIcon::SizeEnormous); - connect(job, TQT_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)), - this, TQT_SLOT(gotPreview(const KFileItem*, const TQPixmap&))); - connect(job, TQT_SIGNAL(failed(const KFileItem*)), - this, TQT_SLOT(slotPreviewFailed(const KFileItem*))); + connect(job, TQ_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)), + this, TQ_SLOT(gotPreview(const KFileItem*, const TQPixmap&))); + connect(job, TQ_SIGNAL(failed(const KFileItem*)), + this, TQ_SLOT(slotPreviewFailed(const KFileItem*))); TQString text(""); text.append(m_shownURL.fileName()); @@ -228,10 +228,10 @@ void InfoSidebarPage::connectToActiveView() cancelRequest(); DolphinView* view = Dolphin::mainWin().activeView(); - connect(view, TQT_SIGNAL(signalRequestItemInfo(const KURL&)), - this, TQT_SLOT(requestDelayedItemInfo(const KURL&))); - connect(view, TQT_SIGNAL(signalURLChanged(const KURL&)), - this, TQT_SLOT(requestItemInfo(const KURL&))); + connect(view, TQ_SIGNAL(signalRequestItemInfo(const KURL&)), + this, TQ_SLOT(requestDelayedItemInfo(const KURL&))); + connect(view, TQ_SIGNAL(signalURLChanged(const KURL&)), + this, TQ_SLOT(requestItemInfo(const KURL&))); m_shownURL = view->url(); showItemInfo(); @@ -486,8 +486,8 @@ void InfoSidebarPage::insertActions() if (!submenuName.isEmpty()) { // create a sub menu containing all actions popup = new TQPopupMenu(); - connect(popup, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(startService(int))); + connect(popup, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(startService(int))); TQPushButton* button = new TQPushButton(submenuName, m_actionBox); button->setFlat(true); @@ -508,8 +508,8 @@ void InfoSidebarPage::insertActions() service.m_strName, m_actionBox, actionsIndex); - connect(button, TQT_SIGNAL(requestServiceStart(int)), - this, TQT_SLOT(startService(int))); + connect(button, TQ_SIGNAL(requestServiceStart(int)), + this, TQ_SLOT(startService(int))); m_actionWidgets.append(button); button->show(); } @@ -537,8 +537,8 @@ ServiceButton::ServiceButton(const TQIconSet& icon, { setEraseColor(colorGroup().background()); setFocusPolicy(TQWidget::NoFocus); - connect(this, TQT_SIGNAL(released()), - this, TQT_SLOT(slotReleased())); + connect(this, TQ_SIGNAL(released()), + this, TQ_SLOT(slotReleased())); } ServiceButton::~ServiceButton() diff --git a/src/sidebarpage.cpp b/src/sidebarpage.cpp index 99b1af4..80f52e4 100644 --- a/src/sidebarpage.cpp +++ b/src/sidebarpage.cpp @@ -23,8 +23,8 @@ SidebarPage::SidebarPage(TQWidget* parent) : TQWidget(parent) { - connect(&Dolphin::mainWin(), TQT_SIGNAL(activeViewChanged()), - this, TQT_SLOT(activeViewChanged())); + connect(&Dolphin::mainWin(), TQ_SIGNAL(activeViewChanged()), + this, TQ_SLOT(activeViewChanged())); } SidebarPage::~SidebarPage() diff --git a/src/sidebars.cpp b/src/sidebars.cpp index 7b65ff7..fd75e64 100644 --- a/src/sidebars.cpp +++ b/src/sidebars.cpp @@ -65,8 +65,8 @@ leftSidebar::leftSidebar(TQWidget* parent) : createPage(selectedIndex); - connect(m_pagesSelector, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(createPage(int))); + connect(m_pagesSelector, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(createPage(int))); } leftSidebar::~leftSidebar() @@ -140,8 +140,8 @@ rightSidebar::rightSidebar(TQWidget* parent) : createPage(selectedIndex); - connect(m_pagesSelector, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(createPage(int))); + connect(m_pagesSelector, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(createPage(int))); } rightSidebar::~rightSidebar() diff --git a/src/statusbarmessagelabel.cpp b/src/statusbarmessagelabel.cpp index e51cd90..9706596 100644 --- a/src/statusbarmessagelabel.cpp +++ b/src/statusbarmessagelabel.cpp @@ -36,8 +36,8 @@ StatusBarMessageLabel::StatusBarMessageLabel(TQWidget* parent) : setMinimumHeight(TDEIcon::SizeSmall); m_timer = new TQTimer(this); - connect(m_timer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(timerDone())); + connect(m_timer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(timerDone())); } StatusBarMessageLabel::~StatusBarMessageLabel() @@ -138,7 +138,7 @@ void StatusBarMessageLabel::paintEvent(TQPaintEvent* /* event */) void StatusBarMessageLabel::resizeEvent(TQResizeEvent* event) { TQWidget::resizeEvent(event); - TQTimer::singleShot(0, this, TQT_SLOT(assureVisibleText())); + TQTimer::singleShot(0, this, TQ_SLOT(assureVisibleText())); } void StatusBarMessageLabel::timerDone() diff --git a/src/statusbarspaceinfo.cpp b/src/statusbarspaceinfo.cpp index 97283d5..455aa52 100644 --- a/src/statusbarspaceinfo.cpp +++ b/src/statusbarspaceinfo.cpp @@ -38,7 +38,7 @@ StatusBarSpaceInfo::StatusBarSpaceInfo(TQWidget* parent) : // Update the space information each 10 seconds. Polling is useful // here, as files can be deleted/added outside the scope of Dolphin. TQTimer* timer = new TQTimer(this); - connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(refresh())); + connect(timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(refresh())); timer->start(10000); } @@ -98,7 +98,7 @@ void StatusBarSpaceInfo::paintEvent(TQPaintEvent* /* event */) } else { text = ""; - TQTimer::singleShot(0, this, TQT_SLOT(hide())); + TQTimer::singleShot(0, this, TQ_SLOT(hide())); } } @@ -150,16 +150,16 @@ void StatusBarSpaceInfo::refresh() const TQString mountPoint(TDEIO::findPathMountPoint(m_url.path())); KDiskFreeSp* job = new KDiskFreeSp(this); - connect(job, TQT_SIGNAL(foundMountPoint(const unsigned long&, + connect(job, TQ_SIGNAL(foundMountPoint(const unsigned long&, const unsigned long&, const unsigned long&, const TQString& )), - this, TQT_SLOT(slotFoundMountPoint(const unsigned long&, + this, TQ_SLOT(slotFoundMountPoint(const unsigned long&, const unsigned long&, const unsigned long&, const TQString& ))); - connect(job, TQT_SIGNAL(done()), - this, TQT_SLOT(slotDone())); + connect(job, TQ_SIGNAL(done()), + this, TQ_SLOT(slotDone())); job->readDF(mountPoint); } diff --git a/src/undomanager.cpp b/src/undomanager.cpp index 21c36b7..d34d428 100644 --- a/src/undomanager.cpp +++ b/src/undomanager.cpp @@ -205,8 +205,8 @@ void UndoManager::undo() if (job != 0) { // Execute the jobs in a synchronous manner and forward the progress // information to the Dolphin statusbar. - connect(job, TQT_SIGNAL(percent(TDEIO::Job*, unsigned long)), - this, TQT_SLOT(slotPercent(TDEIO::Job*, unsigned long))); + connect(job, TQ_SIGNAL(percent(TDEIO::Job*, unsigned long)), + this, TQ_SLOT(slotPercent(TDEIO::Job*, unsigned long))); TDEIO::NetAccess::synchronousRun(job, &Dolphin::mainWin()); } @@ -309,8 +309,8 @@ void UndoManager::redo() if (job != 0) { // Execute the jobs in a synchronous manner and forward the progress // information to the Dolphin statusbar. - connect(job, TQT_SIGNAL(percent(TDEIO::Job*, unsigned long)), - this, TQT_SLOT(slotPercent(TDEIO::Job*, unsigned long))); + connect(job, TQ_SIGNAL(percent(TDEIO::Job*, unsigned long)), + this, TQ_SLOT(slotPercent(TDEIO::Job*, unsigned long))); TDEIO::NetAccess::synchronousRun(job, &dolphin); } @@ -358,7 +358,7 @@ void UndoManager::slotPercent(TDEIO::Job* /* job */, unsigned long /* percent */ { // It is not allowed to update the progress indicator in the context // of this slot, hence do an asynchronous triggering. - TQTimer::singleShot(0, this, TQT_SLOT(updateProgress())); + TQTimer::singleShot(0, this, TQ_SLOT(updateProgress())); } void UndoManager::updateProgress() diff --git a/src/urlbutton.cpp b/src/urlbutton.cpp index 6031048..977c4d1 100644 --- a/src/urlbutton.cpp +++ b/src/urlbutton.cpp @@ -41,9 +41,9 @@ URLButton::URLButton(URLNavigator* parent) setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Fixed); setMinimumHeight(parent->minimumHeight()); - connect(this, TQT_SIGNAL(clicked()), parent, TQT_SLOT(slotRequestActivation())); - connect(&Dolphin::mainWin(), TQT_SIGNAL(activeViewChanged()), - this, TQT_SLOT(update())); + connect(this, TQ_SIGNAL(clicked()), parent, TQ_SLOT(slotRequestActivation())); + connect(&Dolphin::mainWin(), TQ_SIGNAL(activeViewChanged()), + this, TQ_SLOT(update())); } URLButton::~URLButton() diff --git a/src/urlnavigator.cpp b/src/urlnavigator.cpp index 8a3e05a..96edc9d 100644 --- a/src/urlnavigator.cpp +++ b/src/urlnavigator.cpp @@ -85,15 +85,15 @@ URLNavigator::URLNavigator(const KURL& url, m_toggleButton->setToggleButton(true); m_toggleButton->setFocusPolicy(TQWidget::NoFocus); m_toggleButton->setMinimumHeight(minimumHeight()); - connect(m_toggleButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotClicked())); + connect(m_toggleButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotClicked())); if (DolphinSettings::instance().isURLEditable()) { m_toggleButton->toggle(); } m_bookmarkSelector = new BookmarkSelector(this); - connect(m_bookmarkSelector, TQT_SIGNAL(bookmarkActivated(int)), - this, TQT_SLOT(slotBookmarkActivated(int))); + connect(m_bookmarkSelector, TQ_SIGNAL(bookmarkActivated(int)), + this, TQ_SLOT(slotBookmarkActivated(int))); m_pathBox = new KURLComboBox(KURLComboBox::Directories, true, this); @@ -101,13 +101,13 @@ URLNavigator::URLNavigator(const KURL& url, m_pathBox->setCompletionObject(kurlCompletion); m_pathBox->setAutoDeleteCompletionObject(true); - connect(m_pathBox, TQT_SIGNAL(returnPressed(const TQString&)), - this, TQT_SLOT(slotReturnPressed(const TQString&))); - connect(m_pathBox, TQT_SIGNAL(urlActivated(const KURL&)), - this, TQT_SLOT(slotURLActivated(const KURL&))); + connect(m_pathBox, TQ_SIGNAL(returnPressed(const TQString&)), + this, TQ_SLOT(slotReturnPressed(const TQString&))); + connect(m_pathBox, TQ_SIGNAL(urlActivated(const KURL&)), + this, TQ_SLOT(slotURLActivated(const KURL&))); - connect(dolphinView, TQT_SIGNAL(contentsMoved(int, int)), - this, TQT_SLOT(slotContentsMoved(int, int))); + connect(dolphinView, TQ_SIGNAL(contentsMoved(int, int)), + this, TQ_SLOT(slotContentsMoved(int, int))); updateContent(); } diff --git a/src/urlnavigatorbutton.cpp b/src/urlnavigatorbutton.cpp index fbfa02e..d7de1ff 100644 --- a/src/urlnavigatorbutton.cpp +++ b/src/urlnavigatorbutton.cpp @@ -46,11 +46,11 @@ URLNavigatorButton::URLNavigatorButton(int index, URLNavigator* parent) : setAcceptDrops(true); setMinimumWidth(arrowWidth()); setIndex(index); - connect(this, TQT_SIGNAL(clicked()), this, TQT_SLOT(updateNavigatorURL())); + connect(this, TQ_SIGNAL(clicked()), this, TQ_SLOT(updateNavigatorURL())); m_popupDelay = new TQTimer(this); - connect(m_popupDelay, TQT_SIGNAL(timeout()), this, TQT_SLOT(startListJob())); - connect(this, TQT_SIGNAL(pressed()), this, TQT_SLOT(startPopupDelay())); + connect(m_popupDelay, TQ_SIGNAL(timeout()), this, TQ_SLOT(startListJob())); + connect(this, TQ_SIGNAL(pressed()), this, TQ_SLOT(startPopupDelay())); } URLNavigatorButton::~URLNavigatorButton() @@ -263,9 +263,9 @@ void URLNavigatorButton::startListJob() m_listJob = TDEIO::listDir(url, false, false); m_subdirs.clear(); // just to be ++safe - connect(m_listJob, TQT_SIGNAL(entries(TDEIO::Job*, const TDEIO::UDSEntryList &)), - this, TQT_SLOT(entriesList(TDEIO::Job*, const TDEIO::UDSEntryList&))); - connect(m_listJob, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(listJobFinished(TDEIO::Job*))); + connect(m_listJob, TQ_SIGNAL(entries(TDEIO::Job*, const TDEIO::UDSEntryList &)), + this, TQ_SLOT(entriesList(TDEIO::Job*, const TDEIO::UDSEntryList&))); + connect(m_listJob, TQ_SIGNAL(result(TDEIO::Job*)), this, TQ_SLOT(listJobFinished(TDEIO::Job*))); } void URLNavigatorButton::entriesList(TDEIO::Job* job, const TDEIO::UDSEntryList& entries) diff --git a/src/viewpropertiesdialog.cpp b/src/viewpropertiesdialog.cpp index 449ad94..5f87a62 100644 --- a/src/viewpropertiesdialog.cpp +++ b/src/viewpropertiesdialog.cpp @@ -118,20 +118,20 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : topLayout->addWidget(propsGroup); topLayout->addWidget(buttonGroup); - connect(m_viewMode, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotViewModeChanged(int))); - connect(m_sorting, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotSortingChanged(int))); - connect(m_sortOrder, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotSortOrderChanged(int))); - connect(m_showHiddenFiles, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotShowHiddenFilesChanged())); - connect(m_applyToCurrentFolder, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotApplyToCurrentFolder())); - connect(m_applyToSubFolders, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotApplyToSubFolders())); - connect(m_applyToAllFolders, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotApplyToAllFolders())); + connect(m_viewMode, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotViewModeChanged(int))); + connect(m_sorting, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotSortingChanged(int))); + connect(m_sortOrder, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotSortOrderChanged(int))); + connect(m_showHiddenFiles, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotShowHiddenFilesChanged())); + connect(m_applyToCurrentFolder, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotApplyToCurrentFolder())); + connect(m_applyToSubFolders, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotApplyToSubFolders())); + connect(m_applyToAllFolders, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotApplyToAllFolders())); } ViewPropertiesDialog::~ViewPropertiesDialog()