Rename a number of old tq methods that are no longer tq specific

pull/1/head
Timothy Pearson 13 years ago
parent 6f9ad886fd
commit 59d9dbf810

@ -132,7 +132,7 @@ void BookmarkSelector::drawButton(TQPainter* painter)
foregroundColor = KGlobalSettings::highlightedTextColor(); foregroundColor = KGlobalSettings::highlightedTextColor();
} }
else { else {
backgroundColor = tqcolorGroup().background(); backgroundColor = colorGroup().background();
foregroundColor = KGlobalSettings::buttonTextColor(); foregroundColor = KGlobalSettings::buttonTextColor();
} }
@ -142,7 +142,7 @@ void BookmarkSelector::drawButton(TQPainter* painter)
const bool isActive = (dolphin.activeView() == parentView); const bool isActive = (dolphin.activeView() == parentView);
if (!isActive) { if (!isActive) {
TQColor dimmColor(tqcolorGroup().background()); TQColor dimmColor(colorGroup().background());
foregroundColor = mixColors(foregroundColor, dimmColor); foregroundColor = mixColors(foregroundColor, dimmColor);
if (isHighlighted) { if (isHighlighted) {
backgroundColor = mixColors(backgroundColor, dimmColor); backgroundColor = mixColors(backgroundColor, dimmColor);

@ -22,7 +22,7 @@
#include <assert.h> #include <assert.h>
#include <tqlayout.h> #include <layout.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <tqlineedit.h> #include <tqlineedit.h>
#include <tqvbox.h> #include <tqvbox.h>
@ -49,9 +49,9 @@ BookmarksSettingsPage::BookmarksSettingsPage(TQWidget*parent) :
const int spacing = KDialog::spacingHint(); const int spacing = KDialog::spacingHint();
TQHBox* hBox = new TQHBox(parent); TQHBox* hBox = new TQHBox(parent);
hBox->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); hBox->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);
hBox->setSpacing(spacing); hBox->setSpacing(spacing);
hBox->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Ignored); hBox->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Ignored);
m_listView = new KListView(hBox); m_listView = new KListView(hBox);
m_listView->addColumn(i18n("Icon")); m_listView->addColumn(i18n("Icon"));
@ -76,27 +76,27 @@ BookmarksSettingsPage::BookmarksSettingsPage(TQWidget*parent) :
m_addButton = new KPushButton(i18n("Add..."), buttonBox); m_addButton = new KPushButton(i18n("Add..."), buttonBox);
connect(m_addButton, TQT_SIGNAL(clicked()), connect(m_addButton, TQT_SIGNAL(clicked()),
this, TQT_SLOT(slotAddButtonClicked())); this, TQT_SLOT(slotAddButtonClicked()));
m_addButton->tqsetSizePolicy(buttonSizePolicy); m_addButton->setSizePolicy(buttonSizePolicy);
m_editButton = new KPushButton(i18n("Edit..."), buttonBox); m_editButton = new KPushButton(i18n("Edit..."), buttonBox);
connect(m_editButton, TQT_SIGNAL(clicked()), connect(m_editButton, TQT_SIGNAL(clicked()),
this, TQT_SLOT(slotEditButtonClicked())); this, TQT_SLOT(slotEditButtonClicked()));
m_editButton->tqsetSizePolicy(buttonSizePolicy); m_editButton->setSizePolicy(buttonSizePolicy);
m_removeButton = new KPushButton(i18n("Remove"), buttonBox); m_removeButton = new KPushButton(i18n("Remove"), buttonBox);
connect(m_removeButton, TQT_SIGNAL(clicked()), connect(m_removeButton, TQT_SIGNAL(clicked()),
this, TQT_SLOT(slotRemoveButtonClicked())); this, TQT_SLOT(slotRemoveButtonClicked()));
m_removeButton->tqsetSizePolicy(buttonSizePolicy); m_removeButton->setSizePolicy(buttonSizePolicy);
m_moveUpButton = new KPushButton(i18n("Move Up"), buttonBox); m_moveUpButton = new KPushButton(i18n("Move Up"), buttonBox);
connect(m_moveUpButton, TQT_SIGNAL(clicked()), connect(m_moveUpButton, TQT_SIGNAL(clicked()),
this, TQT_SLOT(slotMoveUpButtonClicked())); this, TQT_SLOT(slotMoveUpButtonClicked()));
m_moveUpButton->tqsetSizePolicy(buttonSizePolicy); m_moveUpButton->setSizePolicy(buttonSizePolicy);
m_moveDownButton = new KPushButton(i18n("Move Down"), buttonBox); m_moveDownButton = new KPushButton(i18n("Move Down"), buttonBox);
connect(m_moveDownButton, TQT_SIGNAL(clicked()), connect(m_moveDownButton, TQT_SIGNAL(clicked()),
this, TQT_SLOT(slotMoveDownButtonClicked())); this, TQT_SLOT(slotMoveDownButtonClicked()));
m_moveDownButton->tqsetSizePolicy(buttonSizePolicy); m_moveDownButton->setSizePolicy(buttonSizePolicy);
// Add a dummy widget with no restriction regarding a vertical resizing. // Add a dummy widget with no restriction regarding a vertical resizing.
// This assures that the spacing between the buttons is not increased. // This assures that the spacing between the buttons is not increased.

@ -20,7 +20,7 @@
#include "bookmarkssidebarpage.h" #include "bookmarkssidebarpage.h"
#include <tqlistbox.h> #include <tqlistbox.h>
#include <tqlayout.h> #include <layout.h>
#include <tqpainter.h> #include <tqpainter.h>
#include <assert.h> #include <assert.h>
#include <tqpopupmenu.h> #include <tqpopupmenu.h>
@ -38,11 +38,11 @@
BookmarksSidebarPage::BookmarksSidebarPage(TQWidget* parent) : BookmarksSidebarPage::BookmarksSidebarPage(TQWidget* parent) :
SidebarPage(parent) SidebarPage(parent)
{ {
TQVBoxLayout* tqlayout = new TQVBoxLayout(this); TQVBoxLayout* layout = new TQVBoxLayout(this);
m_bookmarksList = new BookmarksListBox(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&)), connect(m_bookmarksList, TQT_SIGNAL(mouseButtonClicked(int, TQListBoxItem*, const TQPoint&)),
this, TQT_SLOT(slotMouseButtonClicked(int, TQListBoxItem*))); this, TQT_SLOT(slotMouseButtonClicked(int, TQListBoxItem*)));
connect(m_bookmarksList, TQT_SIGNAL(contextMenuRequested(TQListBoxItem*, const TQPoint&)), connect(m_bookmarksList, TQT_SIGNAL(contextMenuRequested(TQListBoxItem*, const TQPoint&)),

@ -58,7 +58,7 @@ DetailsViewSettingsPage::DetailsViewSettingsPage(TQWidget *parent) :
// create "Columns" properties // create "Columns" properties
TQGroupBox* columnsGroup = new TQGroupBox(4, Qt::Vertical, i18n("Columns"), this); TQGroupBox* columnsGroup = new TQGroupBox(4, Qt::Vertical, i18n("Columns"), this);
columnsGroup->tqsetSizePolicy(sizePolicy); columnsGroup->setSizePolicy(sizePolicy);
columnsGroup->setMargin(margin); columnsGroup->setMargin(margin);
TQHBox* visibleColumnsLayout = new TQHBox(columnsGroup); TQHBox* visibleColumnsLayout = new TQHBox(columnsGroup);
@ -76,7 +76,7 @@ DetailsViewSettingsPage::DetailsViewSettingsPage(TQWidget *parent) :
// Create "Icon" properties // Create "Icon" properties
TQButtonGroup* iconSizeGroup = new TQButtonGroup(3, Qt::Horizontal, i18n("Icon Size"), this); TQButtonGroup* iconSizeGroup = new TQButtonGroup(3, Qt::Horizontal, i18n("Icon Size"), this);
iconSizeGroup->tqsetSizePolicy(sizePolicy); iconSizeGroup->setSizePolicy(sizePolicy);
iconSizeGroup->setMargin(margin); iconSizeGroup->setMargin(margin);
m_smallIconSize = new TQRadioButton(i18n("Small"), iconSizeGroup); m_smallIconSize = new TQRadioButton(i18n("Small"), iconSizeGroup);
m_mediumIconSize = new TQRadioButton(i18n("Medium"), iconSizeGroup); m_mediumIconSize = new TQRadioButton(i18n("Medium"), iconSizeGroup);
@ -103,7 +103,7 @@ DetailsViewSettingsPage::DetailsViewSettingsPage(TQWidget *parent) :
// create "Text" properties // create "Text" properties
TQGroupBox* textGroup = new TQGroupBox(2, Qt::Horizontal, i18n("Text"), this); TQGroupBox* textGroup = new TQGroupBox(2, Qt::Horizontal, i18n("Text"), this);
textGroup->tqsetSizePolicy(sizePolicy); textGroup->setSizePolicy(sizePolicy);
textGroup->setMargin(margin); textGroup->setMargin(margin);
new TQLabel(i18n("Font family:"), textGroup); new TQLabel(i18n("Font family:"), textGroup);
@ -115,7 +115,7 @@ DetailsViewSettingsPage::DetailsViewSettingsPage(TQWidget *parent) :
m_fontSizeBox->setValue(settings->fontSize()); m_fontSizeBox->setValue(settings->fontSize());
// Add a dummy widget with no restriction regarding // 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. // is not stretched vertically.
new TQWidget(this); new TQWidget(this);
} }

@ -52,7 +52,7 @@
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <krun.h> #include <krun.h>
#include <tqclipboard.h> #include <clipboard.h>
#include <tqdragobject.h> #include <tqdragobject.h>
#include "urlnavigator.h" #include "urlnavigator.h"
@ -395,7 +395,7 @@ void Dolphin::createFolder()
// TODO: provide message type hint // TODO: provide message type hint
if (ok) { if (ok) {
statusBar->setMessage(i18n("Created folder %1.").tqarg(url.path()), statusBar->setMessage(i18n("Created folder %1.").arg(url.path()),
DolphinStatusBar::OperationCompleted); DolphinStatusBar::OperationCompleted);
DolphinCommand command(DolphinCommand::CreateFolder, KURL::List(), url); 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 // Creating of the folder has been failed. Check whether the creating
// has been failed because a folder with the same name exists... // has been failed because a folder with the same name exists...
if (KIO::NetAccess::exists(url, true, this)) { 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); DolphinStatusBar::Error);
} }
else { 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); DolphinStatusBar::Error);
} }
@ -490,7 +490,7 @@ void Dolphin::createFile()
const TQString destPath(viewURL.prettyURL() + "/" + KIO::encodeFileName(name)); const TQString destPath(viewURL.prettyURL() + "/" + KIO::encodeFileName(name));
const KURL destURL(destPath); const KURL destURL(destPath);
if (KIO::NetAccess::exists(destURL, false, this)) { 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); DolphinStatusBar::Error);
return; return;
} }
@ -500,7 +500,7 @@ void Dolphin::createFile()
KIO::CopyJob* job = KIO::copyAs(sourceURL, destURL); KIO::CopyJob* job = KIO::copyAs(sourceURL, destURL);
job->setDefaultPermissions(true); job->setDefaultPermissions(true);
if (KIO::NetAccess::synchronousRun(job, this)) { if (KIO::NetAccess::synchronousRun(job, this)) {
statusBar->setMessage(i18n("Created file %1.").tqarg(name), statusBar->setMessage(i18n("Created file %1.").arg(name),
DolphinStatusBar::OperationCompleted); DolphinStatusBar::OperationCompleted);
KURL::List list; KURL::List list;
@ -510,7 +510,7 @@ void Dolphin::createFile()
} }
else { else {
statusBar->setMessage(i18n("Creating of file %1 failed.").tqarg(name), statusBar->setMessage(i18n("Creating of file %1 failed.").arg(name),
DolphinStatusBar::Error); DolphinStatusBar::Error);
} }
} }
@ -539,11 +539,11 @@ void Dolphin::deleteItems()
TQString text; TQString text;
if (itemCount > 1) { 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 { else {
const KURL& url = list.first(); 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, const bool del = KMessageBox::warningContinueCancel(this,
@ -642,7 +642,7 @@ void Dolphin::cut()
m_clipboardContainsCutData = true; m_clipboardContainsCutData = true;
TQDragObject* data = new KURLDrag(m_activeView->selectedURLs(), TQDragObject* data = new KURLDrag(m_activeView->selectedURLs(),
widget()); widget());
TQApplication::tqclipboard()->setData(data); TQApplication::clipboard()->setData(data);
} }
void Dolphin::copy() void Dolphin::copy()
@ -650,12 +650,12 @@ void Dolphin::copy()
m_clipboardContainsCutData = false; m_clipboardContainsCutData = false;
TQDragObject* data = new KURLDrag(m_activeView->selectedURLs(), TQDragObject* data = new KURLDrag(m_activeView->selectedURLs(),
widget()); widget());
TQApplication::tqclipboard()->setData(data); TQApplication::clipboard()->setData(data);
} }
void Dolphin::paste() void Dolphin::paste()
{ {
TQClipboard* clipboard = TQApplication::tqclipboard(); TQClipboard* clipboard = TQApplication::clipboard();
TQMimeSource* data = clipboard->data(); TQMimeSource* data = clipboard->data();
if (!KURLDrag::canDecode(data)) { if (!KURLDrag::canDecode(data)) {
return; return;
@ -703,7 +703,7 @@ void Dolphin::updatePasteAction()
} }
TQString text(i18n("Paste")); TQString text(i18n("Paste"));
TQClipboard* clipboard = TQApplication::tqclipboard(); TQClipboard* clipboard = TQApplication::clipboard();
TQMimeSource* data = clipboard->data(); TQMimeSource* data = clipboard->data();
if (KURLDrag::canDecode(data)) { if (KURLDrag::canDecode(data)) {
pasteAction->setEnabled(true); pasteAction->setEnabled(true);
@ -715,7 +715,7 @@ void Dolphin::updatePasteAction()
pasteAction->setText(i18n("Paste 1 File")); pasteAction->setText(i18n("Paste 1 File"));
} }
else { else {
pasteAction->setText(i18n("Paste %1 Files").tqarg(count)); pasteAction->setText(i18n("Paste %1 Files").arg(count));
} }
} }
else { else {
@ -1144,7 +1144,7 @@ void Dolphin::init()
stateChanged("new_file"); stateChanged("new_file");
setAutoSaveSettings(); setAutoSaveSettings();
TQClipboard* clipboard = TQApplication::tqclipboard(); TQClipboard* clipboard = TQApplication::clipboard();
connect(clipboard, TQT_SIGNAL(dataChanged()), connect(clipboard, TQT_SIGNAL(dataChanged()),
this, TQT_SLOT(updatePasteAction())); this, TQT_SLOT(updatePasteAction()));
updatePasteAction(); updatePasteAction();

@ -24,7 +24,7 @@
#include <tqpainter.h> #include <tqpainter.h>
#include <tqobjectlist.h> #include <tqobjectlist.h>
#include <tqheader.h> #include <tqheader.h>
#include <tqclipboard.h> #include <clipboard.h>
#include <tqpainter.h> #include <tqpainter.h>
#include <klocale.h> #include <klocale.h>
#include <kglobalsettings.h> #include <kglobalsettings.h>
@ -78,7 +78,7 @@ DolphinDetailsView::DolphinDetailsView(DolphinView* parent) :
connect(this, TQT_SIGNAL(dropped(TQDropEvent*, const KURL::List&, const KURL&)), connect(this, TQT_SIGNAL(dropped(TQDropEvent*, const KURL::List&, const KURL&)),
parent, TQT_SLOT(slotURLListDropped(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()), connect(clipboard, TQT_SIGNAL(dataChanged()),
this, TQT_SLOT(slotUpdateDisabledItems())); this, TQT_SLOT(slotUpdateDisabledItems()));
@ -441,7 +441,7 @@ void DolphinDetailsView::paintEmptyArea(TQPainter* painter, const TQRect& rect)
KFileDetailView::paintEmptyArea(painter, rect); KFileDetailView::paintEmptyArea(painter, rect);
} }
else { else {
const TQBrush brush(tqcolorGroup().background()); const TQBrush brush(colorGroup().background());
painter->fillRect(rect, brush); painter->fillRect(rect, brush);
} }
} }
@ -467,7 +467,7 @@ void DolphinDetailsView::drawRubber()
point = contentsToViewport(point); point = contentsToViewport(point);
tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, &p, tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, &p,
TQRect(point.x(), point.y(), m_rubber->width(), m_rubber->height()), 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(); p.end();
} }
@ -489,7 +489,7 @@ void DolphinDetailsView::slotActivationUpdate()
update(); update();
// TODO: there must be a simpler way to say // TODO: there must be a simpler way to say
// "update all tqchildren" // "update all children"
const TQObjectList list = childrenListObject(); const TQObjectList list = childrenListObject();
if (list.isEmpty()) { if (list.isEmpty()) {
return; return;
@ -553,7 +553,7 @@ void DolphinDetailsView::slotAutoScroll()
// select all items which intersect with the rubber, deselect all others // select all items which intersect with the rubber, deselect all others
bool bottomReached = false; bool bottomReached = false;
while ((item != 0) && !bottomReached) { while ((item != 0) && !bottomReached) {
TQRect rect(tqitemRect(item)); TQRect rect(itemRect(item));
rect.setWidth(filenameWidth(item)); rect.setWidth(filenameWidth(item));
rect = TQRect(viewportToContents(rect.topLeft()), rect = TQRect(viewportToContents(rect.topLeft()),
viewportToContents(rect.bottomRight())); viewportToContents(rect.bottomRight()));
@ -710,10 +710,10 @@ DolphinDetailsView::DolphinListViewItem::~DolphinListViewItem()
} }
void DolphinDetailsView::DolphinListViewItem::paintCell(TQPainter* painter, void DolphinDetailsView::DolphinListViewItem::paintCell(TQPainter* painter,
const TQColorGroup& tqcolorGroup, const TQColorGroup& colorGroup,
int column, int column,
int cellWidth, int cellWidth,
int tqalignment) int alignment)
{ {
const TQListView* view = listView(); const TQListView* view = listView();
const bool isActive = TQT_BASE_OBJECT(view->parent()) == TQT_BASE_OBJECT(Dolphin::mainWin().activeView()); 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 // 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 // behavior with the icon view is wanted, only the the column containing the file name
// should be shown as selected. // should be shown as selected.
TQColorGroup defaultColorGroup(tqcolorGroup); TQColorGroup defaultColorGroup(colorGroup);
const TQColor highlightColor(isActive ? backgroundColor(column) : view->tqcolorGroup().background()); const TQColor highlightColor(isActive ? backgroundColor(column) : view->colorGroup().background());
defaultColorGroup.setColor(TQColorGroup::Highlight , highlightColor); defaultColorGroup.setColor(TQColorGroup::Highlight , highlightColor);
defaultColorGroup.setColor(TQColorGroup::HighlightedText, tqcolorGroup.color(TQColorGroup::Text)); defaultColorGroup.setColor(TQColorGroup::HighlightedText, colorGroup.color(TQColorGroup::Text));
KFileListViewItem::paintCell(painter, defaultColorGroup, column, cellWidth, tqalignment); KFileListViewItem::paintCell(painter, defaultColorGroup, column, cellWidth, alignment);
if (column == 0) { if (column == 0) {
// draw the selection only on the first column // draw the selection only on the first column
TQListView* parent = listView(); TQListView* parent = listView();
const int itemWidth = width(parent->fontMetrics(), parent, 0); const int itemWidth = width(parent->fontMetrics(), parent, 0);
if (isActive) { if (isActive) {
KFileListViewItem::paintCell(painter, tqcolorGroup, column, itemWidth, tqalignment); KFileListViewItem::paintCell(painter, colorGroup, column, itemWidth, alignment);
} }
else { else {
TQListViewItem::paintCell(painter, tqcolorGroup, column, itemWidth, tqalignment); TQListViewItem::paintCell(painter, colorGroup, column, itemWidth, alignment);
} }
} }
} }
else { else {
if (isActive) { if (isActive) {
KFileListViewItem::paintCell(painter, tqcolorGroup, column, cellWidth, tqalignment); KFileListViewItem::paintCell(painter, colorGroup, column, cellWidth, alignment);
} }
else { 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, void DolphinDetailsView::DolphinListViewItem::paintFocus(TQPainter* painter,
const TQColorGroup& tqcolorGroup, const TQColorGroup& colorGroup,
const TQRect& rect) const TQRect& rect)
{ {
// draw the focus consistently with the selection (see implementation notes // draw the focus consistently with the selection (see implementation notes
@ -771,7 +771,7 @@ void DolphinDetailsView::DolphinListViewItem::paintFocus(TQPainter* painter,
TQRect focusRect(rect); TQRect focusRect(rect);
focusRect.setWidth(visibleWidth); focusRect.setWidth(visibleWidth);
KFileListViewItem::paintFocus(painter, tqcolorGroup, focusRect); KFileListViewItem::paintFocus(painter, colorGroup, focusRect);
} }
int DolphinDetailsView::filenameWidth(const TQListViewItem* item) const int DolphinDetailsView::filenameWidth(const TQListViewItem* item) const

@ -190,13 +190,13 @@ private:
KFileItem* fileItem); KFileItem* fileItem);
virtual ~DolphinListViewItem(); virtual ~DolphinListViewItem();
virtual void paintCell(TQPainter* painter, virtual void paintCell(TQPainter* painter,
const TQColorGroup& tqcolorGroup, const TQColorGroup& colorGroup,
int column, int column,
int cellWidth, int cellWidth,
int tqalignment); int alignment);
virtual void paintFocus(TQPainter* painter, virtual void paintFocus(TQPainter* painter,
const TQColorGroup& tqcolorGroup, const TQColorGroup& colorGroup,
const TQRect& rect); const TQRect& rect);
}; };

@ -25,7 +25,7 @@
#include <tqobjectlist.h> #include <tqobjectlist.h>
#include <kglobalsettings.h> #include <kglobalsettings.h>
#include <kurldrag.h> #include <kurldrag.h>
#include <tqclipboard.h> #include <clipboard.h>
#include <assert.h> #include <assert.h>
#include <kaction.h> #include <kaction.h>
#include <kstdaction.h> #include <kstdaction.h>
@ -64,7 +64,7 @@ DolphinIconsView::DolphinIconsView(DolphinView* parent, LayoutMode layoutMode) :
connect(this, TQT_SIGNAL(dropped(TQDropEvent*, const KURL::List&, const KURL&)), connect(this, TQT_SIGNAL(dropped(TQDropEvent*, const KURL::List&, const KURL&)),
parent, TQT_SLOT(slotURLListDropped(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()), connect(clipboard, TQT_SIGNAL(dataChanged()),
this, TQT_SLOT(slotUpdateDisabledItems())); this, TQT_SLOT(slotUpdateDisabledItems()));
@ -293,7 +293,7 @@ void DolphinIconsView::drawBackground(TQPainter* painter, const TQRect& rect)
KFileIconView::drawBackground(painter, rect); KFileIconView::drawBackground(painter, rect);
} }
else { else {
const TQBrush brush(tqcolorGroup().background()); const TQBrush brush(colorGroup().background());
painter->fillRect(0, 0, width(), height(), brush); painter->fillRect(0, 0, width(), height(), brush);
} }
} }
@ -447,7 +447,7 @@ void DolphinIconsView::slotActivationUpdate()
update(); update();
// TODO: there must be a simpler way to say // TODO: there must be a simpler way to say
// "update all tqchildren" // "update all children"
const TQObjectList list = childrenListObject(); const TQObjectList list = childrenListObject();
if (list.isEmpty()) { if (list.isEmpty()) {
return; return;

@ -83,7 +83,7 @@ public:
public slots: 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 * @see KFileIconView::arrangeItemsInGrid
*/ */
virtual void arrangeItemsInGrid(bool updated = true); virtual void arrangeItemsInGrid(bool updated = true);

@ -30,7 +30,7 @@
* @brief Contains the settings for the icons view. * @brief Contains the settings for the icons view.
* *
* The following properties are stored: * The following properties are stored:
* - tqlayout mode (icons or previews) * - layout mode (icons or previews)
* - icon size * - icon size
* - preview size * - preview size
* - grid width, height and spacing * - grid width, height and spacing

@ -36,7 +36,7 @@ DolphinStatusBar::DolphinStatusBar(DolphinView* parent) :
m_progress(100) m_progress(100)
{ {
m_messageLabel = new StatusBarMessageLabel(this); 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 = new StatusBarSpaceInfo(this);
m_spaceInfo->setURL(parent->url()); m_spaceInfo->setURL(parent->url());
@ -51,7 +51,7 @@ DolphinStatusBar::DolphinStatusBar(DolphinView* parent) :
connect(m_progressTimer, TQT_SIGNAL(timeout()), connect(m_progressTimer, TQT_SIGNAL(timeout()),
this, TQT_SLOT(slotProgressTimer())); this, TQT_SLOT(slotProgressTimer()));
const TQSize size(m_progressBar->tqsizeHint()); const TQSize size(m_progressBar->sizeHint());
m_progressBar->setMaximumWidth(size.width()); m_progressBar->setMaximumWidth(size.width());
setMinimumHeight(size.height()); setMinimumHeight(size.height());
m_messageLabel->setMinimumTextHeight(size.height()); m_messageLabel->setMinimumTextHeight(size.height());

@ -20,7 +20,7 @@
#include "dolphinview.h" #include "dolphinview.h"
#include <tqlayout.h> #include <layout.h>
#include <kurl.h> #include <kurl.h>
#include <klocale.h> #include <klocale.h>
#include <kio/netaccess.h> #include <kio/netaccess.h>
@ -248,7 +248,7 @@ void DolphinView::renameSelectedItems()
if (destExists) { if (destExists) {
delete progressIndicator; delete progressIndicator;
progressIndicator = 0; 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); DolphinStatusBar::Error);
break; break;
} }
@ -575,14 +575,14 @@ void DolphinView::rename(const KURL& source, const TQString& newName)
} }
if (ok) { 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); DolphinStatusBar::OperationCompleted);
DolphinCommand command(DolphinCommand::Rename, source, dest); DolphinCommand command(DolphinCommand::Rename, source, dest);
UndoManager::instance().addCommand(command); UndoManager::instance().addCommand(command);
} }
else { 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); DolphinStatusBar::Error);
reload(); reload();
} }
@ -930,7 +930,7 @@ void DolphinView::startDirLister(const KURL& url, bool reload)
m_statusBar->setMessage(i18n("The location is empty."), DolphinStatusBar::Error); m_statusBar->setMessage(i18n("The location is empty."), DolphinStatusBar::Error);
} }
else { 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); DolphinStatusBar::Error);
} }
return; return;
@ -993,7 +993,7 @@ TQString DolphinView::selectionStatusBarText() const
if (fileCount > 0) { if (fileCount > 0) {
const TQString sizeText(KIO::convertSize(byteSize)); 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; return text;

@ -23,7 +23,7 @@
#include <klocale.h> #include <klocale.h>
#include <tqlineedit.h> #include <tqlineedit.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <tqlayout.h> #include <layout.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <tqpushbutton.h> #include <tqpushbutton.h>
#include <kurl.h> #include <kurl.h>
@ -72,7 +72,7 @@ EditBookmarkDialog::EditBookmarkDialog(const TQString& title,
new TQLabel(i18n("Icon:"), grid); new TQLabel(i18n("Icon:"), grid);
m_iconName = icon; m_iconName = icon;
m_iconButton = new TQPushButton(SmallIcon(m_iconName), TQString(), grid); 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()), connect(m_iconButton, TQT_SIGNAL(clicked()),
this, TQT_SLOT(selectIcon())); this, TQT_SLOT(selectIcon()));
@ -86,13 +86,13 @@ EditBookmarkDialog::EditBookmarkDialog(const TQString& title,
new TQLabel(i18n("Location:"), grid); new TQLabel(i18n("Location:"), grid);
TQHBox* locationBox = new TQHBox(grid); TQHBox* locationBox = new TQHBox(grid);
locationBox->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); locationBox->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);
locationBox->setSpacing(spacingHint()); locationBox->setSpacing(spacingHint());
m_location = new TQLineEdit(url.prettyURL(), locationBox); m_location = new TQLineEdit(url.prettyURL(), locationBox);
m_location->setMinimumWidth(320); m_location->setMinimumWidth(320);
TQPushButton* selectLocationButton = new TQPushButton(SmallIcon("folder"), TQString(), locationBox); 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()), connect(selectLocationButton, TQT_SIGNAL(clicked()),
this, TQT_SLOT(selectLocation())); this, TQT_SLOT(selectLocation()));

@ -20,7 +20,7 @@
#include "filterbar.h" #include "filterbar.h"
#include <tqlabel.h> #include <tqlabel.h>
#include <tqlayout.h> #include <layout.h>
#include <kdialog.h> #include <kdialog.h>
#include <klocale.h> #include <klocale.h>
@ -38,21 +38,21 @@ FilterBar::FilterBar(TQWidget *parent, const char *name) :
TQVBoxLayout* foo = new TQVBoxLayout(this); TQVBoxLayout* foo = new TQVBoxLayout(this);
foo->addSpacing(gap); foo->addSpacing(gap);
TQHBoxLayout* tqlayout = new TQHBoxLayout(foo); TQHBoxLayout* layout = new TQHBoxLayout(foo);
tqlayout->addSpacing(gap); layout->addSpacing(gap);
m_filter = new TQLabel(i18n("Filter:"), this); m_filter = new TQLabel(i18n("Filter:"), this);
tqlayout->addWidget(m_filter); layout->addWidget(m_filter);
tqlayout->addSpacing(KDialog::spacingHint()); layout->addSpacing(KDialog::spacingHint());
m_filterInput = new KLineEdit(this); m_filterInput = new KLineEdit(this);
tqlayout->addWidget(m_filterInput); layout->addWidget(m_filterInput);
m_close = new KPushButton(this); m_close = new KPushButton(this);
m_close->setIconSet(SmallIcon("fileclose")); m_close->setIconSet(SmallIcon("fileclose"));
m_close->setFlat(true); m_close->setFlat(true);
tqlayout->addWidget(m_close); layout->addWidget(m_close);
tqlayout->addSpacing(gap); layout->addSpacing(gap);
connect(m_filterInput, TQT_SIGNAL(textChanged(const TQString&)), connect(m_filterInput, TQT_SIGNAL(textChanged(const TQString&)),
this, TQT_SIGNAL(signalFilterChanged(const TQString&))); this, TQT_SIGNAL(signalFilterChanged(const TQString&)));

@ -20,7 +20,7 @@
#include "generalsettingspage.h" #include "generalsettingspage.h"
#include <tqlayout.h> #include <layout.h>
#include <kdialog.h> #include <kdialog.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <tqlineedit.h> #include <tqlineedit.h>
@ -53,18 +53,18 @@ GeneralSettingsPage::GeneralSettingsPage(TQWidget* parent) :
DolphinSettings& settings = DolphinSettings::instance(); DolphinSettings& settings = DolphinSettings::instance();
TQVBox* vBox = new TQVBox(parent); TQVBox* vBox = new TQVBox(parent);
vBox->tqsetSizePolicy(sizePolicy); vBox->setSizePolicy(sizePolicy);
vBox->setSpacing(spacing); vBox->setSpacing(spacing);
vBox->setMargin(margin); vBox->setMargin(margin);
vBox->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Ignored); vBox->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Ignored);
// create 'Home URL' editor // create 'Home URL' editor
TQGroupBox* homeGroup = new TQGroupBox(1, Qt::Horizontal, i18n("Home URL"), vBox); TQGroupBox* homeGroup = new TQGroupBox(1, Qt::Horizontal, i18n("Home URL"), vBox);
homeGroup->tqsetSizePolicy(sizePolicy); homeGroup->setSizePolicy(sizePolicy);
homeGroup->setMargin(margin); homeGroup->setMargin(margin);
TQHBox* homeURLBox = new TQHBox(homeGroup); TQHBox* homeURLBox = new TQHBox(homeGroup);
homeURLBox->tqsetSizePolicy(sizePolicy); homeURLBox->setSizePolicy(sizePolicy);
homeURLBox->setSpacing(spacing); homeURLBox->setSpacing(spacing);
new TQLabel(i18n("Location:"), homeURLBox); new TQLabel(i18n("Location:"), homeURLBox);
@ -75,7 +75,7 @@ GeneralSettingsPage::GeneralSettingsPage(TQWidget* parent) :
this, TQT_SLOT(selectHomeURL())); this, TQT_SLOT(selectHomeURL()));
TQHBox* buttonBox = new TQHBox(homeGroup); TQHBox* buttonBox = new TQHBox(homeGroup);
buttonBox->tqsetSizePolicy(sizePolicy); buttonBox->setSizePolicy(sizePolicy);
buttonBox->setSpacing(spacing); buttonBox->setSpacing(spacing);
TQPushButton* useCurrentButton = new TQPushButton(i18n("Use current location"), buttonBox); TQPushButton* useCurrentButton = new TQPushButton(i18n("Use current location"), buttonBox);
connect(useCurrentButton, TQT_SIGNAL(clicked()), connect(useCurrentButton, TQT_SIGNAL(clicked()),
@ -86,7 +86,7 @@ GeneralSettingsPage::GeneralSettingsPage(TQWidget* parent) :
// create 'Default View Mode' group // create 'Default View Mode' group
TQButtonGroup* buttonGroup = new TQButtonGroup(3, Qt::Vertical, i18n("Default View Mode"), vBox); TQButtonGroup* buttonGroup = new TQButtonGroup(3, Qt::Vertical, i18n("Default View Mode"), vBox);
buttonGroup->tqsetSizePolicy(sizePolicy); buttonGroup->setSizePolicy(sizePolicy);
buttonGroup->setMargin(margin); buttonGroup->setMargin(margin);
m_iconsView = new TQRadioButton(i18n("Icons"), buttonGroup); m_iconsView = new TQRadioButton(i18n("Icons"), buttonGroup);
@ -112,7 +112,7 @@ GeneralSettingsPage::GeneralSettingsPage(TQWidget* parent) :
m_saveView->setChecked(settings.isSaveView()); m_saveView->setChecked(settings.isSaveView());
// Add a dummy widget with no restriction regarding // 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. // is not stretched vertically.
new TQWidget(vBox); new TQWidget(vBox);

@ -63,11 +63,11 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinIconsView::LayoutMode mode,
TQHBox* sizesLayout = new TQHBox(this); TQHBox* sizesLayout = new TQHBox(this);
sizesLayout->setSpacing(spacing); sizesLayout->setSpacing(spacing);
sizesLayout->tqsetSizePolicy(sizePolicy); sizesLayout->setSizePolicy(sizePolicy);
// create 'Icon Size' group including slider and preview // create 'Icon Size' group including slider and preview
TQGroupBox* iconSizeGroup = new TQGroupBox(2, Qt::Vertical, i18n("Icon Size"), sizesLayout); TQGroupBox* iconSizeGroup = new TQGroupBox(2, Qt::Vertical, i18n("Icon Size"), sizesLayout);
iconSizeGroup->tqsetSizePolicy(sizePolicy); iconSizeGroup->setSizePolicy(sizePolicy);
iconSizeGroup->setMargin(margin); iconSizeGroup->setMargin(margin);
const TQColor iconBackgroundColor(KGlobalSettings::baseColor()); const TQColor iconBackgroundColor(KGlobalSettings::baseColor());
@ -91,7 +91,7 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinIconsView::LayoutMode mode,
if (m_mode == DolphinIconsView::Previews) { if (m_mode == DolphinIconsView::Previews) {
// create 'Preview Size' group including slider and preview // create 'Preview Size' group including slider and preview
TQGroupBox* previewSizeGroup = new TQGroupBox(2, Qt::Vertical, i18n("Preview Size"), sizesLayout); TQGroupBox* previewSizeGroup = new TQGroupBox(2, Qt::Vertical, i18n("Preview Size"), sizesLayout);
previewSizeGroup->tqsetSizePolicy(sizePolicy); previewSizeGroup->setSizePolicy(sizePolicy);
previewSizeGroup->setMargin(margin); previewSizeGroup->setMargin(margin);
TQHBox* previewSizeVBox = new TQHBox(previewSizeGroup); TQHBox* previewSizeVBox = new TQHBox(previewSizeGroup);
@ -113,7 +113,7 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinIconsView::LayoutMode mode,
} }
TQGroupBox* textGroup = new TQGroupBox(2, Qt::Horizontal, i18n("Text"), this); TQGroupBox* textGroup = new TQGroupBox(2, Qt::Horizontal, i18n("Text"), this);
textGroup->tqsetSizePolicy(sizePolicy); textGroup->setSizePolicy(sizePolicy);
textGroup->setMargin(margin); textGroup->setMargin(margin);
new TQLabel(i18n("Font family:"), textGroup); new TQLabel(i18n("Font family:"), textGroup);
@ -135,7 +135,7 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinIconsView::LayoutMode mode,
m_textWidthBox->insertItem(i18n("Large")); m_textWidthBox->insertItem(i18n("Large"));
TQGroupBox* gridGroup = new TQGroupBox(2, Qt::Horizontal, i18n("Grid"), this); TQGroupBox* gridGroup = new TQGroupBox(2, Qt::Horizontal, i18n("Grid"), this);
gridGroup->tqsetSizePolicy(sizePolicy); gridGroup->setSizePolicy(sizePolicy);
gridGroup->setMargin(margin); gridGroup->setMargin(margin);
const bool leftToRightArrangement = (settings->arrangement() == TQIconView::LeftToRight); 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); m_gridSpacingBox->setCurrentItem((settings->gridSpacing() - GRID_SPACING_BASE) / GRID_SPACING_INC);
// Add a dummy widget with no restriction regarding // 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. // is not stretched vertically.
new TQWidget(this); new TQWidget(this);

@ -20,7 +20,7 @@
#include "infosidebarpage.h" #include "infosidebarpage.h"
#include <assert.h> #include <assert.h>
#include <tqlayout.h> #include <layout.h>
#include <tqpixmap.h> #include <tqpixmap.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <tqtimer.h> #include <tqtimer.h>
@ -63,8 +63,8 @@ InfoSidebarPage::InfoSidebarPage(TQWidget* parent) :
connect(m_timer, TQT_SIGNAL(timeout()), connect(m_timer, TQT_SIGNAL(timeout()),
this, TQT_SLOT(slotTimeout())); this, TQT_SLOT(slotTimeout()));
TQVBoxLayout* tqlayout = new TQVBoxLayout(this); TQVBoxLayout* layout = new TQVBoxLayout(this);
tqlayout->setSpacing(spacing); layout->setSpacing(spacing);
// preview // preview
m_preview = new PixmapViewer(this); m_preview = new PixmapViewer(this);
@ -74,37 +74,37 @@ InfoSidebarPage::InfoSidebarPage(TQWidget* parent) :
// name // name
m_name = new TQLabel(this); m_name = new TQLabel(this);
m_name->setTextFormat(TQt::RichText); 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()); TQFontMetrics fontMetrics(m_name->font());
m_name->setMinimumHeight(fontMetrics.height() * 3); 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? TQWidget* sep1 = new TQHGroupBox(this); // TODO: check whether default widget exist for this?
sep1->setFixedHeight(1); sep1->setFixedHeight(1);
// general information // general information
m_infoGrid = new TQGrid(2, this); 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? TQWidget* sep2 = new TQHGroupBox(this); // TODO: check whether default widget exist for this?
sep2->setFixedHeight(1); sep2->setFixedHeight(1);
// actions // actions
m_actionBox = new TQVBox(this); 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. // Add a dummy widget with no restriction regarding a vertical resizing.
// This assures that information is always top aligned. // This assures that information is always top aligned.
TQWidget* dummy = new TQWidget(this); TQWidget* dummy = new TQWidget(this);
tqlayout->addItem(new TQSpacerItem(spacing, spacing, TQSizePolicy::Preferred, TQSizePolicy::Fixed)); layout->addItem(new TQSpacerItem(spacing, spacing, TQSizePolicy::Preferred, TQSizePolicy::Fixed));
tqlayout->addWidget(m_preview); layout->addWidget(m_preview);
tqlayout->addWidget(m_name); layout->addWidget(m_name);
tqlayout->addWidget(sep1); layout->addWidget(sep1);
tqlayout->addWidget(m_infoGrid); layout->addWidget(m_infoGrid);
tqlayout->addWidget(sep2); layout->addWidget(sep2);
tqlayout->addWidget(m_actionBox); layout->addWidget(m_actionBox);
tqlayout->addWidget(dummy); layout->addWidget(dummy);
connect(&Dolphin::mainWin(), TQT_SIGNAL(selectionChanged()), connect(&Dolphin::mainWin(), TQT_SIGNAL(selectionChanged()),
this, TQT_SLOT(showItemInfo())); 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 // no labels are available anymore, hence create 2 new ones
TQLabel* label = new TQLabel(labelStr, m_infoGrid); TQLabel* label = new TQLabel(labelStr, m_infoGrid);
label->setTextFormat(TQt::RichText); label->setTextFormat(TQt::RichText);
label->tqsetAlignment(TQt::AlignRight | label->setAlignment(TQt::AlignRight |
TQt::AlignTop); TQt::AlignTop);
label->show(); label->show();
m_infoWidgets.append(label); m_infoWidgets.append(label);
TQLabel* info = new TQLabel(infoText, m_infoGrid); TQLabel* info = new TQLabel(infoText, m_infoGrid);
info->setTextFormat(TQt::RichText); info->setTextFormat(TQt::RichText);
info->tqsetAlignment(TQt::AlignTop | TQt::WordBreak); info->setAlignment(TQt::AlignTop | TQt::WordBreak);
info->show(); info->show();
m_infoWidgets.append(info); m_infoWidgets.append(info);
@ -406,7 +406,7 @@ void InfoSidebarPage::addInfoLine(const TQString& labelText, const TQString& inf
void InfoSidebarPage::insertActions() void InfoSidebarPage::insertActions()
{ {
// delete all existing action widgets // delete all existing action widgets
// TODO: just use tqchildren() from TQObject... // TODO: just use children() from TQObject...
TQPtrListIterator<TQWidget> deleteIter(m_actionWidgets); TQPtrListIterator<TQWidget> deleteIter(m_actionWidgets);
TQWidget* widget = 0; TQWidget* widget = 0;
while ((widget = deleteIter.current()) != 0) { while ((widget = deleteIter.current()) != 0) {
@ -535,7 +535,7 @@ ServiceButton::ServiceButton(const TQIconSet& icon,
m_hover(false), m_hover(false),
m_index(index) m_index(index)
{ {
setEraseColor(tqcolorGroup().background()); setEraseColor(colorGroup().background());
setFocusPolicy(TQ_NoFocus); setFocusPolicy(TQ_NoFocus);
connect(this, TQT_SIGNAL(released()), connect(this, TQT_SIGNAL(released()),
this, TQT_SLOT(slotReleased())); this, TQT_SLOT(slotReleased()));
@ -557,7 +557,7 @@ void ServiceButton::drawButton(TQPainter* painter)
foregroundColor = KGlobalSettings::highlightedTextColor(); foregroundColor = KGlobalSettings::highlightedTextColor();
} }
else { else {
backgroundColor = tqcolorGroup().background(); backgroundColor = colorGroup().background();
foregroundColor = KGlobalSettings::buttonTextColor(); foregroundColor = KGlobalSettings::buttonTextColor();
} }

@ -155,10 +155,10 @@ private:
int m_currInfoLineIdx; int m_currInfoLineIdx;
TQGrid* m_infoGrid; TQGrid* m_infoGrid;
TQPtrList<TQLabel> m_infoWidgets; // TODO: use tqchildren() from TQObject instead TQPtrList<TQLabel> m_infoWidgets; // TODO: use children() from TQObject instead
TQVBox* m_actionBox; TQVBox* m_actionBox;
TQPtrList<TQWidget> m_actionWidgets; // TODO: use tqchildren() from TQObject instead TQPtrList<TQWidget> m_actionWidgets; // TODO: use children() from TQObject instead
TQValueVector<KDEDesktopMimeType::Service> m_actionsVector; TQValueVector<KDEDesktopMimeType::Service> m_actionsVector;
}; };

@ -23,7 +23,7 @@
#include <kapplication.h> #include <kapplication.h>
#include <tqobjectlist.h> #include <tqobjectlist.h>
#include <kglobalsettings.h> #include <kglobalsettings.h>
#include <tqclipboard.h> #include <clipboard.h>
#include <kurldrag.h> #include <kurldrag.h>
#include <klocale.h> #include <klocale.h>
@ -141,7 +141,7 @@ void ItemEffectsManager::updateDisabledItems()
return; return;
} }
TQClipboard* clipboard = TQApplication::tqclipboard(); TQClipboard* clipboard = TQApplication::clipboard();
TQMimeSource* data = clipboard->data(); TQMimeSource* data = clipboard->data();
if (!KURLDrag::canDecode(data)) { if (!KURLDrag::canDecode(data)) {
return; return;
@ -182,7 +182,7 @@ TQString ItemEffectsManager::statusBarText(KFileItem* fileInfo) const
// KFileItem::getStatusBar() returns "MyDocuments/ Folder" as // KFileItem::getStatusBar() returns "MyDocuments/ Folder" as
// status bar text for a folder 'MyDocuments'. This is adjusted // status bar text for a folder 'MyDocuments'. This is adjusted
// to "MyDocuments (Folder)" in Dolphin. // to "MyDocuments (Folder)" in Dolphin.
return i18n("%1 (Folder)").tqarg(fileInfo->name()); return i18n("%1 (Folder)").arg(fileInfo->name());
} }
return fileInfo->getStatusBarInfo(); return fileInfo->getStatusBarInfo();

@ -72,7 +72,7 @@ void ProgressIndicator::execOperation()
DolphinStatusBar* statusBar = Dolphin::mainWin().activeView()->statusBar(); DolphinStatusBar* statusBar = Dolphin::mainWin().activeView()->statusBar();
statusBar->setProgress((m_operationsIndex * 100) / m_operationsCount); statusBar->setProgress((m_operationsIndex * 100) / m_operationsCount);
kapp->processEvents(); kapp->processEvents();
statusBar->tqrepaint(); statusBar->repaint();
} }
} }
} }

@ -21,7 +21,7 @@
#include "renamedialog.h" #include "renamedialog.h"
#include <klocale.h> #include <klocale.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <tqlayout.h> #include <layout.h>
#include <tqvbox.h> #include <tqvbox.h>
#include <assert.h> #include <assert.h>
#include <klineedit.h> #include <klineedit.h>

@ -20,7 +20,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/ ***************************************************************************/
#include <tqlayout.h> #include <layout.h>
#include <tqpixmap.h> #include <tqpixmap.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <klocale.h> #include <klocale.h>
@ -42,16 +42,16 @@ leftSidebar::leftSidebar(TQWidget* parent) :
TQWidget(parent), TQWidget(parent),
m_pagesSelector(0), m_pagesSelector(0),
m_page(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 = new TQComboBox(this);
m_pagesSelector->insertItem(i18n("Bookmarks")); m_pagesSelector->insertItem(i18n("Bookmarks"));
m_pagesSelector->insertItem(i18n("Information")); m_pagesSelector->insertItem(i18n("Information"));
// Assure that the combo box has the same height as the URL navigator for // 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 // TODO: the following 2 lines have been copied from the URLNavigator
// constructor (-> provide a shared height setting?) // constructor (-> provide a shared height setting?)
//TQFontMetrics fontMetrics(font()); //TQFontMetrics fontMetrics(font());
@ -61,7 +61,7 @@ leftSidebar::leftSidebar(TQWidget* parent) :
leftSidebarSettings* settings = DolphinSettings::instance().leftsidebar(); leftSidebarSettings* settings = DolphinSettings::instance().leftsidebar();
const int selectedIndex = indexForName(settings->selectedPage()); const int selectedIndex = indexForName(settings->selectedPage());
m_pagesSelector->setCurrentItem(selectedIndex); m_pagesSelector->setCurrentItem(selectedIndex);
m_tqlayout->addWidget(m_pagesSelector); m_layout->addWidget(m_pagesSelector);
createPage(selectedIndex); 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(); leftSidebarSettings* settings = DolphinSettings::instance().leftsidebar();
size.setWidth(settings->width()); size.setWidth(settings->width());
@ -95,7 +95,7 @@ void leftSidebar::createPage(int index)
default: break; default: break;
} }
m_tqlayout->addWidget(m_page); m_layout->addWidget(m_page);
m_page->show(); m_page->show();
leftSidebarSettings* settings = DolphinSettings::instance().leftsidebar(); leftSidebarSettings* settings = DolphinSettings::instance().leftsidebar();
@ -118,16 +118,16 @@ rightSidebar::rightSidebar(TQWidget* parent) :
TQWidget(parent), TQWidget(parent),
m_pagesSelector(0), m_pagesSelector(0),
m_page(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 = new TQComboBox(this);
m_pagesSelector->insertItem(i18n("Bookmarks")); m_pagesSelector->insertItem(i18n("Bookmarks"));
m_pagesSelector->insertItem(i18n("Information")); m_pagesSelector->insertItem(i18n("Information"));
// Assure that the combo box has the same height as the URL navigator for // 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 // TODO: the following 2 lines have been copied from the URLNavigator
// constructor (-> provide a shared height setting?) // constructor (-> provide a shared height setting?)
TQFontMetrics fontMetrics(font()); TQFontMetrics fontMetrics(font());
@ -136,7 +136,7 @@ rightSidebar::rightSidebar(TQWidget* parent) :
rightSidebarSettings* settings = DolphinSettings::instance().rightsidebar(); rightSidebarSettings* settings = DolphinSettings::instance().rightsidebar();
const int selectedIndex = indexForName(settings->selectedPage()); const int selectedIndex = indexForName(settings->selectedPage());
m_pagesSelector->setCurrentItem(selectedIndex); m_pagesSelector->setCurrentItem(selectedIndex);
m_tqlayout->addWidget(m_pagesSelector); m_layout->addWidget(m_pagesSelector);
createPage(selectedIndex); 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(); rightSidebarSettings* settings = DolphinSettings::instance().rightsidebar();
size.setWidth(settings->width()); size.setWidth(settings->width());
@ -170,7 +170,7 @@ void rightSidebar::createPage(int index)
default: break; default: break;
} }
m_tqlayout->addWidget(m_page); m_layout->addWidget(m_page);
m_page->show(); m_page->show();
rightSidebarSettings* settings = DolphinSettings::instance().rightsidebar(); rightSidebarSettings* settings = DolphinSettings::instance().rightsidebar();

@ -40,7 +40,7 @@ class leftSidebar : public TQWidget
leftSidebar(TQWidget* parent); leftSidebar(TQWidget* parent);
virtual ~leftSidebar(); virtual ~leftSidebar();
virtual TQSize tqsizeHint() const; virtual TQSize sizeHint() const;
signals: signals:
/** /**
@ -57,7 +57,7 @@ class leftSidebar : public TQWidget
TQComboBox* m_pagesSelector; TQComboBox* m_pagesSelector;
SidebarPage* m_page; SidebarPage* m_page;
TQVBoxLayout* m_tqlayout; TQVBoxLayout* m_layout;
}; };
class rightSidebar : public TQWidget class rightSidebar : public TQWidget
@ -69,7 +69,7 @@ class rightSidebar : public TQWidget
rightSidebar(TQWidget* parent); rightSidebar(TQWidget* parent);
virtual ~rightSidebar(); virtual ~rightSidebar();
virtual TQSize tqsizeHint() const; virtual TQSize sizeHint() const;
signals: signals:
/** /**
@ -86,7 +86,7 @@ class rightSidebar : public TQWidget
TQComboBox* m_pagesSelector; TQComboBox* m_pagesSelector;
SidebarPage* m_page; SidebarPage* m_page;
TQVBoxLayout* m_tqlayout; TQVBoxLayout* m_layout;
}; };
#endif // _SIDEBARS_H_ #endif // _SIDEBARS_H_

@ -108,7 +108,7 @@ void StatusBarMessageLabel::paintEvent(TQPaintEvent* /* event */)
TQPainter painter(&buffer); TQPainter painter(&buffer);
// draw background // draw background
TQColor backgroundColor(tqcolorGroup().background()); TQColor backgroundColor(colorGroup().background());
TQColor foregroundColor(KGlobalSettings::textColor()); TQColor foregroundColor(KGlobalSettings::textColor());
if (m_illumination > 0) { if (m_illumination > 0) {
backgroundColor = mixColors(backgroundColor, TQColor(255, 255, 64), m_illumination); backgroundColor = mixColors(backgroundColor, TQColor(255, 255, 64), m_illumination);

@ -64,7 +64,7 @@ void StatusBarSpaceInfo::paintEvent(TQPaintEvent* /* event */)
const int widthDec = 3; // visual decrement for the available width 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 c2 = KGlobalSettings::buttonTextColor();
const TQColor frameColor((c1.red() + c2.red()) / 2, const TQColor frameColor((c1.red() + c2.red()) / 2,
(c1.green() + c2.green()) / 2, (c1.green() + c2.green()) / 2,
@ -90,7 +90,7 @@ void StatusBarSpaceInfo::paintEvent(TQPaintEvent* /* event */)
painter.drawRect(TQRect(left, barTop + 2, right, barHeight - 2)); painter.drawRect(TQRect(left, barTop + 2, right, barHeight - 2));
text = i18n("%1 free") text = i18n("%1 free")
.tqarg(KIO::convertSizeFromKB(m_kBAvailable)); .arg(KIO::convertSizeFromKB(m_kBAvailable));
} }
else { else {
if (m_gettingSize) { if (m_gettingSize) {

@ -84,7 +84,7 @@ void UndoManager::addCommand(const DolphinCommand& command)
} }
emit undoAvailable(true); 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 // prevent an endless growing of the Undo history
if (m_historyIndex > 10000) { if (m_historyIndex > 10000) {
@ -132,12 +132,12 @@ void UndoManager::undo()
emit undoTextChanged(i18n("Undo")); emit undoTextChanged(i18n("Undo"));
} }
else { 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<int>(m_history.count()) - 1) { if (m_historyIndex < static_cast<int>(m_history.count()) - 1) {
emit redoAvailable(true); emit redoAvailable(true);
emit redoTextChanged(i18n("Redo: %1").tqarg(commandText(command))); emit redoTextChanged(i18n("Redo: %1").arg(commandText(command)));
} }
else { else {
emit redoAvailable(false); emit redoAvailable(false);
@ -244,11 +244,11 @@ void UndoManager::redo()
emit redoTextChanged(i18n("Redo")); emit redoTextChanged(i18n("Redo"));
} }
else { 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 undoAvailable(true);
emit undoTextChanged(i18n("Undo: %1").tqarg(commandText(command))); emit undoTextChanged(i18n("Undo: %1").arg(commandText(command)));
Dolphin& dolphin = Dolphin::mainWin(); Dolphin& dolphin = Dolphin::mainWin();

@ -38,7 +38,7 @@ URLButton::URLButton(URLNavigator* parent)
m_urlNavigator(parent) m_urlNavigator(parent)
{ {
setFocusPolicy(TQ_NoFocus); setFocusPolicy(TQ_NoFocus);
tqsetSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Fixed); setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Fixed);
setMinimumHeight(parent->minimumHeight()); setMinimumHeight(parent->minimumHeight());
connect(this, TQT_SIGNAL(clicked()), parent, TQT_SLOT(slotRequestActivation())); connect(this, TQT_SIGNAL(clicked()), parent, TQT_SLOT(slotRequestActivation()));

@ -428,7 +428,7 @@ void URLNavigator::updateContent()
// TODO: don't hardcode the shortcut as part of the text // TODO: don't hardcode the shortcut as part of the text
TQToolTip::add(m_toggleButton, i18n("Browse (Ctrl+B, Escape)")); TQToolTip::add(m_toggleButton, i18n("Browse (Ctrl+B, Escape)"));
tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed); setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
m_pathBox->show(); m_pathBox->show();
m_pathBox->setURL(url()); m_pathBox->setURL(url());
} }
@ -436,7 +436,7 @@ void URLNavigator::updateContent()
// TODO: don't hardcode the shortcut as part of the text // TODO: don't hardcode the shortcut as part of the text
TQToolTip::add(m_toggleButton, i18n("Edit location (Ctrl+L)")); TQToolTip::add(m_toggleButton, i18n("Edit location (Ctrl+L)"));
tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
m_pathBox->hide(); m_pathBox->hide();
TQString dir_name; TQString dir_name;

@ -104,7 +104,7 @@ void URLNavigatorButton::drawButton(TQPainter* painter)
foregroundColor = KGlobalSettings::highlightedTextColor(); foregroundColor = KGlobalSettings::highlightedTextColor();
} }
else { else {
backgroundColor = tqcolorGroup().background(); backgroundColor = colorGroup().background();
foregroundColor = KGlobalSettings::buttonTextColor(); foregroundColor = KGlobalSettings::buttonTextColor();
} }
@ -114,7 +114,7 @@ void URLNavigatorButton::drawButton(TQPainter* painter)
const bool isActive = (dolphin.activeView() == parentView); const bool isActive = (dolphin.activeView() == parentView);
if (!isActive) { if (!isActive) {
TQColor dimmColor(tqcolorGroup().background()); TQColor dimmColor(colorGroup().background());
foregroundColor = mixColors(foregroundColor, dimmColor); foregroundColor = mixColors(foregroundColor, dimmColor);
if (isHighlighted) { if (isHighlighted) {
backgroundColor = mixColors(backgroundColor, dimmColor); backgroundColor = mixColors(backgroundColor, dimmColor);
@ -331,7 +331,7 @@ void URLNavigatorButton::listJobFinished(KIO::Job* job)
++it; ++it;
} }
int result = dirsMenu->exec(urlNavigator()->mapToGlobal(tqgeometry().bottomLeft())); int result = dirsMenu->exec(urlNavigator()->mapToGlobal(geometry().bottomLeft()));
if (result >= 0) { if (result >= 0) {
KURL url = urlNavigator()->url(m_index); KURL url = urlNavigator()->url(m_index);

@ -229,7 +229,7 @@ void ViewProperties::save()
void ViewProperties::updateTimeStamp() void ViewProperties::updateTimeStamp()
{ {
m_changedProps = true; m_changedProps = true;
m_node.setTimeStamp(TQDateTime::tqcurrentDateTime()); m_node.setTimeStamp(TQDateTime::currentDateTime());
} }
ViewProperties::Properties::Properties() : ViewProperties::Properties::Properties() :

@ -21,7 +21,7 @@
#include "viewpropertiesdialog.h" #include "viewpropertiesdialog.h"
#include <klocale.h> #include <klocale.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <tqlayout.h> #include <layout.h>
#include <tqvbox.h> #include <tqvbox.h>
#include <tqbuttongroup.h> #include <tqbuttongroup.h>
#include <tqcheckbox.h> #include <tqcheckbox.h>
@ -56,7 +56,7 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
// create 'Properties' group containing view mode, sorting, sort order and show hidden files // 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, Qt::Horizontal, i18n("Properties"), plainPage());
propsGroup->tqsetSizePolicy(sizePolicy); propsGroup->setSizePolicy(sizePolicy);
propsGroup->setMargin(margin); propsGroup->setMargin(margin);
new TQLabel(i18n("View mode:"), propsGroup); new TQLabel(i18n("View mode:"), propsGroup);
@ -96,7 +96,7 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
Qt::Vertical, Qt::Vertical,
i18n("Apply view properties to:"), i18n("Apply view properties to:"),
plainPage()); plainPage());
buttonGroup->tqsetSizePolicy(sizePolicy); buttonGroup->setSizePolicy(sizePolicy);
buttonGroup->setMargin(margin); buttonGroup->setMargin(margin);
m_applyToCurrentFolder = new TQRadioButton(i18n("Current folder"), buttonGroup); m_applyToCurrentFolder = new TQRadioButton(i18n("Current folder"), buttonGroup);

@ -20,7 +20,7 @@
#include "viewsettingspage.h" #include "viewsettingspage.h"
#include <tqtabwidget.h> #include <tqtabwidget.h>
#include <tqlayout.h> #include <layout.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <kdialogbase.h> #include <kdialogbase.h>
#include <klocale.h> #include <klocale.h>

Loading…
Cancel
Save