diff --git a/src/dolphin.cpp b/src/dolphin.cpp index 01b5c5f..acf0e63 100644 --- a/src/dolphin.cpp +++ b/src/dolphin.cpp @@ -1180,29 +1180,29 @@ void Dolphin::setupActions() { // setup 'File' menu TDEAction* createFolder = new TDEAction(i18n("Folder..."), "Ctrl+N", - TQT_TQOBJECT(this), TQT_SLOT(createFolder()), + this, TQT_SLOT(createFolder()), actionCollection(), "create_folder"); createFolder->setIcon("folder"); new TDEAction(i18n("Rename"), KKey(Key_F2), - TQT_TQOBJECT(this), TQT_SLOT(rename()), + this, TQT_SLOT(rename()), actionCollection(), "rename"); TDEAction* moveToTrashAction = new TDEAction(i18n("Move to Trash"), KKey(Key_Delete), - TQT_TQOBJECT(this), TQT_SLOT(moveToTrash()), + this, TQT_SLOT(moveToTrash()), actionCollection(), "move_to_trash"); moveToTrashAction->setIcon("edittrash"); TDEAction* deleteAction = new TDEAction(i18n("Delete"), "Shift+Delete", - TQT_TQOBJECT(this), TQT_SLOT(deleteItems()), + this, TQT_SLOT(deleteItems()), actionCollection(), "delete"); deleteAction->setIcon("edit-delete"); new TDEAction(i18n("Propert&ies"), "edit", "Alt+Return", - TQT_TQOBJECT(this), TQT_SLOT(properties()), + this, TQT_SLOT(properties()), actionCollection(), "properties"); - KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(quit()), actionCollection()); + KStdAction::quit(this, TQT_SLOT(quit()), actionCollection()); // setup 'Edit' menu UndoManager& undoManager = UndoManager::instance(); @@ -1210,143 +1210,143 @@ void Dolphin::setupActions() TQT_SLOT(undo()), actionCollection()); connect(&undoManager, TQT_SIGNAL(undoAvailable(bool)), - TQT_TQOBJECT(this), TQT_SLOT(slotUndoAvailable(bool))); + this, TQT_SLOT(slotUndoAvailable(bool))); connect(&undoManager, TQT_SIGNAL(undoTextChanged(const TQString&)), - TQT_TQOBJECT(this), TQT_SLOT(slotUndoTextChanged(const TQString&))); + this, TQT_SLOT(slotUndoTextChanged(const TQString&))); KStdAction::redo(&undoManager, TQT_SLOT(redo()), actionCollection()); connect(&undoManager, TQT_SIGNAL(redoAvailable(bool)), - TQT_TQOBJECT(this), TQT_SLOT(slotRedoAvailable(bool))); + this, TQT_SLOT(slotRedoAvailable(bool))); connect(&undoManager, TQT_SIGNAL(redoTextChanged(const TQString&)), - TQT_TQOBJECT(this), TQT_SLOT(slotRedoTextChanged(const TQString&))); + this, TQT_SLOT(slotRedoTextChanged(const TQString&))); - KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(cut()), actionCollection()); - KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(copy()), actionCollection()); - KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(paste()), actionCollection()); + KStdAction::cut(this, TQT_SLOT(cut()), actionCollection()); + KStdAction::copy(this, TQT_SLOT(copy()), actionCollection()); + KStdAction::paste(this, TQT_SLOT(paste()), actionCollection()); new TDEAction(i18n("Select All"), "Ctrl+A", - TQT_TQOBJECT(this), TQT_SLOT(selectAll()), + this, TQT_SLOT(selectAll()), actionCollection(), "select_all"); new TDEAction(i18n("Invert Selection"), "Ctrl+Shift+A", - TQT_TQOBJECT(this), TQT_SLOT(invertSelection()), + this, TQT_SLOT(invertSelection()), actionCollection(), "invert_selection"); // setup 'View' menu - KStdAction::zoomIn(TQT_TQOBJECT(this), + KStdAction::zoomIn(this, TQT_SLOT(zoomIn()), actionCollection()); - KStdAction::zoomOut(TQT_TQOBJECT(this), + KStdAction::zoomOut(this, TQT_SLOT(zoomOut()), actionCollection()); TDERadioAction* iconsView = new TDERadioAction(i18n("Icons"), "Ctrl+1", - TQT_TQOBJECT(this), TQT_SLOT(setIconsView()), + this, TQT_SLOT(setIconsView()), actionCollection(), "icons"); iconsView->setExclusiveGroup("view_mode"); iconsView->setIcon("view_icon"); TDERadioAction* detailsView = new TDERadioAction(i18n("Details"), "Ctrl+2", - TQT_TQOBJECT(this), TQT_SLOT(setDetailsView()), + this, TQT_SLOT(setDetailsView()), actionCollection(), "details"); detailsView->setExclusiveGroup("view_mode"); detailsView->setIcon("view_text"); TDERadioAction* previewsView = new TDERadioAction(i18n("Previews"), "Ctrl+3", - TQT_TQOBJECT(this), TQT_SLOT(setPreviewsView()), + this, TQT_SLOT(setPreviewsView()), actionCollection(), "previews"); previewsView->setExclusiveGroup("view_mode"); previewsView->setIcon("gvdirpart"); TDERadioAction* sortByName = new TDERadioAction(i18n("By Name"), 0, - TQT_TQOBJECT(this), TQT_SLOT(sortByName()), + this, TQT_SLOT(sortByName()), actionCollection(), "by_name"); sortByName->setExclusiveGroup("sort"); TDERadioAction* sortBySize = new TDERadioAction(i18n("By Size"), 0, - TQT_TQOBJECT(this), TQT_SLOT(sortBySize()), + this, TQT_SLOT(sortBySize()), actionCollection(), "by_size"); sortBySize->setExclusiveGroup("sort"); TDERadioAction* sortByDate = new TDERadioAction(i18n("By Date"), 0, - TQT_TQOBJECT(this), TQT_SLOT(sortByDate()), + this, TQT_SLOT(sortByDate()), actionCollection(), "by_date"); sortByDate->setExclusiveGroup("sort"); - new TDEToggleAction(i18n("Descending"), 0, TQT_TQOBJECT(this), TQT_SLOT(toggleSortOrder()), + new TDEToggleAction(i18n("Descending"), 0, this, TQT_SLOT(toggleSortOrder()), actionCollection(), "descending"); new TDEToggleAction(i18n("Show Hidden Files"), "Alt+.", - TQT_TQOBJECT(this), TQT_SLOT(showHiddenFiles()), + this, TQT_SLOT(showHiddenFiles()), actionCollection(), "show_hidden_files"); TDEToggleAction* splitAction = new TDEToggleAction(i18n("Split View"), "F10", - TQT_TQOBJECT(this), TQT_SLOT(toggleSplitView()), + this, TQT_SLOT(toggleSplitView()), actionCollection(), "split_view"); splitAction->setIcon("view_left_right"); TDEAction* reloadAction = new TDEAction(i18n("Reload"), "F5", - TQT_TQOBJECT(this), TQT_SLOT(reloadView()), + this, TQT_SLOT(reloadView()), actionCollection(), "reload"); reloadAction->setIcon("reload"); TDEAction* stopAction = new TDEAction(i18n("Stop"), 0, - TQT_TQOBJECT(this), TQT_SLOT(stopLoading()), + this, TQT_SLOT(stopLoading()), actionCollection(), "stop"); stopAction->setIcon("process-stop"); new TDEAction(i18n("Edit Location"), "Ctrl+L", - TQT_TQOBJECT(this), TQT_SLOT(editLocation()), + this, TQT_SLOT(editLocation()), actionCollection(), "edit_location"); new TDEAction(i18n("Browse"), "Ctrl+B", - TQT_TQOBJECT(this), TQT_SLOT(browse()), + this, TQT_SLOT(browse()), actionCollection(), "browse"); new TDEToggleAction(i18n("Left Sidebar"), "F8", - TQT_TQOBJECT(this), TQT_SLOT(toggleleftSidebar()), + this, TQT_SLOT(toggleleftSidebar()), actionCollection(), "leftsidebar"); new TDEToggleAction(i18n("Right Sidebar"), "F9", - TQT_TQOBJECT(this), TQT_SLOT(togglerightSidebar()), + this, TQT_SLOT(togglerightSidebar()), actionCollection(), "rightsidebar"); new TDEAction(i18n("Adjust View Properties..."), 0, - TQT_TQOBJECT(this), TQT_SLOT(adjustViewProperties()), + this, TQT_SLOT(adjustViewProperties()), actionCollection(), "view_properties"); // setup 'Go' menu - KStdAction::back(TQT_TQOBJECT(this), TQT_SLOT(goBack()), actionCollection()); - KStdAction::forward(TQT_TQOBJECT(this), TQT_SLOT(goForward()), actionCollection()); - KStdAction::up(TQT_TQOBJECT(this), TQT_SLOT(goUp()), actionCollection()); - KStdAction::home(TQT_TQOBJECT(this), TQT_SLOT(goHome()), actionCollection()); + 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()); // setup 'Tools' menu TDEAction* openTerminalAction = new TDEAction(i18n("Open Terminal"), "F4", - TQT_TQOBJECT(this), TQT_SLOT(openTerminal()), + this, TQT_SLOT(openTerminal()), actionCollection(), "open_terminal"); openTerminalAction->setIcon("konsole"); TDEAction* findFileAction = new TDEAction(i18n("Find File..."), "Ctrl+F", - TQT_TQOBJECT(this), TQT_SLOT(findFile()), + this, TQT_SLOT(findFile()), actionCollection(), "find_file"); findFileAction->setIcon("filefind"); new TDEToggleAction(i18n("Show Filter Bar"), "filter", "/", - TQT_TQOBJECT(this), TQT_SLOT(showFilterBar()), + this, TQT_SLOT(showFilterBar()), actionCollection(), "show_filter_bar"); TDEAction* compareFilesAction = new TDEAction(i18n("Compare Files"), 0, - TQT_TQOBJECT(this), TQT_SLOT(compareFiles()), + this, TQT_SLOT(compareFiles()), actionCollection(), "compare_files"); compareFilesAction->setIcon("kompare"); compareFilesAction->setEnabled(false); // setup 'Settings' menu - KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(editSettings()), actionCollection()); + KStdAction::preferences(this, TQT_SLOT(editSettings()), actionCollection()); } void Dolphin::setupCreateNewMenuActions() diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp index 680f420..7031e82 100644 --- a/src/dolphindetailsview.cpp +++ b/src/dolphindetailsview.cpp @@ -499,7 +499,7 @@ void DolphinDetailsView::slotActivationUpdate() TQObject* object = 0; while ((object = it.current()) != 0) { if (object->inherits("TQWidget")) { - TQWidget* widget = TQT_TQWIDGET(object); + TQWidget* widget = static_cast(object); widget->update(); } ++it; diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp index 8d6dc1a..6d0084e 100644 --- a/src/dolphiniconsview.cpp +++ b/src/dolphiniconsview.cpp @@ -457,7 +457,7 @@ void DolphinIconsView::slotActivationUpdate() TQObject* object = 0; while ((object = it.current()) != 0) { if (object->inherits("TQWidget")) { - TQWidget* widget = TQT_TQWIDGET(object); + TQWidget* widget = static_cast(object); widget->update(); } ++it; diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp index de76b40..52a957d 100644 --- a/src/dolphinview.cpp +++ b/src/dolphinview.cpp @@ -150,7 +150,7 @@ void DolphinView::setMode(Mode mode) } TQWidget* view = (m_iconsView != 0) ? static_cast(m_iconsView) : - static_cast(m_detailsView); + static_cast(m_detailsView); if (view != 0) { m_topLayout->remove(view); view->close(); diff --git a/src/statusbarspaceinfo.cpp b/src/statusbarspaceinfo.cpp index e80e975..97283d5 100644 --- a/src/statusbarspaceinfo.cpp +++ b/src/statusbarspaceinfo.cpp @@ -149,7 +149,7 @@ void StatusBarSpaceInfo::refresh() const TQString mountPoint(TDEIO::findPathMountPoint(m_url.path())); - KDiskFreeSp* job = new KDiskFreeSp(TQT_TQOBJECT(this)); + KDiskFreeSp* job = new KDiskFreeSp(this); connect(job, TQT_SIGNAL(foundMountPoint(const unsigned long&, const unsigned long&, const unsigned long&, diff --git a/src/urlnavigator.cpp b/src/urlnavigator.cpp index 225ab70..8a3e05a 100644 --- a/src/urlnavigator.cpp +++ b/src/urlnavigator.cpp @@ -442,7 +442,7 @@ void URLNavigator::updateContent() // Don't close and delete the navigator button immediatly, otherwise // the iterator won't work anymore and an object would get deleted more // than once (-> crash). - deleteList.append(TQT_TQWIDGET(object)); + deleteList.append(static_cast(object)); } ++it; }