diff options
Diffstat (limited to 'src')
58 files changed, 458 insertions, 366 deletions
diff --git a/src/bookmarkselector.cpp b/src/bookmarkselector.cpp index 8ea1505..2e1bf3d 100644 --- a/src/bookmarkselector.cpp +++ b/src/bookmarkselector.cpp @@ -38,18 +38,18 @@ BookmarkSelector::BookmarkSelector(URLNavigator* parent) : URLButton(parent), m_selectedIndex(0) { - setFocusPolicy(TQ_NoFocus); + setFocusPolicy(TQWidget::NoFocus); 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/bookmarkselector.h b/src/bookmarkselector.h index 74d1138..471b301 100644 --- a/src/bookmarkselector.h +++ b/src/bookmarkselector.h @@ -39,7 +39,7 @@ class KURL; */ class BookmarkSelector : public URLButton { - Q_OBJECT + TQ_OBJECT public: 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/bookmarkssettingspage.h b/src/bookmarkssettingspage.h index 1f1dcea..7185f2f 100644 --- a/src/bookmarkssettingspage.h +++ b/src/bookmarkssettingspage.h @@ -34,7 +34,7 @@ class TQListViewItem; */ class BookmarksSettingsPage : public SettingsPageBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/bookmarkssidebarpage.cpp b/src/bookmarkssidebarpage.cpp index 94a37eb..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(); } @@ -83,7 +83,7 @@ void BookmarksSidebarPage::updateBookmarks() void BookmarksSidebarPage::slotMouseButtonClicked(int button, TQListBoxItem* item) { - if ((button != Qt::LeftButton) || (item == 0)) { + if ((button != TQt::LeftButton) || (item == 0)) { return; } @@ -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) : @@ -255,14 +255,14 @@ void BookmarksListBox::paintEvent(TQPaintEvent* /* event */) void BookmarksListBox::contentsMousePressEvent(TQMouseEvent *event) { - if (event->button() == Qt::LeftButton) + if (event->button() == TQt::LeftButton) dragPos = event->pos(); TQListBox::contentsMousePressEvent(event); } void BookmarksListBox::contentsMouseMoveEvent(TQMouseEvent *event) { - if (event->state() & Qt::LeftButton) { + if (event->state() & TQt::LeftButton) { int distance = (event->pos() - dragPos).manhattanLength(); if (distance > TQApplication::startDragDistance()) startDrag(); diff --git a/src/bookmarkssidebarpage.h b/src/bookmarkssidebarpage.h index dd2c5a2..315ae3f 100644 --- a/src/bookmarkssidebarpage.h +++ b/src/bookmarkssidebarpage.h @@ -37,7 +37,7 @@ class BookmarksListBox; */ class BookmarksSidebarPage : public SidebarPage { - Q_OBJECT + TQ_OBJECT public: @@ -94,7 +94,7 @@ private: */ class BookmarksListBox : public TQListBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/detailsviewsettingspage.cpp b/src/detailsviewsettingspage.cpp index ae044e0..e571de8 100644 --- a/src/detailsviewsettingspage.cpp +++ b/src/detailsviewsettingspage.cpp @@ -57,7 +57,7 @@ DetailsViewSettingsPage::DetailsViewSettingsPage(TQWidget *parent) : assert(settings != 0); // create "Columns" properties - TQGroupBox* columnsGroup = new TQGroupBox(4, Qt::Vertical, i18n("Columns"), this); + TQGroupBox* columnsGroup = new TQGroupBox(4, TQt::Vertical, i18n("Columns"), this); columnsGroup->setSizePolicy(sizePolicy); columnsGroup->setMargin(margin); @@ -75,7 +75,7 @@ DetailsViewSettingsPage::DetailsViewSettingsPage(TQWidget *parent) : m_groupBox->setChecked(settings->isColumnEnabled(DolphinDetailsView::GroupColumn)); // Create "Icon" properties - TQButtonGroup* iconSizeGroup = new TQButtonGroup(3, Qt::Horizontal, i18n("Icon Size"), this); + TQButtonGroup* iconSizeGroup = new TQButtonGroup(3, TQt::Horizontal, i18n("Icon Size"), this); iconSizeGroup->setSizePolicy(sizePolicy); iconSizeGroup->setMargin(margin); m_smallIconSize = new TQRadioButton(i18n("Small"), iconSizeGroup); @@ -102,7 +102,7 @@ DetailsViewSettingsPage::DetailsViewSettingsPage(TQWidget *parent) : //m_iconSizeBox->insertItem(i18n("Large")); // create "Text" properties - TQGroupBox* textGroup = new TQGroupBox(2, Qt::Horizontal, i18n("Text"), this); + TQGroupBox* textGroup = new TQGroupBox(2, TQt::Horizontal, i18n("Text"), this); textGroup->setSizePolicy(sizePolicy); textGroup->setMargin(margin); diff --git a/src/detailsviewsettingspage.h b/src/detailsviewsettingspage.h index e3fbeb3..c525e43 100644 --- a/src/detailsviewsettingspage.h +++ b/src/detailsviewsettingspage.h @@ -36,7 +36,7 @@ class TQRadioButton; */ class DetailsViewSettingsPage : public TQVBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/dolphin.cpp b/src/dolphin.cpp index 747eb93..819f59d 100644 --- a/src/dolphin.cpp +++ b/src/dolphin.cpp @@ -432,11 +432,10 @@ void Dolphin::createFile() KSortableValueList<CreateFileEntry, TQString>::ConstIterator it = m_createFileTemplates.begin(); KSortableValueList<CreateFileEntry, TQString>::ConstIterator end = m_createFileTemplates.end(); - const TQString senderName(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name()); bool found = false; CreateFileEntry entry; while (!found && (it != end)) { - if ((*it).index() == senderName) { + if ((*it).index() == sender()->name()) { entry = (*it).value(); found = true; } @@ -554,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*))); } } @@ -1149,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(); @@ -1181,173 +1180,173 @@ void Dolphin::setupActions() { // setup 'File' menu TDEAction* createFolder = new TDEAction(i18n("Folder..."), "Ctrl+N", - TQT_TQOBJECT(this), TQT_SLOT(createFolder()), + this, TQ_SLOT(createFolder()), actionCollection(), "create_folder"); createFolder->setIcon("folder"); new TDEAction(i18n("Rename"), KKey(Key_F2), - TQT_TQOBJECT(this), TQT_SLOT(rename()), + this, TQ_SLOT(rename()), actionCollection(), "rename"); TDEAction* moveToTrashAction = new TDEAction(i18n("Move to Trash"), KKey(Key_Delete), - TQT_TQOBJECT(this), TQT_SLOT(moveToTrash()), + this, TQ_SLOT(moveToTrash()), actionCollection(), "move_to_trash"); moveToTrashAction->setIcon("edittrash"); TDEAction* deleteAction = new TDEAction(i18n("Delete"), "Shift+Delete", - TQT_TQOBJECT(this), TQT_SLOT(deleteItems()), + this, TQ_SLOT(deleteItems()), actionCollection(), "delete"); deleteAction->setIcon("edit-delete"); - new TDEAction(i18n("Propert&ies"), "Alt+Return", - TQT_TQOBJECT(this), TQT_SLOT(properties()), + new TDEAction(i18n("Propert&ies"), "edit", "Alt+Return", + this, TQ_SLOT(properties()), actionCollection(), "properties"); - KStdAction::quit(TQT_TQOBJECT(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)), - TQT_TQOBJECT(this), TQT_SLOT(slotUndoAvailable(bool))); - connect(&undoManager, TQT_SIGNAL(undoTextChanged(const TQString&)), - TQT_TQOBJECT(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)), - TQT_TQOBJECT(this), TQT_SLOT(slotRedoAvailable(bool))); - connect(&undoManager, TQT_SIGNAL(redoTextChanged(const TQString&)), - TQT_TQOBJECT(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(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, 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", - TQT_TQOBJECT(this), TQT_SLOT(selectAll()), + this, TQ_SLOT(selectAll()), actionCollection(), "select_all"); new TDEAction(i18n("Invert Selection"), "Ctrl+Shift+A", - TQT_TQOBJECT(this), TQT_SLOT(invertSelection()), + this, TQ_SLOT(invertSelection()), actionCollection(), "invert_selection"); // setup 'View' menu - KStdAction::zoomIn(TQT_TQOBJECT(this), - TQT_SLOT(zoomIn()), + KStdAction::zoomIn(this, + TQ_SLOT(zoomIn()), actionCollection()); - KStdAction::zoomOut(TQT_TQOBJECT(this), - TQT_SLOT(zoomOut()), + KStdAction::zoomOut(this, + TQ_SLOT(zoomOut()), actionCollection()); TDERadioAction* iconsView = new TDERadioAction(i18n("Icons"), "Ctrl+1", - TQT_TQOBJECT(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", - TQT_TQOBJECT(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", - TQT_TQOBJECT(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, - TQT_TQOBJECT(this), TQT_SLOT(sortByName()), + this, TQ_SLOT(sortByName()), actionCollection(), "by_name"); sortByName->setExclusiveGroup("sort"); TDERadioAction* sortBySize = new TDERadioAction(i18n("By Size"), 0, - TQT_TQOBJECT(this), TQT_SLOT(sortBySize()), + this, TQ_SLOT(sortBySize()), actionCollection(), "by_size"); sortBySize->setExclusiveGroup("sort"); TDERadioAction* sortByDate = new TDERadioAction(i18n("By Date"), 0, - TQT_TQOBJECT(this), TQT_SLOT(sortByDate()), + this, TQ_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, TQ_SLOT(toggleSortOrder()), actionCollection(), "descending"); new TDEToggleAction(i18n("Show Hidden Files"), "Alt+.", - TQT_TQOBJECT(this), TQT_SLOT(showHiddenFiles()), + this, TQ_SLOT(showHiddenFiles()), actionCollection(), "show_hidden_files"); TDEToggleAction* splitAction = new TDEToggleAction(i18n("Split View"), "F10", - TQT_TQOBJECT(this), TQT_SLOT(toggleSplitView()), + this, TQ_SLOT(toggleSplitView()), actionCollection(), "split_view"); splitAction->setIcon("view_left_right"); TDEAction* reloadAction = new TDEAction(i18n("Reload"), "F5", - TQT_TQOBJECT(this), TQT_SLOT(reloadView()), + this, TQ_SLOT(reloadView()), actionCollection(), "reload"); reloadAction->setIcon("reload"); TDEAction* stopAction = new TDEAction(i18n("Stop"), 0, - TQT_TQOBJECT(this), TQT_SLOT(stopLoading()), + this, TQ_SLOT(stopLoading()), actionCollection(), "stop"); stopAction->setIcon("process-stop"); new TDEAction(i18n("Edit Location"), "Ctrl+L", - TQT_TQOBJECT(this), TQT_SLOT(editLocation()), + this, TQ_SLOT(editLocation()), actionCollection(), "edit_location"); new TDEAction(i18n("Browse"), "Ctrl+B", - TQT_TQOBJECT(this), TQT_SLOT(browse()), + this, TQ_SLOT(browse()), actionCollection(), "browse"); new TDEToggleAction(i18n("Left Sidebar"), "F8", - TQT_TQOBJECT(this), TQT_SLOT(toggleleftSidebar()), + this, TQ_SLOT(toggleleftSidebar()), actionCollection(), "leftsidebar"); new TDEToggleAction(i18n("Right Sidebar"), "F9", - TQT_TQOBJECT(this), TQT_SLOT(togglerightSidebar()), + this, TQ_SLOT(togglerightSidebar()), actionCollection(), "rightsidebar"); new TDEAction(i18n("Adjust View Properties..."), 0, - TQT_TQOBJECT(this), TQT_SLOT(adjustViewProperties()), + this, TQ_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, 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", - TQT_TQOBJECT(this), TQT_SLOT(openTerminal()), + this, TQ_SLOT(openTerminal()), actionCollection(), "open_terminal"); openTerminalAction->setIcon("konsole"); TDEAction* findFileAction = new TDEAction(i18n("Find File..."), "Ctrl+F", - TQT_TQOBJECT(this), TQT_SLOT(findFile()), + this, TQ_SLOT(findFile()), actionCollection(), "find_file"); findFileAction->setIcon("filefind"); new TDEToggleAction(i18n("Show Filter Bar"), "filter", "/", - TQT_TQOBJECT(this), TQT_SLOT(showFilterBar()), + this, TQ_SLOT(showFilterBar()), actionCollection(), "show_filter_bar"); TDEAction* compareFilesAction = new TDEAction(i18n("Compare Files"), 0, - TQT_TQOBJECT(this), TQT_SLOT(compareFiles()), + this, TQ_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, TQ_SLOT(editSettings()), actionCollection()); } void Dolphin::setupCreateNewMenuActions() @@ -1415,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) { @@ -1600,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(); @@ -1624,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); @@ -1644,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/dolphin.h b/src/dolphin.h index 9cfbc5d..4dfb0ef 100644 --- a/src/dolphin.h +++ b/src/dolphin.h @@ -57,7 +57,7 @@ class rightSidebar; */ class Dolphin : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp index 09765da..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); @@ -378,7 +378,7 @@ void DolphinDetailsView::contentsMousePressEvent(TQMouseEvent* event) if ((item != 0) && isOnFilename(item, pos)) { KFileDetailView::contentsMousePressEvent(event); } - else if (event->button() == Qt::LeftButton) { + else if (event->button() == TQt::LeftButton) { const ButtonState keyboardState = TDEApplication::keyboardMouseState(); const bool isSelectionActive = (keyboardState & ShiftButton) || (keyboardState & ControlButton); @@ -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; @@ -465,7 +465,7 @@ void DolphinDetailsView::drawRubber() TQPoint point(m_rubber->x(), m_rubber->y()); point = contentsToViewport(point); - style().tqdrawPrimitive(TQStyle::PE_FocusRect, &p, + style().drawPrimitive(TQStyle::PE_FocusRect, &p, TQRect(point.x(), point.y(), m_rubber->width(), m_rubber->height()), colorGroup(), TQStyle::Style_Default, colorGroup().base()); p.end(); @@ -498,8 +498,8 @@ void DolphinDetailsView::slotActivationUpdate() TQObjectListIterator it(list); TQObject* object = 0; while ((object = it.current()) != 0) { - if (object->inherits(TQWIDGET_OBJECT_NAME_STRING)) { - TQWidget* widget = TQT_TQWIDGET(object); + if (object->inherits("TQWidget")) { + TQWidget* widget = static_cast<TQWidget*>(object); widget->update(); } ++it; @@ -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; @@ -716,7 +716,7 @@ void DolphinDetailsView::DolphinListViewItem::paintCell(TQPainter* painter, int alignment) { const TQListView* view = listView(); - const bool isActive = TQT_BASE_OBJECT(view->parent()) == TQT_BASE_OBJECT(Dolphin::mainWin().activeView()); + const bool isActive = (view->parent() == Dolphin::mainWin().activeView()); if (isSelected()) { // Per default the selection is drawn above the whole width of the item. As a consistent // behavior with the icon view is wanted, only the the column containing the file name diff --git a/src/dolphindetailsview.h b/src/dolphindetailsview.h index 3b7e783..e6462da 100644 --- a/src/dolphindetailsview.h +++ b/src/dolphindetailsview.h @@ -40,7 +40,7 @@ class DolphinView; */ class DolphinDetailsView : public KFileDetailView, public ItemEffectsManager { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/dolphindirlister.h b/src/dolphindirlister.h index 84e9cda..cb8a259 100644 --- a/src/dolphindirlister.h +++ b/src/dolphindirlister.h @@ -31,7 +31,7 @@ */ class DolphinDirLister : public KDirLister { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp index 6ad371a..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<const KFileIconViewItem*>(firstItem()); if (item != 0) { @@ -456,8 +456,8 @@ void DolphinIconsView::slotActivationUpdate() TQObjectListIterator it(list); TQObject* object = 0; while ((object = it.current()) != 0) { - if (object->inherits(TQWIDGET_OBJECT_NAME_STRING)) { - TQWidget* widget = TQT_TQWIDGET(object); + if (object->inherits("TQWidget")) { + TQWidget* widget = static_cast<TQWidget*>(object); widget->update(); } ++it; diff --git a/src/dolphiniconsview.h b/src/dolphiniconsview.h index 6d029dd..fedb26f 100644 --- a/src/dolphiniconsview.h +++ b/src/dolphiniconsview.h @@ -38,7 +38,7 @@ class DolphinView; */ class DolphinIconsView : public KFileIconView, public ItemEffectsManager { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/dolphinsettingsdialog.cpp b/src/dolphinsettingsdialog.cpp index 04f87a3..96b8548 100644 --- a/src/dolphinsettingsdialog.cpp +++ b/src/dolphinsettingsdialog.cpp @@ -27,7 +27,7 @@ #include "dolphin.h" DolphinSettingsDialog::DolphinSettingsDialog() : - KDialogBase(IconList, i18n("D3lphin Preferences"), + KDialogBase(IconList, i18n("Dolphin Preferences"), Ok|Apply|Cancel, Ok) { TDEIconLoader iconLoader; diff --git a/src/dolphinsettingsdialog.h b/src/dolphinsettingsdialog.h index a5c3a3d..dd9efd3 100644 --- a/src/dolphinsettingsdialog.h +++ b/src/dolphinsettingsdialog.h @@ -35,7 +35,7 @@ class BookmarksSettingsPage; * @author Peter Penz <peter.penz@gmx.at> */ class DolphinSettingsDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: 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/dolphinstatusbar.h b/src/dolphinstatusbar.h index 95531ad..e627703 100644 --- a/src/dolphinstatusbar.h +++ b/src/dolphinstatusbar.h @@ -39,7 +39,7 @@ class KURL; * @author Peter Penz */ class DolphinStatusBar : public TQHBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp index 5b0a310..88a966c 100644 --- a/src/dolphinview.cpp +++ b/src/dolphinview.cpp @@ -22,6 +22,7 @@ #include <tqlayout.h> #include <kurl.h> +#include <kstandarddirs.h> #include <tdelocale.h> #include <tdeio/netaccess.h> #include <tdeio/renamedlg.h> @@ -57,27 +58,27 @@ DolphinView::DolphinView(TQWidget *parent, m_fileCount(0), m_filterBar(0) { - setFocusPolicy(TQ_StrongFocus); + setFocusPolicy(TQWidget::StrongFocus); m_topLayout = new TQVBoxLayout(this); 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); @@ -85,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; @@ -110,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); } @@ -149,7 +150,7 @@ void DolphinView::setMode(Mode mode) } TQWidget* view = (m_iconsView != 0) ? static_cast<TQWidget*>(m_iconsView) : - static_cast<TQWidget*>(m_detailsView); + static_cast<TQWidget*>(m_detailsView); if (view != 0) { m_topLayout->remove(view); view->close(); @@ -651,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); } } @@ -667,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 { @@ -691,7 +692,39 @@ void DolphinView::updateURL() return; } - if (fileItem->isDir()) { + if (fileItem->isDir()) + { + TQString itemMimeType = fileItem->mimetype(); + if (itemMimeType.contains("encrypted_locked") || itemMimeType.contains("encrypted_unlocked")) + { + // Default action for media encrypted disks is either lock or unlock based on current status + TQString lockingAction = TQString::null; + if (itemMimeType.contains("encrypted_locked")) + { + lockingAction = "d3lphin/servicemenus/media_unlock.desktop"; + } + else if (itemMimeType.contains("encrypted_unlocked")) + { + lockingAction = "d3lphin/servicemenus/media_lock.desktop"; + } + if (!lockingAction.isEmpty()) + { + TQString lockingService = TDEGlobal::dirs()->findResource("data", lockingAction); + if (!lockingService.isEmpty()) + { + TQValueList<KDEDesktopMimeType::Service> serviceList = KDEDesktopMimeType::userDefinedServices(lockingService, fileItem->url().isLocalFile()); + if (serviceList.count() == 1) + { + KURL::List m_lstURLs; + m_lstURLs.append(fileItem->url()); + KDEDesktopMimeType::executeService(m_lstURLs, serviceList[0]); + Dolphin::mainWin().refreshViews(); + return; + } + } + } + } + // Prefer the local path over the URL. This assures that the // volume space information is correct. Assuming that the URL is media:/sda1, // and the local path is /windows/C: For the URL the space info is related @@ -798,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) { @@ -828,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) @@ -867,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(); @@ -885,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; @@ -900,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/dolphinview.h b/src/dolphinview.h index 1ac23d2..b8ceb65 100644 --- a/src/dolphinview.h +++ b/src/dolphinview.h @@ -64,7 +64,7 @@ class FilterBar; */ class DolphinView : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/editbookmarkdialog.cpp b/src/editbookmarkdialog.cpp index bbb0644..397deed 100644 --- a/src/editbookmarkdialog.cpp +++ b/src/editbookmarkdialog.cpp @@ -65,7 +65,7 @@ EditBookmarkDialog::EditBookmarkDialog(const TQString& title, { TQVBoxLayout* topLayout = new TQVBoxLayout(plainPage(), 0, spacingHint()); - TQGrid* grid = new TQGrid(2, Qt::Horizontal, plainPage()); + TQGrid* grid = new TQGrid(2, TQt::Horizontal, plainPage()); grid->setSpacing(spacingHint()); // create icon widgets @@ -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/editbookmarkdialog.h b/src/editbookmarkdialog.h index 9fd0f44..4c8e3bd 100644 --- a/src/editbookmarkdialog.h +++ b/src/editbookmarkdialog.h @@ -43,7 +43,7 @@ class TQPushButton; */ class EditBookmarkDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: 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/filterbar.h b/src/filterbar.h index a745e14..33337f6 100644 --- a/src/filterbar.h +++ b/src/filterbar.h @@ -33,7 +33,7 @@ class KPushButton; */ class FilterBar : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/generalsettingspage.cpp b/src/generalsettingspage.cpp index 1eb4395..69538ea 100644 --- a/src/generalsettingspage.cpp +++ b/src/generalsettingspage.cpp @@ -59,7 +59,7 @@ GeneralSettingsPage::GeneralSettingsPage(TQWidget* parent) : vBox->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Ignored); // create 'Home URL' editor - TQGroupBox* homeGroup = new TQGroupBox(1, Qt::Horizontal, i18n("Home URL"), vBox); + TQGroupBox* homeGroup = new TQGroupBox(1, TQt::Horizontal, i18n("Home URL"), vBox); homeGroup->setSizePolicy(sizePolicy); homeGroup->setMargin(margin); @@ -71,21 +71,21 @@ 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, Qt::Vertical, i18n("Default View Mode"), vBox); + TQButtonGroup* buttonGroup = new TQButtonGroup(3, TQt::Vertical, i18n("Default View Mode"), vBox); buttonGroup->setSizePolicy(sizePolicy); buttonGroup->setMargin(margin); diff --git a/src/generalsettingspage.h b/src/generalsettingspage.h index 2abb06f..85e2b6a 100644 --- a/src/generalsettingspage.h +++ b/src/generalsettingspage.h @@ -35,7 +35,7 @@ class TQCheckBox; */ class GeneralSettingsPage : public SettingsPageBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/iconsviewsettingspage.cpp b/src/iconsviewsettingspage.cpp index 41b2d6c..7f3871b 100644 --- a/src/iconsviewsettingspage.cpp +++ b/src/iconsviewsettingspage.cpp @@ -66,7 +66,7 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinIconsView::LayoutMode mode, sizesLayout->setSizePolicy(sizePolicy); // create 'Icon Size' group including slider and preview - TQGroupBox* iconSizeGroup = new TQGroupBox(2, Qt::Vertical, i18n("Icon Size"), sizesLayout); + TQGroupBox* iconSizeGroup = new TQGroupBox(2, TQt::Vertical, i18n("Icon Size"), sizesLayout); iconSizeGroup->setSizePolicy(sizePolicy); iconSizeGroup->setMargin(margin); @@ -75,11 +75,11 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinIconsView::LayoutMode mode, TQHBox* iconSizeVBox = new TQHBox(iconSizeGroup); iconSizeVBox->setSpacing(spacing); new TQLabel(i18n("Small"), iconSizeVBox); - m_iconSizeSlider = new TQSlider(0, 5, 1, 0, Qt::Horizontal, iconSizeVBox); + 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); @@ -90,18 +90,18 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinIconsView::LayoutMode mode, if (m_mode == DolphinIconsView::Previews) { // create 'Preview Size' group including slider and preview - TQGroupBox* previewSizeGroup = new TQGroupBox(2, Qt::Vertical, i18n("Preview Size"), sizesLayout); + TQGroupBox* previewSizeGroup = new TQGroupBox(2, TQt::Vertical, i18n("Preview Size"), sizesLayout); previewSizeGroup->setSizePolicy(sizePolicy); previewSizeGroup->setMargin(margin); TQHBox* previewSizeVBox = new TQHBox(previewSizeGroup); previewSizeVBox->setSpacing(spacing); new TQLabel(i18n("Small"), previewSizeVBox); - m_previewSizeSlider = new TQSlider(0, 5, 1, 0, Qt::Horizontal, previewSizeVBox); + 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); @@ -112,7 +112,7 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinIconsView::LayoutMode mode, slotPreviewSizeChanged(m_previewSizeSlider->value()); } - TQGroupBox* textGroup = new TQGroupBox(2, Qt::Horizontal, i18n("Text"), this); + TQGroupBox* textGroup = new TQGroupBox(2, TQt::Horizontal, i18n("Text"), this); textGroup->setSizePolicy(sizePolicy); textGroup->setMargin(margin); @@ -134,7 +134,7 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinIconsView::LayoutMode mode, m_textWidthBox->insertItem(i18n("Medium")); m_textWidthBox->insertItem(i18n("Large")); - TQGroupBox* gridGroup = new TQGroupBox(2, Qt::Horizontal, i18n("Grid"), this); + TQGroupBox* gridGroup = new TQGroupBox(2, TQt::Horizontal, i18n("Grid"), this); gridGroup->setSizePolicy(sizePolicy); gridGroup->setMargin(margin); diff --git a/src/iconsviewsettingspage.h b/src/iconsviewsettingspage.h index 20d16a3..d70f76b 100644 --- a/src/iconsviewsettingspage.h +++ b/src/iconsviewsettingspage.h @@ -51,7 +51,7 @@ class PixmapViewer; */ class IconsViewSettingsPage : public TQVBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/infosidebarpage.cpp b/src/infosidebarpage.cpp index 24cf65d..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(); } @@ -160,7 +160,7 @@ void InfoSidebarPage::showItemInfo() TDEIcon::NoGroup, TDEIcon::SizeEnormous); m_preview->setPixmap(icon); - m_name->setText(i18n("%n items selected", "%n items selected", selectedItems->count())); + m_name->setText(i18n("%n item selected", "%n items selected", selectedItems->count())); } else if (!applyBookmark()) { // try to get a preview pixmap from the item... @@ -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("<b>"); 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(); } @@ -536,9 +536,9 @@ ServiceButton::ServiceButton(const TQIconSet& icon, m_index(index) { setEraseColor(colorGroup().background()); - setFocusPolicy(TQ_NoFocus); - connect(this, TQT_SIGNAL(released()), - this, TQT_SLOT(slotReleased())); + setFocusPolicy(TQWidget::NoFocus); + connect(this, TQ_SIGNAL(released()), + this, TQ_SLOT(slotReleased())); } ServiceButton::~ServiceButton() diff --git a/src/infosidebarpage.h b/src/infosidebarpage.h index 126a981..2f85fe7 100644 --- a/src/infosidebarpage.h +++ b/src/infosidebarpage.h @@ -50,7 +50,7 @@ class PixmapViewer; */ class InfoSidebarPage : public SidebarPage { - Q_OBJECT + TQ_OBJECT public: @@ -167,7 +167,7 @@ private: // -> provide helper class or common base class class ServiceButton : public TQPushButton { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/main.cpp b/src/main.cpp index e05261f..84713c8 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -48,7 +48,7 @@ int main(int argc, char **argv) about.addAuthor("Orville Bennett", I18N_NOOP("Documentation"), "obennett@hartford.edu"); about.addCredit("Peter Penz", I18N_NOOP("... for the great original Dolphin")); about.addCredit("Cvetoslav Ludmiloff, Stefan Monov", I18N_NOOP("... for their development on the original Dolphin")); - about.addCredit("Aaron J. Seigo", I18N_NOOP("... for the great support and the amazing patches for the orignal Dolphin")); + about.addCredit("Aaron J. Seigo", I18N_NOOP("... for the great support and the amazing patches for the original Dolphin")); about.addCredit("Patrice Tremblay, Gregor Kalisnik, Filip Brcic, Igor Stepin and Jan Mette", I18N_NOOP("... for their patches")); about.addCredit("Ain, Itai, Ivan, Jannick, Stephane, Patrice, Piotr, Stefano and Power On", I18N_NOOP("... for their translations")); diff --git a/src/pixmapviewer.h b/src/pixmapviewer.h index 8b2bdee..5e918cb 100644 --- a/src/pixmapviewer.h +++ b/src/pixmapviewer.h @@ -32,7 +32,7 @@ */ class PixmapViewer : public TQWidget { - Q_OBJECT + TQ_OBJECT public: PixmapViewer(TQWidget* parent); diff --git a/src/renamedialog.cpp b/src/renamedialog.cpp index d9565fb..092f503 100644 --- a/src/renamedialog.cpp +++ b/src/renamedialog.cpp @@ -36,7 +36,7 @@ RenameDialog::RenameDialog(const KURL::List& items) : topLayout->setMargin(KDialog::marginHint()); const int itemCount = items.count(); - TQLabel* editLabel = new TQLabel(i18n("Rename the %n selected items to:", "Rename the %n selected items to:", itemCount), + TQLabel* editLabel = new TQLabel(i18n("Rename the %n selected item to:", "Rename the %n selected items to:", itemCount), plainPage()); m_lineEdit = new KLineEdit(plainPage()); diff --git a/src/renamedialog.h b/src/renamedialog.h index f1a8ddf..ee0259f 100644 --- a/src/renamedialog.h +++ b/src/renamedialog.h @@ -42,7 +42,7 @@ class KLineEdit; */ class RenameDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/servicemenus/imageconverter.desktop b/src/servicemenus/imageconverter.desktop index c7b464c..dceb183 100644 --- a/src/servicemenus/imageconverter.desktop +++ b/src/servicemenus/imageconverter.desktop @@ -11,20 +11,19 @@ TryExec=convert [Desktop Action convToJPEG] Name=JPEG Icon=image-x-generic -Exec=convert %f "`echo %f | perl -pe 's/\.[^.]+$//'`.jpg" +Exec=convert %f -set filename:base "%d/%t" '%[filename:base].jpg' [Desktop Action convToPNG] Name=PNG Icon=image-x-generic -Exec=convert %f "`echo %f | perl -pe 's/\.[^.]+$//'`.png" +Exec=convert %f -set filename:base "%d/%t" '%[filename:base].png' [Desktop Action convToTIF] Name=TIF Icon=image-x-generic -Exec=convert %f "`echo %f | perl -pe 's/\.[^.]+$//'`.tif" +Exec=convert %f -set filename:base "%d/%t" '%[filename:base].tif' [Desktop Action convToGIF] Name=GIF Icon=image-x-generic -Exec=convert %f "`echo %f | perl -pe 's/\.[^.]+$//'`.gif" - +Exec=convert %f -set filename:base "%d/%t" '%[filename:base].gif' diff --git a/src/servicemenus/kdesktopSetAsBackground.desktop b/src/servicemenus/kdesktopSetAsBackground.desktop index a7ba4f1..f422c07 100644 --- a/src/servicemenus/kdesktopSetAsBackground.desktop +++ b/src/servicemenus/kdesktopSetAsBackground.desktop @@ -1,14 +1,44 @@ [Desktop Entry] X-TDE-ServiceTypes=image/* -Actions=setAsBackground;tileAsBackground; +Actions=centeredAsBackground;tiledAsBackground;centeredTiledAsBackground;centeredMaxpectAsBackground;tiledMaxpectAsBackground;scaledAsBackground;centeredAutoFitAsBackground;scaleAndCropAsBackground X-TDE-Submenu=Set as Background -[Desktop Action setAsBackground] -Name=Centered +[Desktop Action centeredAsBackground] +Name=&Centered Icon=background -Exec=dcop kdesktop KBackgroundIface setWallpaper %u 6 +Exec=dcop kdesktop KBackgroundIface setWallpaper %u 1 -[Desktop Action tileAsBackground] -Name=Tiled +[Desktop Action tiledAsBackground] +Name=&Tiled Icon=background Exec=dcop kdesktop KBackgroundIface setWallpaper %u 2 + +[Desktop Action centeredTiledAsBackground] +Name=C&enter Tiled +Icon=background +Exec=dcop kdesktop KBackgroundIface setWallpaper %u 3 + +[Desktop Action centeredMaxpectAsBackground] +Name=Ce&ntered Maxpect +Icon=background +Exec=dcop kdesktop KBackgroundIface setWallpaper %u 4 + +[Desktop Action tiledMaxpectAsBackground] +Name=Tiled &Maxpect +Icon=background +Exec=dcop kdesktop KBackgroundIface setWallpaper %u 5 + +[Desktop Action scaledAsBackground] +Name=&Scaled +Icon=background +Exec=dcop kdesktop KBackgroundIface setWallpaper %u 6 + +[Desktop Action centeredAutoFitAsBackground] +Name=Centered &Auto Fit +Icon=background +Exec=dcop kdesktop KBackgroundIface setWallpaper %u 7 + +[Desktop Action scaleAndCropAsBackground] +Name=Sca&le && Crop +Icon=background +Exec=dcop kdesktop KBackgroundIface setWallpaper %u 8 diff --git a/src/servicemenus/media_unlock.desktop b/src/servicemenus/media_unlock.desktop index 85b2519..d7cf15b 100644 --- a/src/servicemenus/media_unlock.desktop +++ b/src/servicemenus/media_unlock.desktop @@ -1,6 +1,5 @@ [Desktop Entry] X-TDE-ServiceTypes=media/bluray_encrypted_locked,media/cdrom_encrypted_locked,media/cd-r_encrypted_locked,media/cd-rw_encrypted_locked,media/dvd_encrypted_locked,media/hdd_encrypted_locked,media/removable_encrypted_locked -Actions=MediaLock; Actions=MediaUnlock; X-TDE-Priority=TopLevel X-TDE-MediaNotifierHide=true diff --git a/src/settingspagebase.h b/src/settingspagebase.h index 4349886..5677eb3 100644 --- a/src/settingspagebase.h +++ b/src/settingspagebase.h @@ -30,7 +30,7 @@ */ class SettingsPageBase : public TQWidget { - Q_OBJECT + TQ_OBJECT public: 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/sidebarpage.h b/src/sidebarpage.h index 843b33e..3d2d2c4 100644 --- a/src/sidebarpage.h +++ b/src/sidebarpage.h @@ -32,7 +32,7 @@ class Sidebar; */ class SidebarPage : public TQWidget { - Q_OBJECT + TQ_OBJECT public: 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/sidebars.h b/src/sidebars.h index dd03c75..568f106 100644 --- a/src/sidebars.h +++ b/src/sidebars.h @@ -33,7 +33,7 @@ class SidebarPage; class leftSidebar : public TQWidget { - Q_OBJECT + TQ_OBJECT public: @@ -62,7 +62,7 @@ class leftSidebar : public TQWidget class rightSidebar : public TQWidget { - Q_OBJECT + TQ_OBJECT public: 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/statusbarmessagelabel.h b/src/statusbarmessagelabel.h index 198e78d..453bca8 100644 --- a/src/statusbarmessagelabel.h +++ b/src/statusbarmessagelabel.h @@ -39,7 +39,7 @@ class TQTimer; */ class StatusBarMessageLabel : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/statusbarspaceinfo.cpp b/src/statusbarspaceinfo.cpp index e80e975..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())); } } @@ -149,17 +149,17 @@ void StatusBarSpaceInfo::refresh() const TQString mountPoint(TDEIO::findPathMountPoint(m_url.path())); - KDiskFreeSp* job = new KDiskFreeSp(TQT_TQOBJECT(this)); - connect(job, TQT_SIGNAL(foundMountPoint(const unsigned long&, + KDiskFreeSp* job = new KDiskFreeSp(this); + 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/statusbarspaceinfo.h b/src/statusbarspaceinfo.h index 6c3f99f..0d06a0e 100644 --- a/src/statusbarspaceinfo.h +++ b/src/statusbarspaceinfo.h @@ -33,7 +33,7 @@ class KDiskFreeSp; */ class StatusBarSpaceInfo : public TQWidget { - Q_OBJECT + TQ_OBJECT public: 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/undomanager.h b/src/undomanager.h index b96d193..ef981f6 100644 --- a/src/undomanager.h +++ b/src/undomanager.h @@ -82,7 +82,7 @@ private: */ class UndoManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/urlbutton.cpp b/src/urlbutton.cpp index 463420b..977c4d1 100644 --- a/src/urlbutton.cpp +++ b/src/urlbutton.cpp @@ -37,13 +37,13 @@ URLButton::URLButton(URLNavigator* parent) m_displayHint(0), m_urlNavigator(parent) { - setFocusPolicy(TQ_NoFocus); + setFocusPolicy(TQWidget::NoFocus); 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/urlbutton.h b/src/urlbutton.h index 4b56f96..614e787 100644 --- a/src/urlbutton.h +++ b/src/urlbutton.h @@ -37,7 +37,7 @@ class TQPainter; */ class URLButton : public TQPushButton { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/urlnavigator.cpp b/src/urlnavigator.cpp index 47eab75..96edc9d 100644 --- a/src/urlnavigator.cpp +++ b/src/urlnavigator.cpp @@ -22,6 +22,7 @@ #include "urlnavigator.h" #include <assert.h> +#include <dcopref.h> #include <kurl.h> #include <tqobjectlist.h> #include <tqcombobox.h> @@ -39,6 +40,7 @@ #include <kurlcombobox.h> #include <kurlcompletion.h> #include <kbookmarkmanager.h> +#include <kstandarddirs.h> #include "dolphin.h" #include "dolphinsettings.h" @@ -81,17 +83,17 @@ URLNavigator::URLNavigator(const KURL& url, m_toggleButton = new TQPushButton(SmallIcon("editurl"), 0, this); m_toggleButton->setFlat(true); m_toggleButton->setToggleButton(true); - m_toggleButton->setFocusPolicy(TQ_NoFocus); + 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); @@ -99,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(); } @@ -117,7 +119,8 @@ void URLNavigator::setURL(const KURL& url) { TQString urlStr(url.prettyURL()); - if (url.protocol() == "zip") { + if (url.protocol() == "zip") + { bool stillInside = false; if( KMimeType::findByPath( url.url(-1) )->is("application/x-zip") || KMimeType::findByPath( url.url(-1) )->is("application/x-jar") ) { @@ -180,6 +183,35 @@ void URLNavigator::setURL(const KURL& url) urlStr = url.path(); } } + else if (urlStr.startsWith("system:/media") || urlStr.startsWith("media:/")) + { + DCOPRef mediamanager("kded", "mediamanager"); + DCOPReply reply = mediamanager.call("mimeType", urlStr ); + if (reply.isValid()) + { + TQString itemMimeType = reply; + if (itemMimeType.contains("encrypted")) + { + if (itemMimeType.contains("encrypted_locked")) + { + TQString lockingService = TDEGlobal::dirs()->findResource("data", "d3lphin/servicemenus/media_unlock.desktop"); + if (!lockingService.isEmpty()) + { + TQValueList<KDEDesktopMimeType::Service> serviceList = KDEDesktopMimeType::userDefinedServices(lockingService, url.isLocalFile()); + if (serviceList.count() == 1) + { + KURL::List m_lstURLs; + m_lstURLs.append(url); + KDEDesktopMimeType::executeService(m_lstURLs, serviceList[0]); + } + } + } + setURL(KURL("system:/media")); + return; + } + } + + } if (urlStr.at(0) == '~') { @@ -410,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<TQWidget*>(object)); } ++it; } diff --git a/src/urlnavigator.h b/src/urlnavigator.h index 8adaa02..7779047 100644 --- a/src/urlnavigator.h +++ b/src/urlnavigator.h @@ -54,7 +54,7 @@ class KFileItem; */ class URLNavigator : public TQHBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/urlnavigatorbutton.cpp b/src/urlnavigatorbutton.cpp index 2066143..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) @@ -368,14 +368,14 @@ bool URLNavigatorButton::isTextClipped() const void URLNavigatorButton::mousePressEvent(TQMouseEvent * event) { - if (event->button() == Qt::LeftButton) + if (event->button() == TQt::LeftButton) dragPos = event->pos(); URLButton::mousePressEvent(event); } void URLNavigatorButton::mouseMoveEvent(TQMouseEvent * event) { - if (event->state() & Qt::LeftButton) { + if (event->state() & TQt::LeftButton) { int distance = (event->pos() - dragPos).manhattanLength(); if (distance > TQApplication::startDragDistance()*2)//don't start on small move (for submenu usability) startDrag(); diff --git a/src/urlnavigatorbutton.h b/src/urlnavigatorbutton.h index 98ed26d..bb04c91 100644 --- a/src/urlnavigatorbutton.h +++ b/src/urlnavigatorbutton.h @@ -45,7 +45,7 @@ namespace TDEIO */ class URLNavigatorButton : public URLButton { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/viewpropertiesdialog.cpp b/src/viewpropertiesdialog.cpp index a6ab133..5f87a62 100644 --- a/src/viewpropertiesdialog.cpp +++ b/src/viewpropertiesdialog.cpp @@ -55,7 +55,7 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : TQVBoxLayout* topLayout = new TQVBoxLayout(plainPage(), 0, spacingHint()); // create 'Properties' group containing view mode, sorting, sort order and show hidden files - TQGroupBox* propsGroup = new TQGroupBox(2, Qt::Horizontal, i18n("Properties"), plainPage()); + TQGroupBox* propsGroup = new TQGroupBox(2, TQt::Horizontal, i18n("Properties"), plainPage()); propsGroup->setSizePolicy(sizePolicy); propsGroup->setMargin(margin); @@ -93,7 +93,7 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : // create 'Apply view properties to:' group TQButtonGroup* buttonGroup = new TQButtonGroup(3, - Qt::Vertical, + TQt::Vertical, i18n("Apply view properties to:"), plainPage()); buttonGroup->setSizePolicy(sizePolicy); @@ -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() diff --git a/src/viewpropertiesdialog.h b/src/viewpropertiesdialog.h index 2332cd2..f4c5461 100644 --- a/src/viewpropertiesdialog.h +++ b/src/viewpropertiesdialog.h @@ -40,7 +40,7 @@ class DolphinView; */ class ViewPropertiesDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/viewsettingspage.h b/src/viewsettingspage.h index b7eee23..889a015 100644 --- a/src/viewsettingspage.h +++ b/src/viewsettingspage.h @@ -36,7 +36,7 @@ class DetailsViewSettingsPage; */ class ViewSettingsPage : public SettingsPageBase { - Q_OBJECT + TQ_OBJECT public: |