From 59d9dbf810de71334e1173fa7dda59209c10032c Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:29:36 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- src/bookmarkselector.cpp | 4 ++-- src/bookmarkssettingspage.cpp | 16 ++++++++-------- src/bookmarkssidebarpage.cpp | 8 ++++---- src/detailsviewsettingspage.cpp | 8 ++++---- src/dolphin.cpp | 30 +++++++++++++++--------------- src/dolphindetailsview.cpp | 36 ++++++++++++++++++------------------ src/dolphindetailsview.h | 6 +++--- src/dolphiniconsview.cpp | 8 ++++---- src/dolphiniconsview.h | 2 +- src/dolphiniconsviewsettings.h | 2 +- src/dolphinstatusbar.cpp | 4 ++-- src/dolphinview.cpp | 12 ++++++------ src/editbookmarkdialog.cpp | 8 ++++---- src/filterbar.cpp | 16 ++++++++-------- src/generalsettingspage.cpp | 16 ++++++++-------- src/iconsviewsettingspage.cpp | 12 ++++++------ src/infosidebarpage.cpp | 40 ++++++++++++++++++++-------------------- src/infosidebarpage.h | 4 ++-- src/itemeffectsmanager.cpp | 6 +++--- src/progressindicator.cpp | 2 +- src/renamedialog.cpp | 2 +- src/sidebars.cpp | 30 +++++++++++++++--------------- src/sidebars.h | 8 ++++---- src/statusbarmessagelabel.cpp | 2 +- src/statusbarspaceinfo.cpp | 4 ++-- src/undomanager.cpp | 10 +++++----- src/urlbutton.cpp | 2 +- src/urlnavigator.cpp | 4 ++-- src/urlnavigatorbutton.cpp | 6 +++--- src/viewproperties.cpp | 2 +- src/viewpropertiesdialog.cpp | 6 +++--- src/viewsettingspage.cpp | 2 +- 32 files changed, 159 insertions(+), 159 deletions(-) diff --git a/src/bookmarkselector.cpp b/src/bookmarkselector.cpp index 1e996a1..7272aac 100644 --- a/src/bookmarkselector.cpp +++ b/src/bookmarkselector.cpp @@ -132,7 +132,7 @@ void BookmarkSelector::drawButton(TQPainter* painter) foregroundColor = KGlobalSettings::highlightedTextColor(); } else { - backgroundColor = tqcolorGroup().background(); + backgroundColor = colorGroup().background(); foregroundColor = KGlobalSettings::buttonTextColor(); } @@ -142,7 +142,7 @@ void BookmarkSelector::drawButton(TQPainter* painter) const bool isActive = (dolphin.activeView() == parentView); if (!isActive) { - TQColor dimmColor(tqcolorGroup().background()); + TQColor dimmColor(colorGroup().background()); foregroundColor = mixColors(foregroundColor, dimmColor); if (isHighlighted) { backgroundColor = mixColors(backgroundColor, dimmColor); diff --git a/src/bookmarkssettingspage.cpp b/src/bookmarkssettingspage.cpp index adcb467..57e4721 100644 --- a/src/bookmarkssettingspage.cpp +++ b/src/bookmarkssettingspage.cpp @@ -22,7 +22,7 @@ #include -#include +#include #include #include #include @@ -49,9 +49,9 @@ BookmarksSettingsPage::BookmarksSettingsPage(TQWidget*parent) : const int spacing = KDialog::spacingHint(); TQHBox* hBox = new TQHBox(parent); - hBox->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); + hBox->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); hBox->setSpacing(spacing); - hBox->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Ignored); + hBox->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Ignored); m_listView = new KListView(hBox); m_listView->addColumn(i18n("Icon")); @@ -76,27 +76,27 @@ BookmarksSettingsPage::BookmarksSettingsPage(TQWidget*parent) : m_addButton = new KPushButton(i18n("Add..."), buttonBox); connect(m_addButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAddButtonClicked())); - m_addButton->tqsetSizePolicy(buttonSizePolicy); + m_addButton->setSizePolicy(buttonSizePolicy); m_editButton = new KPushButton(i18n("Edit..."), buttonBox); connect(m_editButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditButtonClicked())); - m_editButton->tqsetSizePolicy(buttonSizePolicy); + m_editButton->setSizePolicy(buttonSizePolicy); m_removeButton = new KPushButton(i18n("Remove"), buttonBox); connect(m_removeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRemoveButtonClicked())); - m_removeButton->tqsetSizePolicy(buttonSizePolicy); + m_removeButton->setSizePolicy(buttonSizePolicy); m_moveUpButton = new KPushButton(i18n("Move Up"), buttonBox); connect(m_moveUpButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotMoveUpButtonClicked())); - m_moveUpButton->tqsetSizePolicy(buttonSizePolicy); + m_moveUpButton->setSizePolicy(buttonSizePolicy); m_moveDownButton = new KPushButton(i18n("Move Down"), buttonBox); connect(m_moveDownButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotMoveDownButtonClicked())); - m_moveDownButton->tqsetSizePolicy(buttonSizePolicy); + m_moveDownButton->setSizePolicy(buttonSizePolicy); // Add a dummy widget with no restriction regarding a vertical resizing. // This assures that the spacing between the buttons is not increased. diff --git a/src/bookmarkssidebarpage.cpp b/src/bookmarkssidebarpage.cpp index af39d7e..bb6576a 100644 --- a/src/bookmarkssidebarpage.cpp +++ b/src/bookmarkssidebarpage.cpp @@ -20,7 +20,7 @@ #include "bookmarkssidebarpage.h" #include -#include +#include #include #include #include @@ -38,11 +38,11 @@ BookmarksSidebarPage::BookmarksSidebarPage(TQWidget* parent) : SidebarPage(parent) { - TQVBoxLayout* tqlayout = new TQVBoxLayout(this); + TQVBoxLayout* layout = new TQVBoxLayout(this); m_bookmarksList = new BookmarksListBox(this); - m_bookmarksList->setPaletteBackgroundColor(tqcolorGroup().background()); + m_bookmarksList->setPaletteBackgroundColor(colorGroup().background()); - tqlayout->addWidget(m_bookmarksList); + 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&)), diff --git a/src/detailsviewsettingspage.cpp b/src/detailsviewsettingspage.cpp index 6aa4855..f5e2bd7 100644 --- a/src/detailsviewsettingspage.cpp +++ b/src/detailsviewsettingspage.cpp @@ -58,7 +58,7 @@ DetailsViewSettingsPage::DetailsViewSettingsPage(TQWidget *parent) : // create "Columns" properties TQGroupBox* columnsGroup = new TQGroupBox(4, Qt::Vertical, i18n("Columns"), this); - columnsGroup->tqsetSizePolicy(sizePolicy); + columnsGroup->setSizePolicy(sizePolicy); columnsGroup->setMargin(margin); TQHBox* visibleColumnsLayout = new TQHBox(columnsGroup); @@ -76,7 +76,7 @@ DetailsViewSettingsPage::DetailsViewSettingsPage(TQWidget *parent) : // Create "Icon" properties TQButtonGroup* iconSizeGroup = new TQButtonGroup(3, Qt::Horizontal, i18n("Icon Size"), this); - iconSizeGroup->tqsetSizePolicy(sizePolicy); + iconSizeGroup->setSizePolicy(sizePolicy); iconSizeGroup->setMargin(margin); m_smallIconSize = new TQRadioButton(i18n("Small"), iconSizeGroup); m_mediumIconSize = new TQRadioButton(i18n("Medium"), iconSizeGroup); @@ -103,7 +103,7 @@ DetailsViewSettingsPage::DetailsViewSettingsPage(TQWidget *parent) : // create "Text" properties TQGroupBox* textGroup = new TQGroupBox(2, Qt::Horizontal, i18n("Text"), this); - textGroup->tqsetSizePolicy(sizePolicy); + textGroup->setSizePolicy(sizePolicy); textGroup->setMargin(margin); new TQLabel(i18n("Font family:"), textGroup); @@ -115,7 +115,7 @@ DetailsViewSettingsPage::DetailsViewSettingsPage(TQWidget *parent) : m_fontSizeBox->setValue(settings->fontSize()); // Add a dummy widget with no restriction regarding - // a vertical resizing. This assures that the dialog tqlayout + // a vertical resizing. This assures that the dialog layout // is not stretched vertically. new TQWidget(this); } diff --git a/src/dolphin.cpp b/src/dolphin.cpp index 2006089..cdeb847 100644 --- a/src/dolphin.cpp +++ b/src/dolphin.cpp @@ -52,7 +52,7 @@ #include #include -#include +#include #include #include "urlnavigator.h" @@ -395,7 +395,7 @@ void Dolphin::createFolder() // TODO: provide message type hint if (ok) { - statusBar->setMessage(i18n("Created folder %1.").tqarg(url.path()), + statusBar->setMessage(i18n("Created folder %1.").arg(url.path()), DolphinStatusBar::OperationCompleted); DolphinCommand command(DolphinCommand::CreateFolder, KURL::List(), url); @@ -405,11 +405,11 @@ void Dolphin::createFolder() // Creating of the folder has been failed. Check whether the creating // has been failed because a folder with the same name exists... if (KIO::NetAccess::exists(url, true, this)) { - statusBar->setMessage(i18n("A folder named %1 already exists.").tqarg(url.path()), + statusBar->setMessage(i18n("A folder named %1 already exists.").arg(url.path()), DolphinStatusBar::Error); } else { - statusBar->setMessage(i18n("Creating of folder %1 failed.").tqarg(url.path()), + statusBar->setMessage(i18n("Creating of folder %1 failed.").arg(url.path()), DolphinStatusBar::Error); } @@ -490,7 +490,7 @@ void Dolphin::createFile() const TQString destPath(viewURL.prettyURL() + "/" + KIO::encodeFileName(name)); const KURL destURL(destPath); if (KIO::NetAccess::exists(destURL, false, this)) { - statusBar->setMessage(i18n("A file named %1 already exists.").tqarg(name), + statusBar->setMessage(i18n("A file named %1 already exists.").arg(name), DolphinStatusBar::Error); return; } @@ -500,7 +500,7 @@ void Dolphin::createFile() KIO::CopyJob* job = KIO::copyAs(sourceURL, destURL); job->setDefaultPermissions(true); if (KIO::NetAccess::synchronousRun(job, this)) { - statusBar->setMessage(i18n("Created file %1.").tqarg(name), + statusBar->setMessage(i18n("Created file %1.").arg(name), DolphinStatusBar::OperationCompleted); KURL::List list; @@ -510,7 +510,7 @@ void Dolphin::createFile() } else { - statusBar->setMessage(i18n("Creating of file %1 failed.").tqarg(name), + statusBar->setMessage(i18n("Creating of file %1 failed.").arg(name), DolphinStatusBar::Error); } } @@ -539,11 +539,11 @@ void Dolphin::deleteItems() TQString text; if (itemCount > 1) { - text = i18n("Do you really want to delete the %1 selected items?").tqarg(itemCount); + text = i18n("Do you really want to delete the %1 selected items?").arg(itemCount); } else { const KURL& url = list.first(); - text = i18n("Do you really want to delete '%1'?").tqarg(url.fileName()); + text = i18n("Do you really want to delete '%1'?").arg(url.fileName()); } const bool del = KMessageBox::warningContinueCancel(this, @@ -642,7 +642,7 @@ void Dolphin::cut() m_clipboardContainsCutData = true; TQDragObject* data = new KURLDrag(m_activeView->selectedURLs(), widget()); - TQApplication::tqclipboard()->setData(data); + TQApplication::clipboard()->setData(data); } void Dolphin::copy() @@ -650,12 +650,12 @@ void Dolphin::copy() m_clipboardContainsCutData = false; TQDragObject* data = new KURLDrag(m_activeView->selectedURLs(), widget()); - TQApplication::tqclipboard()->setData(data); + TQApplication::clipboard()->setData(data); } void Dolphin::paste() { - TQClipboard* clipboard = TQApplication::tqclipboard(); + TQClipboard* clipboard = TQApplication::clipboard(); TQMimeSource* data = clipboard->data(); if (!KURLDrag::canDecode(data)) { return; @@ -703,7 +703,7 @@ void Dolphin::updatePasteAction() } TQString text(i18n("Paste")); - TQClipboard* clipboard = TQApplication::tqclipboard(); + TQClipboard* clipboard = TQApplication::clipboard(); TQMimeSource* data = clipboard->data(); if (KURLDrag::canDecode(data)) { pasteAction->setEnabled(true); @@ -715,7 +715,7 @@ void Dolphin::updatePasteAction() pasteAction->setText(i18n("Paste 1 File")); } else { - pasteAction->setText(i18n("Paste %1 Files").tqarg(count)); + pasteAction->setText(i18n("Paste %1 Files").arg(count)); } } else { @@ -1144,7 +1144,7 @@ void Dolphin::init() stateChanged("new_file"); setAutoSaveSettings(); - TQClipboard* clipboard = TQApplication::tqclipboard(); + TQClipboard* clipboard = TQApplication::clipboard(); connect(clipboard, TQT_SIGNAL(dataChanged()), this, TQT_SLOT(updatePasteAction())); updatePasteAction(); diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp index 03282fb..8fd25e6 100644 --- a/src/dolphindetailsview.cpp +++ b/src/dolphindetailsview.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include @@ -78,7 +78,7 @@ DolphinDetailsView::DolphinDetailsView(DolphinView* parent) : connect(this, TQT_SIGNAL(dropped(TQDropEvent*, const KURL::List&, const KURL&)), parent, TQT_SLOT(slotURLListDropped(TQDropEvent*, const KURL::List&, const KURL&))); - TQClipboard* clipboard = TQApplication::tqclipboard(); + TQClipboard* clipboard = TQApplication::clipboard(); connect(clipboard, TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotUpdateDisabledItems())); @@ -441,7 +441,7 @@ void DolphinDetailsView::paintEmptyArea(TQPainter* painter, const TQRect& rect) KFileDetailView::paintEmptyArea(painter, rect); } else { - const TQBrush brush(tqcolorGroup().background()); + const TQBrush brush(colorGroup().background()); painter->fillRect(rect, brush); } } @@ -467,7 +467,7 @@ void DolphinDetailsView::drawRubber() point = contentsToViewport(point); tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, &p, TQRect(point.x(), point.y(), m_rubber->width(), m_rubber->height()), - tqcolorGroup(), TQStyle::Style_Default, tqcolorGroup().base()); + colorGroup(), TQStyle::Style_Default, colorGroup().base()); p.end(); } @@ -489,7 +489,7 @@ void DolphinDetailsView::slotActivationUpdate() update(); // TODO: there must be a simpler way to say - // "update all tqchildren" + // "update all children" const TQObjectList list = childrenListObject(); if (list.isEmpty()) { return; @@ -553,7 +553,7 @@ void DolphinDetailsView::slotAutoScroll() // select all items which intersect with the rubber, deselect all others bool bottomReached = false; while ((item != 0) && !bottomReached) { - TQRect rect(tqitemRect(item)); + TQRect rect(itemRect(item)); rect.setWidth(filenameWidth(item)); rect = TQRect(viewportToContents(rect.topLeft()), viewportToContents(rect.bottomRight())); @@ -710,10 +710,10 @@ DolphinDetailsView::DolphinListViewItem::~DolphinListViewItem() } void DolphinDetailsView::DolphinListViewItem::paintCell(TQPainter* painter, - const TQColorGroup& tqcolorGroup, + const TQColorGroup& colorGroup, int column, int cellWidth, - int tqalignment) + int alignment) { const TQListView* view = listView(); const bool isActive = TQT_BASE_OBJECT(view->parent()) == TQT_BASE_OBJECT(Dolphin::mainWin().activeView()); @@ -721,30 +721,30 @@ void DolphinDetailsView::DolphinListViewItem::paintCell(TQPainter* painter, // 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 // should be shown as selected. - TQColorGroup defaultColorGroup(tqcolorGroup); - const TQColor highlightColor(isActive ? backgroundColor(column) : view->tqcolorGroup().background()); + TQColorGroup defaultColorGroup(colorGroup); + const TQColor highlightColor(isActive ? backgroundColor(column) : view->colorGroup().background()); defaultColorGroup.setColor(TQColorGroup::Highlight , highlightColor); - defaultColorGroup.setColor(TQColorGroup::HighlightedText, tqcolorGroup.color(TQColorGroup::Text)); - KFileListViewItem::paintCell(painter, defaultColorGroup, column, cellWidth, tqalignment); + defaultColorGroup.setColor(TQColorGroup::HighlightedText, colorGroup.color(TQColorGroup::Text)); + KFileListViewItem::paintCell(painter, defaultColorGroup, column, cellWidth, alignment); if (column == 0) { // draw the selection only on the first column TQListView* parent = listView(); const int itemWidth = width(parent->fontMetrics(), parent, 0); if (isActive) { - KFileListViewItem::paintCell(painter, tqcolorGroup, column, itemWidth, tqalignment); + KFileListViewItem::paintCell(painter, colorGroup, column, itemWidth, alignment); } else { - TQListViewItem::paintCell(painter, tqcolorGroup, column, itemWidth, tqalignment); + TQListViewItem::paintCell(painter, colorGroup, column, itemWidth, alignment); } } } else { if (isActive) { - KFileListViewItem::paintCell(painter, tqcolorGroup, column, cellWidth, tqalignment); + KFileListViewItem::paintCell(painter, colorGroup, column, cellWidth, alignment); } else { - TQListViewItem::paintCell(painter, tqcolorGroup, column, cellWidth, tqalignment); + TQListViewItem::paintCell(painter, colorGroup, column, cellWidth, alignment); } } @@ -756,7 +756,7 @@ void DolphinDetailsView::DolphinListViewItem::paintCell(TQPainter* painter, } void DolphinDetailsView::DolphinListViewItem::paintFocus(TQPainter* painter, - const TQColorGroup& tqcolorGroup, + const TQColorGroup& colorGroup, const TQRect& rect) { // draw the focus consistently with the selection (see implementation notes @@ -771,7 +771,7 @@ void DolphinDetailsView::DolphinListViewItem::paintFocus(TQPainter* painter, TQRect focusRect(rect); focusRect.setWidth(visibleWidth); - KFileListViewItem::paintFocus(painter, tqcolorGroup, focusRect); + KFileListViewItem::paintFocus(painter, colorGroup, focusRect); } int DolphinDetailsView::filenameWidth(const TQListViewItem* item) const diff --git a/src/dolphindetailsview.h b/src/dolphindetailsview.h index 6b968ed..8027f06 100644 --- a/src/dolphindetailsview.h +++ b/src/dolphindetailsview.h @@ -190,13 +190,13 @@ private: KFileItem* fileItem); virtual ~DolphinListViewItem(); virtual void paintCell(TQPainter* painter, - const TQColorGroup& tqcolorGroup, + const TQColorGroup& colorGroup, int column, int cellWidth, - int tqalignment); + int alignment); virtual void paintFocus(TQPainter* painter, - const TQColorGroup& tqcolorGroup, + const TQColorGroup& colorGroup, const TQRect& rect); }; diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp index 6c7b9a9..63b755e 100644 --- a/src/dolphiniconsview.cpp +++ b/src/dolphiniconsview.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -64,7 +64,7 @@ DolphinIconsView::DolphinIconsView(DolphinView* parent, LayoutMode layoutMode) : connect(this, TQT_SIGNAL(dropped(TQDropEvent*, const KURL::List&, const KURL&)), parent, TQT_SLOT(slotURLListDropped(TQDropEvent*, const KURL::List&, const KURL&))); - TQClipboard* clipboard = TQApplication::tqclipboard(); + TQClipboard* clipboard = TQApplication::clipboard(); connect(clipboard, TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotUpdateDisabledItems())); @@ -293,7 +293,7 @@ void DolphinIconsView::drawBackground(TQPainter* painter, const TQRect& rect) KFileIconView::drawBackground(painter, rect); } else { - const TQBrush brush(tqcolorGroup().background()); + const TQBrush brush(colorGroup().background()); painter->fillRect(0, 0, width(), height(), brush); } } @@ -447,7 +447,7 @@ void DolphinIconsView::slotActivationUpdate() update(); // TODO: there must be a simpler way to say - // "update all tqchildren" + // "update all children" const TQObjectList list = childrenListObject(); if (list.isEmpty()) { return; diff --git a/src/dolphiniconsview.h b/src/dolphiniconsview.h index 5ce6d8b..e64d73d 100644 --- a/src/dolphiniconsview.h +++ b/src/dolphiniconsview.h @@ -83,7 +83,7 @@ public: public slots: /** - * Bypass a tqlayout issue in KFileIconView in combination with previews. + * Bypass a layout issue in KFileIconView in combination with previews. * @see KFileIconView::arrangeItemsInGrid */ virtual void arrangeItemsInGrid(bool updated = true); diff --git a/src/dolphiniconsviewsettings.h b/src/dolphiniconsviewsettings.h index 5c39adf..1642117 100644 --- a/src/dolphiniconsviewsettings.h +++ b/src/dolphiniconsviewsettings.h @@ -30,7 +30,7 @@ * @brief Contains the settings for the icons view. * * The following properties are stored: - * - tqlayout mode (icons or previews) + * - layout mode (icons or previews) * - icon size * - preview size * - grid width, height and spacing diff --git a/src/dolphinstatusbar.cpp b/src/dolphinstatusbar.cpp index d07c5d2..543bb47 100644 --- a/src/dolphinstatusbar.cpp +++ b/src/dolphinstatusbar.cpp @@ -36,7 +36,7 @@ DolphinStatusBar::DolphinStatusBar(DolphinView* parent) : m_progress(100) { m_messageLabel = new StatusBarMessageLabel(this); - m_messageLabel->tqsetSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed); + m_messageLabel->setSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed); m_spaceInfo = new StatusBarSpaceInfo(this); m_spaceInfo->setURL(parent->url()); @@ -51,7 +51,7 @@ DolphinStatusBar::DolphinStatusBar(DolphinView* parent) : connect(m_progressTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotProgressTimer())); - const TQSize size(m_progressBar->tqsizeHint()); + const TQSize size(m_progressBar->sizeHint()); m_progressBar->setMaximumWidth(size.width()); setMinimumHeight(size.height()); m_messageLabel->setMinimumTextHeight(size.height()); diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp index 647b6fa..7f561a8 100644 --- a/src/dolphinview.cpp +++ b/src/dolphinview.cpp @@ -20,7 +20,7 @@ #include "dolphinview.h" -#include +#include #include #include #include @@ -248,7 +248,7 @@ void DolphinView::renameSelectedItems() if (destExists) { delete progressIndicator; progressIndicator = 0; - view->statusBar()->setMessage(i18n("Renaming failed (item '%1' already exists).").tqarg(name), + view->statusBar()->setMessage(i18n("Renaming failed (item '%1' already exists).").arg(name), DolphinStatusBar::Error); break; } @@ -575,14 +575,14 @@ void DolphinView::rename(const KURL& source, const TQString& newName) } if (ok) { - m_statusBar->setMessage(i18n("Renamed file '%1' to '%2'.").tqarg(source.fileName(), dest.fileName()), + m_statusBar->setMessage(i18n("Renamed file '%1' to '%2'.").arg(source.fileName(), dest.fileName()), DolphinStatusBar::OperationCompleted); DolphinCommand command(DolphinCommand::Rename, source, dest); UndoManager::instance().addCommand(command); } else { - m_statusBar->setMessage(i18n("Renaming of file '%1' to '%2' failed.").tqarg(source.fileName(), dest.fileName()), + m_statusBar->setMessage(i18n("Renaming of file '%1' to '%2' failed.").arg(source.fileName(), dest.fileName()), DolphinStatusBar::Error); reload(); } @@ -930,7 +930,7 @@ void DolphinView::startDirLister(const KURL& url, bool reload) m_statusBar->setMessage(i18n("The location is empty."), DolphinStatusBar::Error); } else { - m_statusBar->setMessage(i18n("The location '%1' is invalid.").tqarg(location), + m_statusBar->setMessage(i18n("The location '%1' is invalid.").arg(location), DolphinStatusBar::Error); } return; @@ -993,7 +993,7 @@ TQString DolphinView::selectionStatusBarText() const if (fileCount > 0) { const TQString sizeText(KIO::convertSize(byteSize)); - text += i18n("1 File selected (%1)", "%n Files selected (%1)", fileCount).tqarg(sizeText); + text += i18n("1 File selected (%1)", "%n Files selected (%1)", fileCount).arg(sizeText); } return text; diff --git a/src/editbookmarkdialog.cpp b/src/editbookmarkdialog.cpp index 3a3f5ca..0d6f6a1 100644 --- a/src/editbookmarkdialog.cpp +++ b/src/editbookmarkdialog.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include @@ -72,7 +72,7 @@ EditBookmarkDialog::EditBookmarkDialog(const TQString& title, new TQLabel(i18n("Icon:"), grid); m_iconName = icon; m_iconButton = new TQPushButton(SmallIcon(m_iconName), TQString(), grid); - m_iconButton->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + m_iconButton->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); connect(m_iconButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectIcon())); @@ -86,13 +86,13 @@ EditBookmarkDialog::EditBookmarkDialog(const TQString& title, new TQLabel(i18n("Location:"), grid); TQHBox* locationBox = new TQHBox(grid); - locationBox->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); + locationBox->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); locationBox->setSpacing(spacingHint()); m_location = new TQLineEdit(url.prettyURL(), locationBox); m_location->setMinimumWidth(320); TQPushButton* selectLocationButton = new TQPushButton(SmallIcon("folder"), TQString(), locationBox); - selectLocationButton->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + selectLocationButton->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); connect(selectLocationButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectLocation())); diff --git a/src/filterbar.cpp b/src/filterbar.cpp index f34b763..87b5b5d 100644 --- a/src/filterbar.cpp +++ b/src/filterbar.cpp @@ -20,7 +20,7 @@ #include "filterbar.h" #include -#include +#include #include #include @@ -38,21 +38,21 @@ FilterBar::FilterBar(TQWidget *parent, const char *name) : TQVBoxLayout* foo = new TQVBoxLayout(this); foo->addSpacing(gap); - TQHBoxLayout* tqlayout = new TQHBoxLayout(foo); - tqlayout->addSpacing(gap); + TQHBoxLayout* layout = new TQHBoxLayout(foo); + layout->addSpacing(gap); m_filter = new TQLabel(i18n("Filter:"), this); - tqlayout->addWidget(m_filter); - tqlayout->addSpacing(KDialog::spacingHint()); + layout->addWidget(m_filter); + layout->addSpacing(KDialog::spacingHint()); m_filterInput = new KLineEdit(this); - tqlayout->addWidget(m_filterInput); + layout->addWidget(m_filterInput); m_close = new KPushButton(this); m_close->setIconSet(SmallIcon("fileclose")); m_close->setFlat(true); - tqlayout->addWidget(m_close); - tqlayout->addSpacing(gap); + layout->addWidget(m_close); + layout->addSpacing(gap); connect(m_filterInput, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SIGNAL(signalFilterChanged(const TQString&))); diff --git a/src/generalsettingspage.cpp b/src/generalsettingspage.cpp index f3fbebb..3af0268 100644 --- a/src/generalsettingspage.cpp +++ b/src/generalsettingspage.cpp @@ -20,7 +20,7 @@ #include "generalsettingspage.h" -#include +#include #include #include #include @@ -53,18 +53,18 @@ GeneralSettingsPage::GeneralSettingsPage(TQWidget* parent) : DolphinSettings& settings = DolphinSettings::instance(); TQVBox* vBox = new TQVBox(parent); - vBox->tqsetSizePolicy(sizePolicy); + vBox->setSizePolicy(sizePolicy); vBox->setSpacing(spacing); vBox->setMargin(margin); - vBox->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Ignored); + vBox->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Ignored); // create 'Home URL' editor TQGroupBox* homeGroup = new TQGroupBox(1, Qt::Horizontal, i18n("Home URL"), vBox); - homeGroup->tqsetSizePolicy(sizePolicy); + homeGroup->setSizePolicy(sizePolicy); homeGroup->setMargin(margin); TQHBox* homeURLBox = new TQHBox(homeGroup); - homeURLBox->tqsetSizePolicy(sizePolicy); + homeURLBox->setSizePolicy(sizePolicy); homeURLBox->setSpacing(spacing); new TQLabel(i18n("Location:"), homeURLBox); @@ -75,7 +75,7 @@ GeneralSettingsPage::GeneralSettingsPage(TQWidget* parent) : this, TQT_SLOT(selectHomeURL())); TQHBox* buttonBox = new TQHBox(homeGroup); - buttonBox->tqsetSizePolicy(sizePolicy); + buttonBox->setSizePolicy(sizePolicy); buttonBox->setSpacing(spacing); TQPushButton* useCurrentButton = new TQPushButton(i18n("Use current location"), buttonBox); connect(useCurrentButton, TQT_SIGNAL(clicked()), @@ -86,7 +86,7 @@ GeneralSettingsPage::GeneralSettingsPage(TQWidget* parent) : // create 'Default View Mode' group TQButtonGroup* buttonGroup = new TQButtonGroup(3, Qt::Vertical, i18n("Default View Mode"), vBox); - buttonGroup->tqsetSizePolicy(sizePolicy); + buttonGroup->setSizePolicy(sizePolicy); buttonGroup->setMargin(margin); m_iconsView = new TQRadioButton(i18n("Icons"), buttonGroup); @@ -112,7 +112,7 @@ GeneralSettingsPage::GeneralSettingsPage(TQWidget* parent) : m_saveView->setChecked(settings.isSaveView()); // Add a dummy widget with no restriction regarding - // a vertical resizing. This assures that the dialog tqlayout + // a vertical resizing. This assures that the dialog layout // is not stretched vertically. new TQWidget(vBox); diff --git a/src/iconsviewsettingspage.cpp b/src/iconsviewsettingspage.cpp index 9271bbb..570b961 100644 --- a/src/iconsviewsettingspage.cpp +++ b/src/iconsviewsettingspage.cpp @@ -63,11 +63,11 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinIconsView::LayoutMode mode, TQHBox* sizesLayout = new TQHBox(this); sizesLayout->setSpacing(spacing); - sizesLayout->tqsetSizePolicy(sizePolicy); + sizesLayout->setSizePolicy(sizePolicy); // create 'Icon Size' group including slider and preview TQGroupBox* iconSizeGroup = new TQGroupBox(2, Qt::Vertical, i18n("Icon Size"), sizesLayout); - iconSizeGroup->tqsetSizePolicy(sizePolicy); + iconSizeGroup->setSizePolicy(sizePolicy); iconSizeGroup->setMargin(margin); const TQColor iconBackgroundColor(KGlobalSettings::baseColor()); @@ -91,7 +91,7 @@ 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); - previewSizeGroup->tqsetSizePolicy(sizePolicy); + previewSizeGroup->setSizePolicy(sizePolicy); previewSizeGroup->setMargin(margin); TQHBox* previewSizeVBox = new TQHBox(previewSizeGroup); @@ -113,7 +113,7 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinIconsView::LayoutMode mode, } TQGroupBox* textGroup = new TQGroupBox(2, Qt::Horizontal, i18n("Text"), this); - textGroup->tqsetSizePolicy(sizePolicy); + textGroup->setSizePolicy(sizePolicy); textGroup->setMargin(margin); new TQLabel(i18n("Font family:"), textGroup); @@ -135,7 +135,7 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinIconsView::LayoutMode mode, m_textWidthBox->insertItem(i18n("Large")); TQGroupBox* gridGroup = new TQGroupBox(2, Qt::Horizontal, i18n("Grid"), this); - gridGroup->tqsetSizePolicy(sizePolicy); + gridGroup->setSizePolicy(sizePolicy); gridGroup->setMargin(margin); const bool leftToRightArrangement = (settings->arrangement() == TQIconView::LeftToRight); @@ -153,7 +153,7 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinIconsView::LayoutMode mode, m_gridSpacingBox->setCurrentItem((settings->gridSpacing() - GRID_SPACING_BASE) / GRID_SPACING_INC); // Add a dummy widget with no restriction regarding - // a vertical resizing. This assures that the dialog tqlayout + // a vertical resizing. This assures that the dialog layout // is not stretched vertically. new TQWidget(this); diff --git a/src/infosidebarpage.cpp b/src/infosidebarpage.cpp index 2766e1f..cb8db07 100644 --- a/src/infosidebarpage.cpp +++ b/src/infosidebarpage.cpp @@ -20,7 +20,7 @@ #include "infosidebarpage.h" #include -#include +#include #include #include #include @@ -63,8 +63,8 @@ InfoSidebarPage::InfoSidebarPage(TQWidget* parent) : connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout())); - TQVBoxLayout* tqlayout = new TQVBoxLayout(this); - tqlayout->setSpacing(spacing); + TQVBoxLayout* layout = new TQVBoxLayout(this); + layout->setSpacing(spacing); // preview m_preview = new PixmapViewer(this); @@ -74,37 +74,37 @@ InfoSidebarPage::InfoSidebarPage(TQWidget* parent) : // name m_name = new TQLabel(this); m_name->setTextFormat(TQt::RichText); - m_name->tqsetAlignment(m_name->tqalignment() | TQt::AlignHCenter); + m_name->setAlignment(m_name->alignment() | TQt::AlignHCenter); TQFontMetrics fontMetrics(m_name->font()); m_name->setMinimumHeight(fontMetrics.height() * 3); - m_name->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Maximum); + m_name->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Maximum); TQWidget* sep1 = new TQHGroupBox(this); // TODO: check whether default widget exist for this? sep1->setFixedHeight(1); // general information m_infoGrid = new TQGrid(2, this); - m_infoGrid->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); + m_infoGrid->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); TQWidget* sep2 = new TQHGroupBox(this); // TODO: check whether default widget exist for this? sep2->setFixedHeight(1); // actions m_actionBox = new TQVBox(this); - m_actionBox->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); + m_actionBox->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); // Add a dummy widget with no restriction regarding a vertical resizing. // This assures that information is always top aligned. TQWidget* dummy = new TQWidget(this); - tqlayout->addItem(new TQSpacerItem(spacing, spacing, TQSizePolicy::Preferred, TQSizePolicy::Fixed)); - tqlayout->addWidget(m_preview); - tqlayout->addWidget(m_name); - tqlayout->addWidget(sep1); - tqlayout->addWidget(m_infoGrid); - tqlayout->addWidget(sep2); - tqlayout->addWidget(m_actionBox); - tqlayout->addWidget(dummy); + layout->addItem(new TQSpacerItem(spacing, spacing, TQSizePolicy::Preferred, TQSizePolicy::Fixed)); + layout->addWidget(m_preview); + layout->addWidget(m_name); + layout->addWidget(sep1); + layout->addWidget(m_infoGrid); + layout->addWidget(sep2); + layout->addWidget(m_actionBox); + layout->addWidget(dummy); connect(&Dolphin::mainWin(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(showItemInfo())); @@ -388,14 +388,14 @@ void InfoSidebarPage::addInfoLine(const TQString& labelText, const TQString& inf // no labels are available anymore, hence create 2 new ones TQLabel* label = new TQLabel(labelStr, m_infoGrid); label->setTextFormat(TQt::RichText); - label->tqsetAlignment(TQt::AlignRight | + label->setAlignment(TQt::AlignRight | TQt::AlignTop); label->show(); m_infoWidgets.append(label); TQLabel* info = new TQLabel(infoText, m_infoGrid); info->setTextFormat(TQt::RichText); - info->tqsetAlignment(TQt::AlignTop | TQt::WordBreak); + info->setAlignment(TQt::AlignTop | TQt::WordBreak); info->show(); m_infoWidgets.append(info); @@ -406,7 +406,7 @@ void InfoSidebarPage::addInfoLine(const TQString& labelText, const TQString& inf void InfoSidebarPage::insertActions() { // delete all existing action widgets - // TODO: just use tqchildren() from TQObject... + // TODO: just use children() from TQObject... TQPtrListIterator deleteIter(m_actionWidgets); TQWidget* widget = 0; while ((widget = deleteIter.current()) != 0) { @@ -535,7 +535,7 @@ ServiceButton::ServiceButton(const TQIconSet& icon, m_hover(false), m_index(index) { - setEraseColor(tqcolorGroup().background()); + setEraseColor(colorGroup().background()); setFocusPolicy(TQ_NoFocus); connect(this, TQT_SIGNAL(released()), this, TQT_SLOT(slotReleased())); @@ -557,7 +557,7 @@ void ServiceButton::drawButton(TQPainter* painter) foregroundColor = KGlobalSettings::highlightedTextColor(); } else { - backgroundColor = tqcolorGroup().background(); + backgroundColor = colorGroup().background(); foregroundColor = KGlobalSettings::buttonTextColor(); } diff --git a/src/infosidebarpage.h b/src/infosidebarpage.h index d9597b5..d62318f 100644 --- a/src/infosidebarpage.h +++ b/src/infosidebarpage.h @@ -155,10 +155,10 @@ private: int m_currInfoLineIdx; TQGrid* m_infoGrid; - TQPtrList m_infoWidgets; // TODO: use tqchildren() from TQObject instead + TQPtrList m_infoWidgets; // TODO: use children() from TQObject instead TQVBox* m_actionBox; - TQPtrList m_actionWidgets; // TODO: use tqchildren() from TQObject instead + TQPtrList m_actionWidgets; // TODO: use children() from TQObject instead TQValueVector m_actionsVector; }; diff --git a/src/itemeffectsmanager.cpp b/src/itemeffectsmanager.cpp index f402f20..9ee77e2 100644 --- a/src/itemeffectsmanager.cpp +++ b/src/itemeffectsmanager.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include @@ -141,7 +141,7 @@ void ItemEffectsManager::updateDisabledItems() return; } - TQClipboard* clipboard = TQApplication::tqclipboard(); + TQClipboard* clipboard = TQApplication::clipboard(); TQMimeSource* data = clipboard->data(); if (!KURLDrag::canDecode(data)) { return; @@ -182,7 +182,7 @@ TQString ItemEffectsManager::statusBarText(KFileItem* fileInfo) const // KFileItem::getStatusBar() returns "MyDocuments/ Folder" as // status bar text for a folder 'MyDocuments'. This is adjusted // to "MyDocuments (Folder)" in Dolphin. - return i18n("%1 (Folder)").tqarg(fileInfo->name()); + return i18n("%1 (Folder)").arg(fileInfo->name()); } return fileInfo->getStatusBarInfo(); diff --git a/src/progressindicator.cpp b/src/progressindicator.cpp index 9936df5..e61025c 100644 --- a/src/progressindicator.cpp +++ b/src/progressindicator.cpp @@ -72,7 +72,7 @@ void ProgressIndicator::execOperation() DolphinStatusBar* statusBar = Dolphin::mainWin().activeView()->statusBar(); statusBar->setProgress((m_operationsIndex * 100) / m_operationsCount); kapp->processEvents(); - statusBar->tqrepaint(); + statusBar->repaint(); } } } diff --git a/src/renamedialog.cpp b/src/renamedialog.cpp index abd3057..a5c19b2 100644 --- a/src/renamedialog.cpp +++ b/src/renamedialog.cpp @@ -21,7 +21,7 @@ #include "renamedialog.h" #include #include -#include +#include #include #include #include diff --git a/src/sidebars.cpp b/src/sidebars.cpp index 11f1ca1..02f74a0 100644 --- a/src/sidebars.cpp +++ b/src/sidebars.cpp @@ -20,7 +20,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include +#include #include #include #include @@ -42,16 +42,16 @@ leftSidebar::leftSidebar(TQWidget* parent) : TQWidget(parent), m_pagesSelector(0), m_page(0), - m_tqlayout(0) + m_layout(0) { - m_tqlayout = new TQVBoxLayout(this); + m_layout = new TQVBoxLayout(this); m_pagesSelector = new TQComboBox(this); m_pagesSelector->insertItem(i18n("Bookmarks")); m_pagesSelector->insertItem(i18n("Information")); // Assure that the combo box has the same height as the URL navigator for - // a clean tqlayout. + // a clean layout. // TODO: the following 2 lines have been copied from the URLNavigator // constructor (-> provide a shared height setting?) //TQFontMetrics fontMetrics(font()); @@ -61,7 +61,7 @@ leftSidebar::leftSidebar(TQWidget* parent) : leftSidebarSettings* settings = DolphinSettings::instance().leftsidebar(); const int selectedIndex = indexForName(settings->selectedPage()); m_pagesSelector->setCurrentItem(selectedIndex); - m_tqlayout->addWidget(m_pagesSelector); + m_layout->addWidget(m_pagesSelector); createPage(selectedIndex); @@ -73,9 +73,9 @@ leftSidebar::~leftSidebar() { } -TQSize leftSidebar::tqsizeHint() const +TQSize leftSidebar::sizeHint() const { - TQSize size(TQWidget::tqsizeHint()); + TQSize size(TQWidget::sizeHint()); leftSidebarSettings* settings = DolphinSettings::instance().leftsidebar(); size.setWidth(settings->width()); @@ -95,7 +95,7 @@ void leftSidebar::createPage(int index) default: break; } - m_tqlayout->addWidget(m_page); + m_layout->addWidget(m_page); m_page->show(); leftSidebarSettings* settings = DolphinSettings::instance().leftsidebar(); @@ -118,16 +118,16 @@ rightSidebar::rightSidebar(TQWidget* parent) : TQWidget(parent), m_pagesSelector(0), m_page(0), - m_tqlayout(0) + m_layout(0) { - m_tqlayout = new TQVBoxLayout(this); + m_layout = new TQVBoxLayout(this); m_pagesSelector = new TQComboBox(this); m_pagesSelector->insertItem(i18n("Bookmarks")); m_pagesSelector->insertItem(i18n("Information")); // Assure that the combo box has the same height as the URL navigator for - // a clean tqlayout. + // a clean layout. // TODO: the following 2 lines have been copied from the URLNavigator // constructor (-> provide a shared height setting?) TQFontMetrics fontMetrics(font()); @@ -136,7 +136,7 @@ rightSidebar::rightSidebar(TQWidget* parent) : rightSidebarSettings* settings = DolphinSettings::instance().rightsidebar(); const int selectedIndex = indexForName(settings->selectedPage()); m_pagesSelector->setCurrentItem(selectedIndex); - m_tqlayout->addWidget(m_pagesSelector); + m_layout->addWidget(m_pagesSelector); createPage(selectedIndex); @@ -148,9 +148,9 @@ rightSidebar::~rightSidebar() { } -TQSize rightSidebar::tqsizeHint() const +TQSize rightSidebar::sizeHint() const { - TQSize size(TQWidget::tqsizeHint()); + TQSize size(TQWidget::sizeHint()); rightSidebarSettings* settings = DolphinSettings::instance().rightsidebar(); size.setWidth(settings->width()); @@ -170,7 +170,7 @@ void rightSidebar::createPage(int index) default: break; } - m_tqlayout->addWidget(m_page); + m_layout->addWidget(m_page); m_page->show(); rightSidebarSettings* settings = DolphinSettings::instance().rightsidebar(); diff --git a/src/sidebars.h b/src/sidebars.h index 7e65f20..e1da72f 100644 --- a/src/sidebars.h +++ b/src/sidebars.h @@ -40,7 +40,7 @@ class leftSidebar : public TQWidget leftSidebar(TQWidget* parent); virtual ~leftSidebar(); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; signals: /** @@ -57,7 +57,7 @@ class leftSidebar : public TQWidget TQComboBox* m_pagesSelector; SidebarPage* m_page; - TQVBoxLayout* m_tqlayout; + TQVBoxLayout* m_layout; }; class rightSidebar : public TQWidget @@ -69,7 +69,7 @@ class rightSidebar : public TQWidget rightSidebar(TQWidget* parent); virtual ~rightSidebar(); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; signals: /** @@ -86,7 +86,7 @@ class rightSidebar : public TQWidget TQComboBox* m_pagesSelector; SidebarPage* m_page; - TQVBoxLayout* m_tqlayout; + TQVBoxLayout* m_layout; }; #endif // _SIDEBARS_H_ diff --git a/src/statusbarmessagelabel.cpp b/src/statusbarmessagelabel.cpp index 11f74cc..c79fc44 100644 --- a/src/statusbarmessagelabel.cpp +++ b/src/statusbarmessagelabel.cpp @@ -108,7 +108,7 @@ void StatusBarMessageLabel::paintEvent(TQPaintEvent* /* event */) TQPainter painter(&buffer); // draw background - TQColor backgroundColor(tqcolorGroup().background()); + TQColor backgroundColor(colorGroup().background()); TQColor foregroundColor(KGlobalSettings::textColor()); if (m_illumination > 0) { backgroundColor = mixColors(backgroundColor, TQColor(255, 255, 64), m_illumination); diff --git a/src/statusbarspaceinfo.cpp b/src/statusbarspaceinfo.cpp index 87feaa3..16eb36b 100644 --- a/src/statusbarspaceinfo.cpp +++ b/src/statusbarspaceinfo.cpp @@ -64,7 +64,7 @@ void StatusBarSpaceInfo::paintEvent(TQPaintEvent* /* event */) const int widthDec = 3; // visual decrement for the available width - const TQColor c1 = tqcolorGroup().background(); + const TQColor c1 = colorGroup().background(); const TQColor c2 = KGlobalSettings::buttonTextColor(); const TQColor frameColor((c1.red() + c2.red()) / 2, (c1.green() + c2.green()) / 2, @@ -90,7 +90,7 @@ void StatusBarSpaceInfo::paintEvent(TQPaintEvent* /* event */) painter.drawRect(TQRect(left, barTop + 2, right, barHeight - 2)); text = i18n("%1 free") - .tqarg(KIO::convertSizeFromKB(m_kBAvailable)); + .arg(KIO::convertSizeFromKB(m_kBAvailable)); } else { if (m_gettingSize) { diff --git a/src/undomanager.cpp b/src/undomanager.cpp index 21b3364..0f4ac43 100644 --- a/src/undomanager.cpp +++ b/src/undomanager.cpp @@ -84,7 +84,7 @@ void UndoManager::addCommand(const DolphinCommand& command) } emit undoAvailable(true); - emit undoTextChanged(i18n("Undo: %1").tqarg(commandText(command))); + emit undoTextChanged(i18n("Undo: %1").arg(commandText(command))); // prevent an endless growing of the Undo history if (m_historyIndex > 10000) { @@ -132,12 +132,12 @@ void UndoManager::undo() emit undoTextChanged(i18n("Undo")); } else { - emit undoTextChanged(i18n("Undo: %1").tqarg(commandText(m_history[m_historyIndex]))); + emit undoTextChanged(i18n("Undo: %1").arg(commandText(m_history[m_historyIndex]))); } if (m_historyIndex < static_cast(m_history.count()) - 1) { emit redoAvailable(true); - emit redoTextChanged(i18n("Redo: %1").tqarg(commandText(command))); + emit redoTextChanged(i18n("Redo: %1").arg(commandText(command))); } else { emit redoAvailable(false); @@ -244,11 +244,11 @@ void UndoManager::redo() emit redoTextChanged(i18n("Redo")); } else { - emit redoTextChanged(i18n("Redo: %1").tqarg(commandText(m_history[m_historyIndex + 1]))); + emit redoTextChanged(i18n("Redo: %1").arg(commandText(m_history[m_historyIndex + 1]))); } emit undoAvailable(true); - emit undoTextChanged(i18n("Undo: %1").tqarg(commandText(command))); + emit undoTextChanged(i18n("Undo: %1").arg(commandText(command))); Dolphin& dolphin = Dolphin::mainWin(); diff --git a/src/urlbutton.cpp b/src/urlbutton.cpp index a48c833..a9cc644 100644 --- a/src/urlbutton.cpp +++ b/src/urlbutton.cpp @@ -38,7 +38,7 @@ URLButton::URLButton(URLNavigator* parent) m_urlNavigator(parent) { setFocusPolicy(TQ_NoFocus); - tqsetSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Fixed); + setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Fixed); setMinimumHeight(parent->minimumHeight()); connect(this, TQT_SIGNAL(clicked()), parent, TQT_SLOT(slotRequestActivation())); diff --git a/src/urlnavigator.cpp b/src/urlnavigator.cpp index 58de6b0..ce718d8 100644 --- a/src/urlnavigator.cpp +++ b/src/urlnavigator.cpp @@ -428,7 +428,7 @@ void URLNavigator::updateContent() // TODO: don't hardcode the shortcut as part of the text TQToolTip::add(m_toggleButton, i18n("Browse (Ctrl+B, Escape)")); - tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed); + setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed); m_pathBox->show(); m_pathBox->setURL(url()); } @@ -436,7 +436,7 @@ void URLNavigator::updateContent() // TODO: don't hardcode the shortcut as part of the text TQToolTip::add(m_toggleButton, i18n("Edit location (Ctrl+L)")); - tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); m_pathBox->hide(); TQString dir_name; diff --git a/src/urlnavigatorbutton.cpp b/src/urlnavigatorbutton.cpp index 8d893f9..64064bb 100644 --- a/src/urlnavigatorbutton.cpp +++ b/src/urlnavigatorbutton.cpp @@ -104,7 +104,7 @@ void URLNavigatorButton::drawButton(TQPainter* painter) foregroundColor = KGlobalSettings::highlightedTextColor(); } else { - backgroundColor = tqcolorGroup().background(); + backgroundColor = colorGroup().background(); foregroundColor = KGlobalSettings::buttonTextColor(); } @@ -114,7 +114,7 @@ void URLNavigatorButton::drawButton(TQPainter* painter) const bool isActive = (dolphin.activeView() == parentView); if (!isActive) { - TQColor dimmColor(tqcolorGroup().background()); + TQColor dimmColor(colorGroup().background()); foregroundColor = mixColors(foregroundColor, dimmColor); if (isHighlighted) { backgroundColor = mixColors(backgroundColor, dimmColor); @@ -331,7 +331,7 @@ void URLNavigatorButton::listJobFinished(KIO::Job* job) ++it; } - int result = dirsMenu->exec(urlNavigator()->mapToGlobal(tqgeometry().bottomLeft())); + int result = dirsMenu->exec(urlNavigator()->mapToGlobal(geometry().bottomLeft())); if (result >= 0) { KURL url = urlNavigator()->url(m_index); diff --git a/src/viewproperties.cpp b/src/viewproperties.cpp index ced4b4b..0d34dd4 100644 --- a/src/viewproperties.cpp +++ b/src/viewproperties.cpp @@ -229,7 +229,7 @@ void ViewProperties::save() void ViewProperties::updateTimeStamp() { m_changedProps = true; - m_node.setTimeStamp(TQDateTime::tqcurrentDateTime()); + m_node.setTimeStamp(TQDateTime::currentDateTime()); } ViewProperties::Properties::Properties() : diff --git a/src/viewpropertiesdialog.cpp b/src/viewpropertiesdialog.cpp index 93f1c3e..9fbdbca 100644 --- a/src/viewpropertiesdialog.cpp +++ b/src/viewpropertiesdialog.cpp @@ -21,7 +21,7 @@ #include "viewpropertiesdialog.h" #include #include -#include +#include #include #include #include @@ -56,7 +56,7 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : // create 'Properties' group containing view mode, sorting, sort order and show hidden files TQGroupBox* propsGroup = new TQGroupBox(2, Qt::Horizontal, i18n("Properties"), plainPage()); - propsGroup->tqsetSizePolicy(sizePolicy); + propsGroup->setSizePolicy(sizePolicy); propsGroup->setMargin(margin); new TQLabel(i18n("View mode:"), propsGroup); @@ -96,7 +96,7 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : Qt::Vertical, i18n("Apply view properties to:"), plainPage()); - buttonGroup->tqsetSizePolicy(sizePolicy); + buttonGroup->setSizePolicy(sizePolicy); buttonGroup->setMargin(margin); m_applyToCurrentFolder = new TQRadioButton(i18n("Current folder"), buttonGroup); diff --git a/src/viewsettingspage.cpp b/src/viewsettingspage.cpp index fe6e8bd..9a74472 100644 --- a/src/viewsettingspage.cpp +++ b/src/viewsettingspage.cpp @@ -20,7 +20,7 @@ #include "viewsettingspage.h" #include -#include +#include #include #include #include -- cgit v1.2.3