summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 22:19:39 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 22:19:39 +0000
commit2e11795ab3befef25e318902869fa71c6ff4a076 (patch)
treeb5ec2f60aef32f350fc5b56720bc616c44a840c6
parent10b4cb5e889a28380c1cc4d5e4ebe01a835df6d9 (diff)
downloaddolphin-2e11795ab3befef25e318902869fa71c6ff4a076.tar.gz
dolphin-2e11795ab3befef25e318902869fa71c6ff4a076.zip
rename the following methods:
tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/dolphin@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--src/bookmarkselector.cpp10
-rw-r--r--src/bookmarkselector.h8
-rw-r--r--src/bookmarkssettingspage.cpp8
-rw-r--r--src/bookmarkssettingspage.h2
-rw-r--r--src/bookmarkssidebarpage.cpp12
-rw-r--r--src/bookmarkssidebarpage.h8
-rw-r--r--src/detailsviewsettingspage.cpp4
-rw-r--r--src/detailsviewsettingspage.h2
-rw-r--r--src/dolphincontextmenu.cpp4
-rw-r--r--src/dolphincontextmenu.h4
-rw-r--r--src/dolphindetailsview.cpp24
-rw-r--r--src/dolphindetailsview.h4
-rw-r--r--src/dolphiniconsview.cpp8
-rw-r--r--src/dolphiniconsview.h2
-rw-r--r--src/dolphinstatusbar.cpp8
-rw-r--r--src/dolphinstatusbar.h2
-rw-r--r--src/dolphinview.cpp4
-rw-r--r--src/dolphinview.h2
-rw-r--r--src/filterbar.cpp4
-rw-r--r--src/filterbar.h2
-rw-r--r--src/generalsettingspage.cpp8
-rw-r--r--src/generalsettingspage.h2
-rw-r--r--src/iconsviewsettingspage.cpp4
-rw-r--r--src/iconsviewsettingspage.h2
-rw-r--r--src/infosidebarpage.cpp8
-rw-r--r--src/infosidebarpage.h4
-rw-r--r--src/pixmapviewer.cpp4
-rw-r--r--src/pixmapviewer.h2
-rw-r--r--src/settingspagebase.cpp4
-rw-r--r--src/settingspagebase.h2
-rw-r--r--src/sidebarpage.cpp4
-rw-r--r--src/sidebarpage.h2
-rw-r--r--src/sidebars.cpp10
-rw-r--r--src/sidebars.h8
-rw-r--r--src/statusbarmessagelabel.cpp4
-rw-r--r--src/statusbarmessagelabel.h2
-rw-r--r--src/statusbarspaceinfo.cpp4
-rw-r--r--src/statusbarspaceinfo.h2
-rw-r--r--src/urlbutton.cpp10
-rw-r--r--src/urlbutton.h2
-rw-r--r--src/urlnavigatorbutton.cpp6
-rw-r--r--src/urlnavigatorbutton.h2
-rw-r--r--src/viewsettingspage.cpp8
-rw-r--r--src/viewsettingspage.h2
44 files changed, 114 insertions, 114 deletions
diff --git a/src/bookmarkselector.cpp b/src/bookmarkselector.cpp
index d957140..1e996a1 100644
--- a/src/bookmarkselector.cpp
+++ b/src/bookmarkselector.cpp
@@ -34,8 +34,8 @@
#include "dolphin.h"
#include "urlnavigator.h"
-BookmarkSelector::BookmarkSelector(URLNavigator* tqparent) :
- URLButton(tqparent),
+BookmarkSelector::BookmarkSelector(URLNavigator* parent) :
+ URLButton(parent),
m_selectedIndex(0)
{
setFocusPolicy(TQ_NoFocus);
@@ -88,8 +88,8 @@ void BookmarkSelector::updateSelection(const KURL& url)
int maxLength = 0;
m_selectedIndex = -1;
- // Search the bookmark which is equal to the URL or at least is a tqparent URL.
- // If there are more than one possible tqparent URL candidates, choose the bookmark
+ // Search the bookmark which is equal to the URL or at least is a parent URL.
+ // If there are more than one possible parent URL candidates, choose the bookmark
// which covers the bigger range of the URL.
int i = 0;
while (!bookmark.isNull()) {
@@ -136,7 +136,7 @@ void BookmarkSelector::drawButton(TQPainter* painter)
foregroundColor = KGlobalSettings::buttonTextColor();
}
- // dimm the colors if the tqparent view does not have the focus
+ // dimm the colors if the parent view does not have the focus
const DolphinView* parentView = urlNavigator()->dolphinView();
const Dolphin& dolphin = Dolphin::mainWin();
diff --git a/src/bookmarkselector.h b/src/bookmarkselector.h
index d56aec2..05f0b43 100644
--- a/src/bookmarkselector.h
+++ b/src/bookmarkselector.h
@@ -44,18 +44,18 @@ class BookmarkSelector : public URLButton
public:
/**
- * @param tqparent Parent widget where the bookmark selector
+ * @param parent Parent widget where the bookmark selector
* is embedded into.
*/
- BookmarkSelector(URLNavigator* tqparent);
+ BookmarkSelector(URLNavigator* parent);
virtual ~BookmarkSelector();
/**
* Updates the selection dependent from the given URL \a url. The
* URL must not match exactly to one of the available bookmarks:
- * The bookmark which is equal to the URL or at least is a tqparent URL
- * is selected. If there are more than one possible tqparent URL candidates,
+ * The bookmark which is equal to the URL or at least is a parent URL
+ * is selected. If there are more than one possible parent URL candidates,
* the bookmark which covers the bigger range of the URL is selected.
*/
void updateSelection(const KURL& url);
diff --git a/src/bookmarkssettingspage.cpp b/src/bookmarkssettingspage.cpp
index 379f186..adcb467 100644
--- a/src/bookmarkssettingspage.cpp
+++ b/src/bookmarkssettingspage.cpp
@@ -37,18 +37,18 @@
#include "dolphinsettings.h"
#include "editbookmarkdialog.h"
-BookmarksSettingsPage::BookmarksSettingsPage(TQWidget*tqparent) :
- SettingsPageBase(tqparent),
+BookmarksSettingsPage::BookmarksSettingsPage(TQWidget*parent) :
+ SettingsPageBase(parent),
m_addButton(0),
m_removeButton(0),
m_moveUpButton(0),
m_moveDownButton(0)
{
- TQVBoxLayout* topLayout = new TQVBoxLayout(tqparent, 2, KDialog::spacingHint());
+ TQVBoxLayout* topLayout = new TQVBoxLayout(parent, 2, KDialog::spacingHint());
const int spacing = KDialog::spacingHint();
- TQHBox* hBox = new TQHBox(tqparent);
+ TQHBox* hBox = new TQHBox(parent);
hBox->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);
hBox->setSpacing(spacing);
hBox->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Ignored);
diff --git a/src/bookmarkssettingspage.h b/src/bookmarkssettingspage.h
index 8a292ad..1d8ce93 100644
--- a/src/bookmarkssettingspage.h
+++ b/src/bookmarkssettingspage.h
@@ -38,7 +38,7 @@ class BookmarksSettingsPage : public SettingsPageBase
TQ_OBJECT
public:
- BookmarksSettingsPage(TQWidget* tqparent);
+ BookmarksSettingsPage(TQWidget* parent);
virtual ~BookmarksSettingsPage();
diff --git a/src/bookmarkssidebarpage.cpp b/src/bookmarkssidebarpage.cpp
index 7ffa321..af39d7e 100644
--- a/src/bookmarkssidebarpage.cpp
+++ b/src/bookmarkssidebarpage.cpp
@@ -35,8 +35,8 @@
#include "dolphinview.h"
#include "editbookmarkdialog.h"
-BookmarksSidebarPage::BookmarksSidebarPage(TQWidget* tqparent) :
- SidebarPage(tqparent)
+BookmarksSidebarPage::BookmarksSidebarPage(TQWidget* parent) :
+ SidebarPage(parent)
{
TQVBoxLayout* tqlayout = new TQVBoxLayout(this);
m_bookmarksList = new BookmarksListBox(this);
@@ -194,8 +194,8 @@ void BookmarksSidebarPage::adjustSelection(const KURL& url)
int maxLength = 0;
int selectedIndex = -1;
- // Search the bookmark which is equal to the URL or at least is a tqparent URL.
- // If there are more than one possible tqparent URL candidates, choose the bookmark
+ // Search the bookmark which is equal to the URL or at least is a parent URL.
+ // If there are more than one possible parent URL candidates, choose the bookmark
// which covers the bigger range of the URL.
int i = 0;
while (!bookmark.isNull()) {
@@ -238,8 +238,8 @@ void BookmarksSidebarPage::connectToActiveView()
this, TQT_SLOT(slotURLChanged(const KURL&)));
}
-BookmarksListBox::BookmarksListBox(TQWidget* tqparent) :
- TQListBox(tqparent)
+BookmarksListBox::BookmarksListBox(TQWidget* parent) :
+ TQListBox(parent)
{
setAcceptDrops(true);
}
diff --git a/src/bookmarkssidebarpage.h b/src/bookmarkssidebarpage.h
index 20ef4c9..0e4b962 100644
--- a/src/bookmarkssidebarpage.h
+++ b/src/bookmarkssidebarpage.h
@@ -41,7 +41,7 @@ class BookmarksSidebarPage : public SidebarPage
TQ_OBJECT
public:
- BookmarksSidebarPage(TQWidget* tqparent);
+ BookmarksSidebarPage(TQWidget* parent);
virtual ~BookmarksSidebarPage();
protected:
@@ -71,8 +71,8 @@ private:
/**
* Updates the selection dependent from the given URL \a url. The
* URL must not match exactly to one of the available bookmarks:
- * The bookmark which is equal to the URL or at least is a tqparent URL
- * is selected. If there are more than one possible tqparent URL candidates,
+ * The bookmark which is equal to the URL or at least is a parent URL
+ * is selected. If there are more than one possible parent URL candidates,
* the bookmark which covers the bigger range of the URL is selected.
*/
void adjustSelection(const KURL& url);
@@ -98,7 +98,7 @@ class BookmarksListBox : public TQListBox
TQ_OBJECT
public:
- BookmarksListBox(TQWidget* tqparent);
+ BookmarksListBox(TQWidget* parent);
virtual ~BookmarksListBox();
protected:
diff --git a/src/detailsviewsettingspage.cpp b/src/detailsviewsettingspage.cpp
index c1300be..6aa4855 100644
--- a/src/detailsviewsettingspage.cpp
+++ b/src/detailsviewsettingspage.cpp
@@ -36,8 +36,8 @@
#include "dolphindetailsviewsettings.h"
#include "dolphindetailsview.h"
-DetailsViewSettingsPage::DetailsViewSettingsPage(TQWidget *tqparent) :
- TQVBox(tqparent),
+DetailsViewSettingsPage::DetailsViewSettingsPage(TQWidget *parent) :
+ TQVBox(parent),
m_dateBox(0),
m_permissionsBox(0),
m_ownerBox(0),
diff --git a/src/detailsviewsettingspage.h b/src/detailsviewsettingspage.h
index 2c32520..462ae35 100644
--- a/src/detailsviewsettingspage.h
+++ b/src/detailsviewsettingspage.h
@@ -40,7 +40,7 @@ class DetailsViewSettingsPage : public TQVBox
TQ_OBJECT
public:
- DetailsViewSettingsPage(TQWidget* tqparent);
+ DetailsViewSettingsPage(TQWidget* parent);
virtual ~DetailsViewSettingsPage();
/**
diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 3c85b71..5a7d248 100644
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -44,10 +44,10 @@
#include "dolphinsettings.h"
-DolphinContextMenu::DolphinContextMenu(DolphinView* tqparent,
+DolphinContextMenu::DolphinContextMenu(DolphinView* parent,
KFileItem* fileInfo,
const TQPoint& pos) :
- m_dolphinView(tqparent),
+ m_dolphinView(parent),
m_fileInfo(fileInfo),
m_pos(pos)
{
diff --git a/src/dolphincontextmenu.h b/src/dolphincontextmenu.h
index 1b0a0c9..52e6897 100644
--- a/src/dolphincontextmenu.h
+++ b/src/dolphincontextmenu.h
@@ -54,14 +54,14 @@ class DolphinContextMenu
{
public:
/**
- * @tqparent Pointer to the dolphin view the context menu
+ * @parent Pointer to the dolphin view the context menu
* belongs to.
* @fileInfo Pointer to the file item the context menu
* is applied. If 0 is passed, the context menu
* is above the viewport.
* @pos Position of the upper left edge of the context menu.
*/
- DolphinContextMenu(DolphinView* tqparent,
+ DolphinContextMenu(DolphinView* parent,
KFileItem* fileInfo,
const TQPoint& pos);
diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp
index 8c68454..03282fb 100644
--- a/src/dolphindetailsview.cpp
+++ b/src/dolphindetailsview.cpp
@@ -41,9 +41,9 @@
#include "dolphinstatusbar.h"
#include "dolphindetailsviewsettings.h"
-DolphinDetailsView::DolphinDetailsView(DolphinView* tqparent) :
- KFileDetailView(tqparent, 0),
- m_dolphinView(tqparent),
+DolphinDetailsView::DolphinDetailsView(DolphinView* parent) :
+ KFileDetailView(parent, 0),
+ m_dolphinView(parent),
m_resizeTimer(0),
m_scrollTimer(0),
m_rubber(0)
@@ -76,7 +76,7 @@ DolphinDetailsView::DolphinDetailsView(DolphinView* tqparent) :
connect(this, TQT_SIGNAL(itemRenamed(TQListViewItem*, const TQString&, int)),
this, TQT_SLOT(slotItemRenamed(TQListViewItem*, const TQString&, int)));
connect(this, TQT_SIGNAL(dropped(TQDropEvent*, const KURL::List&, const KURL&)),
- tqparent, TQT_SLOT(slotURLListDropped(TQDropEvent*, const KURL::List&, const KURL&)));
+ parent, TQT_SLOT(slotURLListDropped(TQDropEvent*, const KURL::List&, const KURL&)));
TQClipboard* clipboard = TQApplication::tqclipboard();
connect(clipboard, TQT_SIGNAL(dataChanged()),
@@ -667,9 +667,9 @@ void DolphinDetailsView::slotHeaderClicked(int /* section */)
}
}
-DolphinDetailsView::DolphinListViewItem::DolphinListViewItem(TQListView* tqparent,
+DolphinDetailsView::DolphinListViewItem::DolphinListViewItem(TQListView* parent,
KFileItem* fileItem) :
- KFileListViewItem(tqparent, fileItem)
+ KFileListViewItem(parent, fileItem)
{
const int iconSize = DolphinSettings::instance().detailsView()->iconSize();
KFileItem* info = fileInfo();
@@ -716,7 +716,7 @@ void DolphinDetailsView::DolphinListViewItem::paintCell(TQPainter* painter,
int tqalignment)
{
const TQListView* view = listView();
- const bool isActive = TQT_BASE_OBJECT(view->tqparent()) == TQT_BASE_OBJECT(Dolphin::mainWin().activeView());
+ const bool isActive = TQT_BASE_OBJECT(view->parent()) == TQT_BASE_OBJECT(Dolphin::mainWin().activeView());
if (isSelected()) {
// Per default the selection is drawn above the whole width of the item. As a consistent
// behavior with the icon view is wanted, only the the column containing the file name
@@ -729,8 +729,8 @@ void DolphinDetailsView::DolphinListViewItem::paintCell(TQPainter* painter,
if (column == 0) {
// draw the selection only on the first column
- TQListView* tqparent = listView();
- const int itemWidth = width(tqparent->fontMetrics(), tqparent, 0);
+ TQListView* parent = listView();
+ const int itemWidth = width(parent->fontMetrics(), parent, 0);
if (isActive) {
KFileListViewItem::paintCell(painter, tqcolorGroup, column, itemWidth, tqalignment);
}
@@ -761,9 +761,9 @@ void DolphinDetailsView::DolphinListViewItem::paintFocus(TQPainter* painter,
{
// draw the focus consistently with the selection (see implementation notes
// in DolphinListViewItem::paintCell)
- TQListView* tqparent = listView();
- int visibleWidth = width(tqparent->fontMetrics(), tqparent, 0);
- const int colWidth = tqparent->columnWidth(0);
+ TQListView* parent = listView();
+ int visibleWidth = width(parent->fontMetrics(), parent, 0);
+ const int colWidth = parent->columnWidth(0);
if (visibleWidth > colWidth) {
visibleWidth = colWidth;
}
diff --git a/src/dolphindetailsview.h b/src/dolphindetailsview.h
index 5945796..6b968ed 100644
--- a/src/dolphindetailsview.h
+++ b/src/dolphindetailsview.h
@@ -57,7 +57,7 @@ public:
GroupColumn = 5
};
- DolphinDetailsView(DolphinView* tqparent);
+ DolphinDetailsView(DolphinView* parent);
virtual ~DolphinDetailsView();
@@ -186,7 +186,7 @@ private slots:
private:
class DolphinListViewItem : public KFileListViewItem {
public:
- DolphinListViewItem(TQListView* tqparent,
+ DolphinListViewItem(TQListView* parent,
KFileItem* fileItem);
virtual ~DolphinListViewItem();
virtual void paintCell(TQPainter* painter,
diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp
index 5c6f87a..6c7b9a9 100644
--- a/src/dolphiniconsview.cpp
+++ b/src/dolphiniconsview.cpp
@@ -38,11 +38,11 @@
#include "dolphinsettings.h"
#include "dolphiniconsviewsettings.h"
-DolphinIconsView::DolphinIconsView(DolphinView* tqparent, LayoutMode layoutMode) :
- KFileIconView(tqparent, 0),
+DolphinIconsView::DolphinIconsView(DolphinView* parent, LayoutMode layoutMode) :
+ KFileIconView(parent, 0),
m_previewIconSize(-1),
m_layoutMode(layoutMode),
- m_dolphinView(tqparent)
+ m_dolphinView(parent)
{
setAcceptDrops(true);
setMode(KIconView::Execute);
@@ -62,7 +62,7 @@ DolphinIconsView::DolphinIconsView(DolphinView* tqparent, LayoutMode layoutMode)
connect(this, TQT_SIGNAL(itemRenamed(TQIconViewItem*, const TQString&)),
this, TQT_SLOT(slotItemRenamed(TQIconViewItem*, const TQString&)));
connect(this, TQT_SIGNAL(dropped(TQDropEvent*, const KURL::List&, const KURL&)),
- tqparent, TQT_SLOT(slotURLListDropped(TQDropEvent*, const KURL::List&, const KURL&)));
+ parent, TQT_SLOT(slotURLListDropped(TQDropEvent*, const KURL::List&, const KURL&)));
TQClipboard* clipboard = TQApplication::tqclipboard();
connect(clipboard, TQT_SIGNAL(dataChanged()),
diff --git a/src/dolphiniconsview.h b/src/dolphiniconsview.h
index 53b223b..5ce6d8b 100644
--- a/src/dolphiniconsview.h
+++ b/src/dolphiniconsview.h
@@ -47,7 +47,7 @@ public:
Previews
};
- DolphinIconsView(DolphinView *tqparent, LayoutMode layoutMode);
+ DolphinIconsView(DolphinView *parent, LayoutMode layoutMode);
virtual ~DolphinIconsView();
diff --git a/src/dolphinstatusbar.cpp b/src/dolphinstatusbar.cpp
index 9c0dcbd..d07c5d2 100644
--- a/src/dolphinstatusbar.cpp
+++ b/src/dolphinstatusbar.cpp
@@ -28,8 +28,8 @@
#include "statusbarmessagelabel.h"
#include "statusbarspaceinfo.h"
-DolphinStatusBar::DolphinStatusBar(DolphinView* tqparent) :
- TQHBox(tqparent),
+DolphinStatusBar::DolphinStatusBar(DolphinView* parent) :
+ TQHBox(parent),
m_messageLabel(0),
m_spaceInfo(0),
m_progressBar(0),
@@ -39,7 +39,7 @@ DolphinStatusBar::DolphinStatusBar(DolphinView* tqparent) :
m_messageLabel->tqsetSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed);
m_spaceInfo = new StatusBarSpaceInfo(this);
- m_spaceInfo->setURL(tqparent->url());
+ m_spaceInfo->setURL(parent->url());
m_progressText = new TQLabel(this);
m_progressText->hide();
@@ -56,7 +56,7 @@ DolphinStatusBar::DolphinStatusBar(DolphinView* tqparent) :
setMinimumHeight(size.height());
m_messageLabel->setMinimumTextHeight(size.height());
- connect(tqparent, TQT_SIGNAL(signalURLChanged(const KURL&)),
+ connect(parent, TQT_SIGNAL(signalURLChanged(const KURL&)),
this, TQT_SLOT(slotURLChanged(const KURL&)));
}
diff --git a/src/dolphinstatusbar.h b/src/dolphinstatusbar.h
index 28ff69d..531daa4 100644
--- a/src/dolphinstatusbar.h
+++ b/src/dolphinstatusbar.h
@@ -55,7 +55,7 @@ public:
Error
};
- DolphinStatusBar(DolphinView* tqparent = 0);
+ DolphinStatusBar(DolphinView* parent = 0);
virtual ~DolphinStatusBar();
/**
diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 845cc32..647b6fa 100644
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -41,11 +41,11 @@
#include "filterbar.h"
-DolphinView::DolphinView(TQWidget *tqparent,
+DolphinView::DolphinView(TQWidget *parent,
const KURL& url,
Mode mode,
bool showHiddenFiles) :
- TQWidget(tqparent),
+ TQWidget(parent),
m_refreshing(false),
m_showProgress(false),
m_mode(mode),
diff --git a/src/dolphinview.h b/src/dolphinview.h
index 7a67bc0..81043d4 100644
--- a/src/dolphinview.h
+++ b/src/dolphinview.h
@@ -103,7 +103,7 @@ public:
SortByDate = 2
};
- DolphinView(TQWidget* tqparent,
+ DolphinView(TQWidget* parent,
const KURL& url,
Mode mode = IconsView,
bool showHiddenFiles = false);
diff --git a/src/filterbar.cpp b/src/filterbar.cpp
index e008aa0..f34b763 100644
--- a/src/filterbar.cpp
+++ b/src/filterbar.cpp
@@ -30,8 +30,8 @@
#include "dolphin.h"
-FilterBar::FilterBar(TQWidget *tqparent, const char *name) :
- TQWidget(tqparent, name)
+FilterBar::FilterBar(TQWidget *parent, const char *name) :
+ TQWidget(parent, name)
{
const int gap = 3;
diff --git a/src/filterbar.h b/src/filterbar.h
index 6904531..d356d31 100644
--- a/src/filterbar.h
+++ b/src/filterbar.h
@@ -37,7 +37,7 @@ class FilterBar : public TQWidget
TQ_OBJECT
public:
- FilterBar(TQWidget *tqparent = 0, const char *name = 0);
+ FilterBar(TQWidget *parent = 0, const char *name = 0);
virtual ~FilterBar();
signals:
diff --git a/src/generalsettingspage.cpp b/src/generalsettingspage.cpp
index 0e4e6f1..f3fbebb 100644
--- a/src/generalsettingspage.cpp
+++ b/src/generalsettingspage.cpp
@@ -38,13 +38,13 @@
#include "dolphin.h"
#include "dolphinview.h"
-GeneralSettingsPage::GeneralSettingsPage(TQWidget* tqparent) :
- SettingsPageBase(tqparent),
+GeneralSettingsPage::GeneralSettingsPage(TQWidget* parent) :
+ SettingsPageBase(parent),
m_homeURL(0),
m_startSplit(0),
m_startEditable(0)
{
- TQVBoxLayout* topLayout = new TQVBoxLayout(tqparent, 2, KDialog::spacingHint());
+ TQVBoxLayout* topLayout = new TQVBoxLayout(parent, 2, KDialog::spacingHint());
const int spacing = KDialog::spacingHint();
const int margin = KDialog::marginHint();
@@ -52,7 +52,7 @@ GeneralSettingsPage::GeneralSettingsPage(TQWidget* tqparent) :
DolphinSettings& settings = DolphinSettings::instance();
- TQVBox* vBox = new TQVBox(tqparent);
+ TQVBox* vBox = new TQVBox(parent);
vBox->tqsetSizePolicy(sizePolicy);
vBox->setSpacing(spacing);
vBox->setMargin(margin);
diff --git a/src/generalsettingspage.h b/src/generalsettingspage.h
index 66c22da..b8d8623 100644
--- a/src/generalsettingspage.h
+++ b/src/generalsettingspage.h
@@ -39,7 +39,7 @@ class GeneralSettingsPage : public SettingsPageBase
TQ_OBJECT
public:
- GeneralSettingsPage(TQWidget* tqparent);
+ GeneralSettingsPage(TQWidget* parent);
virtual ~GeneralSettingsPage();
diff --git a/src/iconsviewsettingspage.cpp b/src/iconsviewsettingspage.cpp
index 5050db7..9271bbb 100644
--- a/src/iconsviewsettingspage.cpp
+++ b/src/iconsviewsettingspage.cpp
@@ -39,8 +39,8 @@
#define GRID_SPACING_INC 12
IconsViewSettingsPage::IconsViewSettingsPage(DolphinIconsView::LayoutMode mode,
- TQWidget* tqparent) :
- TQVBox(tqparent),
+ TQWidget* parent) :
+ TQVBox(parent),
m_mode(mode),
m_iconSizeSlider(0),
m_previewSizeSlider(0),
diff --git a/src/iconsviewsettingspage.h b/src/iconsviewsettingspage.h
index f883092..03453a2 100644
--- a/src/iconsviewsettingspage.h
+++ b/src/iconsviewsettingspage.h
@@ -56,7 +56,7 @@ class IconsViewSettingsPage : public TQVBox
public:
IconsViewSettingsPage(DolphinIconsView::LayoutMode mode,
- TQWidget* tqparent);
+ TQWidget* parent);
virtual ~IconsViewSettingsPage();
/**
diff --git a/src/infosidebarpage.cpp b/src/infosidebarpage.cpp
index 5d4fbbb..2766e1f 100644
--- a/src/infosidebarpage.cpp
+++ b/src/infosidebarpage.cpp
@@ -46,8 +46,8 @@
#include "pixmapviewer.h"
#include "dolphinsettings.h"
-InfoSidebarPage::InfoSidebarPage(TQWidget* tqparent) :
- SidebarPage(tqparent),
+InfoSidebarPage::InfoSidebarPage(TQWidget* parent) :
+ SidebarPage(parent),
m_multipleSelection(false),
m_pendingPreview(false),
m_timer(0),
@@ -529,9 +529,9 @@ void InfoSidebarPage::insertActions()
ServiceButton::ServiceButton(const TQIconSet& icon,
const TQString& text,
- TQWidget* tqparent,
+ TQWidget* parent,
int index) :
- TQPushButton(icon, text, tqparent),
+ TQPushButton(icon, text, parent),
m_hover(false),
m_index(index)
{
diff --git a/src/infosidebarpage.h b/src/infosidebarpage.h
index 47c7973..d9597b5 100644
--- a/src/infosidebarpage.h
+++ b/src/infosidebarpage.h
@@ -54,7 +54,7 @@ class InfoSidebarPage : public SidebarPage
TQ_OBJECT
public:
- InfoSidebarPage(TQWidget* tqparent);
+ InfoSidebarPage(TQWidget* parent);
virtual ~InfoSidebarPage();
protected:
@@ -173,7 +173,7 @@ class ServiceButton : public TQPushButton
public:
ServiceButton(const TQIconSet& icon,
const TQString& text,
- TQWidget* tqparent,
+ TQWidget* parent,
int index);
virtual ~ServiceButton();
diff --git a/src/pixmapviewer.cpp b/src/pixmapviewer.cpp
index 2a2354b..941b558 100644
--- a/src/pixmapviewer.cpp
+++ b/src/pixmapviewer.cpp
@@ -24,8 +24,8 @@
#include <kiconloader.h>
#include <tqpainter.h>
-PixmapViewer::PixmapViewer(TQWidget* tqparent) :
- TQWidget(tqparent)
+PixmapViewer::PixmapViewer(TQWidget* parent) :
+ TQWidget(parent)
{
setMinimumWidth(KIcon::SizeEnormous);
setMinimumWidth(KIcon::SizeEnormous);
diff --git a/src/pixmapviewer.h b/src/pixmapviewer.h
index 7783b13..61c2d47 100644
--- a/src/pixmapviewer.h
+++ b/src/pixmapviewer.h
@@ -35,7 +35,7 @@ class PixmapViewer : public TQWidget
Q_OBJECT
TQ_OBJECT
public:
- PixmapViewer(TQWidget* tqparent);
+ PixmapViewer(TQWidget* parent);
virtual ~PixmapViewer();
void setPixmap(const TQPixmap& pixmap);
const TQPixmap& pixmap() const { return m_pixmap; }
diff --git a/src/settingspagebase.cpp b/src/settingspagebase.cpp
index 3cec7db..cb6e7aa 100644
--- a/src/settingspagebase.cpp
+++ b/src/settingspagebase.cpp
@@ -20,8 +20,8 @@
#include "settingspagebase.h"
-SettingsPageBase::SettingsPageBase(TQWidget* tqparent) :
- TQWidget(tqparent)
+SettingsPageBase::SettingsPageBase(TQWidget* parent) :
+ TQWidget(parent)
{
}
diff --git a/src/settingspagebase.h b/src/settingspagebase.h
index 0d6e10e..35e8c49 100644
--- a/src/settingspagebase.h
+++ b/src/settingspagebase.h
@@ -34,7 +34,7 @@ class SettingsPageBase : public TQWidget
TQ_OBJECT
public:
- SettingsPageBase(TQWidget* tqparent);
+ SettingsPageBase(TQWidget* parent);
virtual ~SettingsPageBase();
/**
diff --git a/src/sidebarpage.cpp b/src/sidebarpage.cpp
index e490be8..99b1af4 100644
--- a/src/sidebarpage.cpp
+++ b/src/sidebarpage.cpp
@@ -20,8 +20,8 @@
#include "sidebarpage.h"
#include "dolphin.h"
-SidebarPage::SidebarPage(TQWidget* tqparent) :
- TQWidget(tqparent)
+SidebarPage::SidebarPage(TQWidget* parent) :
+ TQWidget(parent)
{
connect(&Dolphin::mainWin(), TQT_SIGNAL(activeViewChanged()),
this, TQT_SLOT(activeViewChanged()));
diff --git a/src/sidebarpage.h b/src/sidebarpage.h
index 2346ce0..2c800ae 100644
--- a/src/sidebarpage.h
+++ b/src/sidebarpage.h
@@ -36,7 +36,7 @@ class SidebarPage : public TQWidget
TQ_OBJECT
public:
- SidebarPage(TQWidget* tqparent);
+ SidebarPage(TQWidget* parent);
virtual ~SidebarPage();
protected slots:
diff --git a/src/sidebars.cpp b/src/sidebars.cpp
index 551c4af..11f1ca1 100644
--- a/src/sidebars.cpp
+++ b/src/sidebars.cpp
@@ -36,10 +36,10 @@
/**
*
- * @param tqparent
+ * @param parent
*/
-leftSidebar::leftSidebar(TQWidget* tqparent) :
- TQWidget(tqparent),
+leftSidebar::leftSidebar(TQWidget* parent) :
+ TQWidget(parent),
m_pagesSelector(0),
m_page(0),
m_tqlayout(0)
@@ -114,8 +114,8 @@ int leftSidebar::indexForName(const TQString& name) const
return 0;
}
-rightSidebar::rightSidebar(TQWidget* tqparent) :
- TQWidget(tqparent),
+rightSidebar::rightSidebar(TQWidget* parent) :
+ TQWidget(parent),
m_pagesSelector(0),
m_page(0),
m_tqlayout(0)
diff --git a/src/sidebars.h b/src/sidebars.h
index afdaa13..7e65f20 100644
--- a/src/sidebars.h
+++ b/src/sidebars.h
@@ -37,7 +37,7 @@ class leftSidebar : public TQWidget
TQ_OBJECT
public:
- leftSidebar(TQWidget* tqparent);
+ leftSidebar(TQWidget* parent);
virtual ~leftSidebar();
virtual TQSize tqsizeHint() const;
@@ -45,7 +45,7 @@ class leftSidebar : public TQWidget
signals:
/**
* The user selected an item on sidebar widget and item has
- * URL property, so inform the tqparent to go to this URL;
+ * URL property, so inform the parent to go to this URL;
*/
void urlChanged(const KURL& url);
@@ -66,7 +66,7 @@ class rightSidebar : public TQWidget
TQ_OBJECT
public:
- rightSidebar(TQWidget* tqparent);
+ rightSidebar(TQWidget* parent);
virtual ~rightSidebar();
virtual TQSize tqsizeHint() const;
@@ -74,7 +74,7 @@ class rightSidebar : public TQWidget
signals:
/**
* The user selected an item on sidebar widget and item has
- * URL property, so inform the tqparent togo to this URL;
+ * URL property, so inform the parent togo to this URL;
*/
void urlChanged(const KURL& url);
diff --git a/src/statusbarmessagelabel.cpp b/src/statusbarmessagelabel.cpp
index 5026795..11f74cc 100644
--- a/src/statusbarmessagelabel.cpp
+++ b/src/statusbarmessagelabel.cpp
@@ -25,8 +25,8 @@
#include <kiconloader.h>
#include <kglobalsettings.h>
-StatusBarMessageLabel::StatusBarMessageLabel(TQWidget* tqparent) :
- TQWidget(tqparent),
+StatusBarMessageLabel::StatusBarMessageLabel(TQWidget* parent) :
+ TQWidget(parent),
m_type(DolphinStatusBar::Default),
m_state(Default),
m_illumination(0),
diff --git a/src/statusbarmessagelabel.h b/src/statusbarmessagelabel.h
index 0c7c31f..1dc80a0 100644
--- a/src/statusbarmessagelabel.h
+++ b/src/statusbarmessagelabel.h
@@ -43,7 +43,7 @@ class StatusBarMessageLabel : public TQWidget
TQ_OBJECT
public:
- StatusBarMessageLabel(TQWidget* tqparent);
+ StatusBarMessageLabel(TQWidget* parent);
virtual ~StatusBarMessageLabel();
void setType(DolphinStatusBar::Type type);
diff --git a/src/statusbarspaceinfo.cpp b/src/statusbarspaceinfo.cpp
index cf70190..87feaa3 100644
--- a/src/statusbarspaceinfo.cpp
+++ b/src/statusbarspaceinfo.cpp
@@ -27,8 +27,8 @@
#include <klocale.h>
#include <kio/job.h>
-StatusBarSpaceInfo::StatusBarSpaceInfo(TQWidget* tqparent) :
- TQWidget(tqparent),
+StatusBarSpaceInfo::StatusBarSpaceInfo(TQWidget* parent) :
+ TQWidget(parent),
m_gettingSize(false),
m_kBSize(0),
m_kBAvailable(0)
diff --git a/src/statusbarspaceinfo.h b/src/statusbarspaceinfo.h
index cba7f60..3752524 100644
--- a/src/statusbarspaceinfo.h
+++ b/src/statusbarspaceinfo.h
@@ -37,7 +37,7 @@ class StatusBarSpaceInfo : public TQWidget
TQ_OBJECT
public:
- StatusBarSpaceInfo(TQWidget* tqparent);
+ StatusBarSpaceInfo(TQWidget* parent);
virtual ~StatusBarSpaceInfo();
void setURL(const KURL& url);
diff --git a/src/urlbutton.cpp b/src/urlbutton.cpp
index 73f098a..a48c833 100644
--- a/src/urlbutton.cpp
+++ b/src/urlbutton.cpp
@@ -32,16 +32,16 @@
#include "dolphin.h"
-URLButton::URLButton(URLNavigator* tqparent)
-: TQPushButton(tqparent),
+URLButton::URLButton(URLNavigator* parent)
+: TQPushButton(parent),
m_displayHint(0),
- m_urlNavigator(tqparent)
+ m_urlNavigator(parent)
{
setFocusPolicy(TQ_NoFocus);
tqsetSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Fixed);
- setMinimumHeight(tqparent->minimumHeight());
+ setMinimumHeight(parent->minimumHeight());
- connect(this, TQT_SIGNAL(clicked()), tqparent, TQT_SLOT(slotRequestActivation()));
+ connect(this, TQT_SIGNAL(clicked()), parent, TQT_SLOT(slotRequestActivation()));
connect(&Dolphin::mainWin(), TQT_SIGNAL(activeViewChanged()),
this, TQT_SLOT(update()));
}
diff --git a/src/urlbutton.h b/src/urlbutton.h
index 0dc57a2..8ee4e16 100644
--- a/src/urlbutton.h
+++ b/src/urlbutton.h
@@ -41,7 +41,7 @@ class URLButton : public TQPushButton
TQ_OBJECT
public:
- URLButton(URLNavigator* tqparent);
+ URLButton(URLNavigator* parent);
virtual ~URLButton();
URLNavigator* urlNavigator() const;
diff --git a/src/urlnavigatorbutton.cpp b/src/urlnavigatorbutton.cpp
index bc0e7b5..8d893f9 100644
--- a/src/urlnavigatorbutton.cpp
+++ b/src/urlnavigatorbutton.cpp
@@ -38,8 +38,8 @@
#include "dolphinview.h"
#include "dolphin.h"
-URLNavigatorButton::URLNavigatorButton(int index, URLNavigator* tqparent) :
- URLButton(tqparent),
+URLNavigatorButton::URLNavigatorButton(int index, URLNavigator* parent) :
+ URLButton(parent),
m_index(-1),
m_listJob(0)
{
@@ -108,7 +108,7 @@ void URLNavigatorButton::drawButton(TQPainter* painter)
foregroundColor = KGlobalSettings::buttonTextColor();
}
- // dimm the colors if the tqparent view does not have the focus
+ // dimm the colors if the parent view does not have the focus
const DolphinView* parentView = urlNavigator()->dolphinView();
const Dolphin& dolphin = Dolphin::mainWin();
diff --git a/src/urlnavigatorbutton.h b/src/urlnavigatorbutton.h
index 82eb11f..5a82803 100644
--- a/src/urlnavigatorbutton.h
+++ b/src/urlnavigatorbutton.h
@@ -49,7 +49,7 @@ class URLNavigatorButton : public URLButton
TQ_OBJECT
public:
- URLNavigatorButton(int index, URLNavigator* tqparent = 0);
+ URLNavigatorButton(int index, URLNavigator* parent = 0);
virtual ~URLNavigatorButton();
void setIndex(int index);
int index() const;
diff --git a/src/viewsettingspage.cpp b/src/viewsettingspage.cpp
index 789a882..fe6e8bd 100644
--- a/src/viewsettingspage.cpp
+++ b/src/viewsettingspage.cpp
@@ -27,15 +27,15 @@
#include "iconsviewsettingspage.h"
#include "detailsviewsettingspage.h"
-ViewSettingsPage::ViewSettingsPage(TQWidget *tqparent) :
- SettingsPageBase(tqparent),
+ViewSettingsPage::ViewSettingsPage(TQWidget *parent) :
+ SettingsPageBase(parent),
m_iconsPage(0),
m_detailsPage(0),
m_previewsPage(0)
{
- TQVBoxLayout* topLayout = new TQVBoxLayout(tqparent, 0, KDialog::spacingHint());
+ TQVBoxLayout* topLayout = new TQVBoxLayout(parent, 0, KDialog::spacingHint());
- TQTabWidget* tabWidget = new TQTabWidget(tqparent);
+ TQTabWidget* tabWidget = new TQTabWidget(parent);
// initialize 'Icons' tab
m_iconsPage = new IconsViewSettingsPage(DolphinIconsView::Icons, tabWidget);
diff --git a/src/viewsettingspage.h b/src/viewsettingspage.h
index 81d00ae..2d59774 100644
--- a/src/viewsettingspage.h
+++ b/src/viewsettingspage.h
@@ -40,7 +40,7 @@ class ViewSettingsPage : public SettingsPageBase
TQ_OBJECT
public:
- ViewSettingsPage(TQWidget* tqparent);
+ ViewSettingsPage(TQWidget* parent);
virtual ~ViewSettingsPage();