Rename obsolete tq methods to standard names

(cherry picked from commit 6092f8e6078f2b4cd70a34a6fe44bb1f98e5305b)

14 files changed, 45 insertions, 45 deletions

diff --git a/src/bookmarkssidebarpage.cpp b/src/bookmarkssidebarpage.cpp
index c5f0408..0bbb8dc 100644
--- a/src/bookmarkssidebarpage.cpp
+++ b/src/bookmarkssidebarpage.cpp
@@ -38,11 +38,11 @@
 BookmarksSidebarPage::BookmarksSidebarPage(TQWidget* parent) :
     SidebarPage(parent)
 {
-    TQVBoxLayout* tqlayout = new TQVBoxLayout(this);
+    TQVBoxLayout* layout = new TQVBoxLayout(this);
     m_bookmarksList = new BookmarksListBox(this);
     m_bookmarksList->setPaletteBackgroundColor(colorGroup().background());
 
-    tqlayout->addWidget(m_bookmarksList);
+    layout->addWidget(m_bookmarksList);
     connect(m_bookmarksList, TQT_SIGNAL(mouseButtonClicked(int, TQListBoxItem*, const TQPoint&)),
             this, TQT_SLOT(slotMouseButtonClicked(int, TQListBoxItem*)));
     connect(m_bookmarksList, TQT_SIGNAL(contextMenuRequested(TQListBoxItem*, const TQPoint&)),
diff --git a/src/detailsviewsettingspage.cpp b/src/detailsviewsettingspage.cpp
index e4d0953..f5e2bd7 100644
--- a/src/detailsviewsettingspage.cpp
+++ b/src/detailsviewsettingspage.cpp
@@ -115,7 +115,7 @@ DetailsViewSettingsPage::DetailsViewSettingsPage(TQWidget *parent) :
     m_fontSizeBox->setValue(settings->fontSize());
 
     // Add a dummy widget with no restriction regarding
-    // a vertical resizing. This assures that the dialog tqlayout
+    // a vertical resizing. This assures that the dialog layout
     // is not stretched vertically.
     new TQWidget(this);
 }
diff --git a/src/dolphin.cpp b/src/dolphin.cpp
index f91e028..8f2bc61 100644
--- a/src/dolphin.cpp
+++ b/src/dolphin.cpp
@@ -642,7 +642,7 @@ void Dolphin::cut()
     m_clipboardContainsCutData = true;
     TQDragObject* data = new KURLDrag(m_activeView->selectedURLs(),
                                      widget());
-    TQApplication::tqclipboard()->setData(data);
+    TQApplication::clipboard()->setData(data);
 }
 
 void Dolphin::copy()
@@ -650,12 +650,12 @@ void Dolphin::copy()
     m_clipboardContainsCutData = false;
     TQDragObject* data = new KURLDrag(m_activeView->selectedURLs(),
                                      widget());
-    TQApplication::tqclipboard()->setData(data);
+    TQApplication::clipboard()->setData(data);
 }
 
 void Dolphin::paste()
 {
-    TQClipboard* clipboard = TQApplication::tqclipboard();
+    TQClipboard* clipboard = TQApplication::clipboard();
     TQMimeSource* data = clipboard->data();
     if (!KURLDrag::canDecode(data)) {
         return;
@@ -703,7 +703,7 @@ void Dolphin::updatePasteAction()
     }
 
     TQString text(i18n("Paste"));
-    TQClipboard* clipboard = TQApplication::tqclipboard();
+    TQClipboard* clipboard = TQApplication::clipboard();
     TQMimeSource* data = clipboard->data();
     if (KURLDrag::canDecode(data)) {
         pasteAction->setEnabled(true);
@@ -1144,7 +1144,7 @@ void Dolphin::init()
     stateChanged("new_file");
     setAutoSaveSettings();
 
-    TQClipboard* clipboard = TQApplication::tqclipboard();
+    TQClipboard* clipboard = TQApplication::clipboard();
     connect(clipboard, TQT_SIGNAL(dataChanged()),
             this, TQT_SLOT(updatePasteAction()));
     updatePasteAction();
diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp
index 2442397..db5016e 100644
--- a/src/dolphindetailsview.cpp
+++ b/src/dolphindetailsview.cpp
@@ -78,7 +78,7 @@ DolphinDetailsView::DolphinDetailsView(DolphinView* parent) :
     connect(this, TQT_SIGNAL(dropped(TQDropEvent*, const KURL::List&, const KURL&)),
             parent, TQT_SLOT(slotURLListDropped(TQDropEvent*, const KURL::List&, const KURL&)));
 
-    TQClipboard* clipboard = TQApplication::tqclipboard();
+    TQClipboard* clipboard = TQApplication::clipboard();
     connect(clipboard, TQT_SIGNAL(dataChanged()),
             this, TQT_SLOT(slotUpdateDisabledItems()));
 
@@ -465,7 +465,7 @@ void DolphinDetailsView::drawRubber()
 
     TQPoint point(m_rubber->x(), m_rubber->y());
     point = contentsToViewport(point);
-    tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, &p,
+    style().tqdrawPrimitive(TQStyle::PE_FocusRect, &p,
                           TQRect(point.x(), point.y(), m_rubber->width(), m_rubber->height()),
                           colorGroup(), TQStyle::Style_Default, colorGroup().base());
     p.end();
diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp
index 1a09dd3..1fe5dec 100644
--- a/src/dolphiniconsview.cpp
+++ b/src/dolphiniconsview.cpp
@@ -64,7 +64,7 @@ DolphinIconsView::DolphinIconsView(DolphinView* parent, LayoutMode layoutMode) :
     connect(this, TQT_SIGNAL(dropped(TQDropEvent*, const KURL::List&, const KURL&)),
             parent, TQT_SLOT(slotURLListDropped(TQDropEvent*, const KURL::List&, const KURL&)));
 
-    TQClipboard* clipboard = TQApplication::tqclipboard();
+    TQClipboard* clipboard = TQApplication::clipboard();
     connect(clipboard, TQT_SIGNAL(dataChanged()),
             this, TQT_SLOT(slotUpdateDisabledItems()));
 
diff --git a/src/dolphiniconsview.h b/src/dolphiniconsview.h
index 5ce6d8b..e64d73d 100644
--- a/src/dolphiniconsview.h
+++ b/src/dolphiniconsview.h
@@ -83,7 +83,7 @@ public:
 
 public slots:
     /**
-     * Bypass a tqlayout issue in KFileIconView in combination with previews.
+     * Bypass a layout issue in KFileIconView in combination with previews.
      * @see KFileIconView::arrangeItemsInGrid
      */
     virtual void arrangeItemsInGrid(bool updated = true);
diff --git a/src/dolphiniconsviewsettings.h b/src/dolphiniconsviewsettings.h
index 5c39adf..1642117 100644
--- a/src/dolphiniconsviewsettings.h
+++ b/src/dolphiniconsviewsettings.h
@@ -30,7 +30,7 @@
  * @brief Contains the settings for the icons view.
  *
  * The following properties are stored:
- * - tqlayout mode (icons or previews)
+ * - layout mode (icons or previews)
  * - icon size
  * - preview size
  * - grid width, height and spacing
diff --git a/src/filterbar.cpp b/src/filterbar.cpp
index f34b763..1db6a4e 100644
--- a/src/filterbar.cpp
+++ b/src/filterbar.cpp
@@ -38,21 +38,21 @@ FilterBar::FilterBar(TQWidget *parent, const char *name) :
     TQVBoxLayout* foo = new TQVBoxLayout(this);
     foo->addSpacing(gap);
 
-    TQHBoxLayout* tqlayout = new TQHBoxLayout(foo);
-    tqlayout->addSpacing(gap);
+    TQHBoxLayout* layout = new TQHBoxLayout(foo);
+    layout->addSpacing(gap);
 
     m_filter = new TQLabel(i18n("Filter:"), this);
-    tqlayout->addWidget(m_filter);
-    tqlayout->addSpacing(KDialog::spacingHint());
+    layout->addWidget(m_filter);
+    layout->addSpacing(KDialog::spacingHint());
 
     m_filterInput = new KLineEdit(this);
-    tqlayout->addWidget(m_filterInput);
+    layout->addWidget(m_filterInput);
 
     m_close = new KPushButton(this);
     m_close->setIconSet(SmallIcon("fileclose"));
     m_close->setFlat(true);
-    tqlayout->addWidget(m_close);
-    tqlayout->addSpacing(gap);
+    layout->addWidget(m_close);
+    layout->addSpacing(gap);
 
     connect(m_filterInput, TQT_SIGNAL(textChanged(const TQString&)),
             this, TQT_SIGNAL(signalFilterChanged(const TQString&)));
diff --git a/src/generalsettingspage.cpp b/src/generalsettingspage.cpp
index cc6acf6..bec9ac5 100644
--- a/src/generalsettingspage.cpp
+++ b/src/generalsettingspage.cpp
@@ -112,7 +112,7 @@ GeneralSettingsPage::GeneralSettingsPage(TQWidget* parent) :
     m_saveView->setChecked(settings.isSaveView());
 
     // Add a dummy widget with no restriction regarding
-    // a vertical resizing. This assures that the dialog tqlayout
+    // a vertical resizing. This assures that the dialog layout
     // is not stretched vertically.
     new TQWidget(vBox);
 
diff --git a/src/iconsviewsettingspage.cpp b/src/iconsviewsettingspage.cpp
index a3a11ed..570b961 100644
--- a/src/iconsviewsettingspage.cpp
+++ b/src/iconsviewsettingspage.cpp
@@ -153,7 +153,7 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinIconsView::LayoutMode mode,
     m_gridSpacingBox->setCurrentItem((settings->gridSpacing() - GRID_SPACING_BASE) / GRID_SPACING_INC);
 
     // Add a dummy widget with no restriction regarding
-    // a vertical resizing. This assures that the dialog tqlayout
+    // a vertical resizing. This assures that the dialog layout
     // is not stretched vertically.
     new TQWidget(this);
 
diff --git a/src/infosidebarpage.cpp b/src/infosidebarpage.cpp
index f01c254..ad9a46e 100644
--- a/src/infosidebarpage.cpp
+++ b/src/infosidebarpage.cpp
@@ -63,8 +63,8 @@ InfoSidebarPage::InfoSidebarPage(TQWidget* parent) :
     connect(m_timer, TQT_SIGNAL(timeout()),
             this, TQT_SLOT(slotTimeout()));
 
-    TQVBoxLayout* tqlayout = new TQVBoxLayout(this);
-    tqlayout->setSpacing(spacing);
+    TQVBoxLayout* layout = new TQVBoxLayout(this);
+    layout->setSpacing(spacing);
 
     // preview
     m_preview = new PixmapViewer(this);
@@ -97,14 +97,14 @@ InfoSidebarPage::InfoSidebarPage(TQWidget* parent) :
     // This assures that information is always top aligned.
     TQWidget* dummy = new TQWidget(this);
 
-    tqlayout->addItem(new TQSpacerItem(spacing, spacing, TQSizePolicy::Preferred, TQSizePolicy::Fixed));
-    tqlayout->addWidget(m_preview);
-    tqlayout->addWidget(m_name);
-    tqlayout->addWidget(sep1);
-    tqlayout->addWidget(m_infoGrid);
-    tqlayout->addWidget(sep2);
-    tqlayout->addWidget(m_actionBox);
-    tqlayout->addWidget(dummy);
+    layout->addItem(new TQSpacerItem(spacing, spacing, TQSizePolicy::Preferred, TQSizePolicy::Fixed));
+    layout->addWidget(m_preview);
+    layout->addWidget(m_name);
+    layout->addWidget(sep1);
+    layout->addWidget(m_infoGrid);
+    layout->addWidget(sep2);
+    layout->addWidget(m_actionBox);
+    layout->addWidget(dummy);
 
     connect(&Dolphin::mainWin(), TQT_SIGNAL(selectionChanged()),
             this, TQT_SLOT(showItemInfo()));
diff --git a/src/itemeffectsmanager.cpp b/src/itemeffectsmanager.cpp
index 06cdc4b..28db315 100644
--- a/src/itemeffectsmanager.cpp
+++ b/src/itemeffectsmanager.cpp
@@ -141,7 +141,7 @@ void ItemEffectsManager::updateDisabledItems()
         return;
     }
 
-    TQClipboard* clipboard = TQApplication::tqclipboard();
+    TQClipboard* clipboard = TQApplication::clipboard();
     TQMimeSource* data = clipboard->data();
     if (!KURLDrag::canDecode(data)) {
         return;
diff --git a/src/sidebars.cpp b/src/sidebars.cpp
index 463d63d..114c6ed 100644
--- a/src/sidebars.cpp
+++ b/src/sidebars.cpp
@@ -42,16 +42,16 @@ leftSidebar::leftSidebar(TQWidget* parent) :
         TQWidget(parent),
         m_pagesSelector(0),
         m_page(0),
-        m_tqlayout(0)
+        m_layout(0)
 {
-    m_tqlayout = new TQVBoxLayout(this);
+    m_layout = new TQVBoxLayout(this);
 
     m_pagesSelector = new TQComboBox(this);
     m_pagesSelector->insertItem(i18n("Bookmarks"));
     m_pagesSelector->insertItem(i18n("Information"));
 
     // Assure that the combo box has the same height as the URL navigator for
-    // a clean tqlayout.
+    // a clean layout.
     // TODO: the following 2 lines have been copied from the URLNavigator
     // constructor (-> provide a shared height setting?)
     //TQFontMetrics fontMetrics(font());
@@ -61,7 +61,7 @@ leftSidebar::leftSidebar(TQWidget* parent) :
     leftSidebarSettings* settings = DolphinSettings::instance().leftsidebar();
     const int selectedIndex = indexForName(settings->selectedPage());
     m_pagesSelector->setCurrentItem(selectedIndex);
-    m_tqlayout->addWidget(m_pagesSelector);
+    m_layout->addWidget(m_pagesSelector);
 
     createPage(selectedIndex);
 
@@ -95,7 +95,7 @@ void leftSidebar::createPage(int index)
         default: break;
     }
 
-    m_tqlayout->addWidget(m_page);
+    m_layout->addWidget(m_page);
     m_page->show();
 
     leftSidebarSettings* settings = DolphinSettings::instance().leftsidebar();
@@ -118,16 +118,16 @@ rightSidebar::rightSidebar(TQWidget* parent) :
         TQWidget(parent),
         m_pagesSelector(0),
         m_page(0),
-        m_tqlayout(0)
+        m_layout(0)
 {
-    m_tqlayout = new TQVBoxLayout(this);
+    m_layout = new TQVBoxLayout(this);
 
     m_pagesSelector = new TQComboBox(this);
     m_pagesSelector->insertItem(i18n("Bookmarks"));
     m_pagesSelector->insertItem(i18n("Information"));
 
     // Assure that the combo box has the same height as the URL navigator for
-    // a clean tqlayout.
+    // a clean layout.
     // TODO: the following 2 lines have been copied from the URLNavigator
     // constructor (-> provide a shared height setting?)
     TQFontMetrics fontMetrics(font());
@@ -136,7 +136,7 @@ rightSidebar::rightSidebar(TQWidget* parent) :
     rightSidebarSettings* settings = DolphinSettings::instance().rightsidebar();
     const int selectedIndex = indexForName(settings->selectedPage());
     m_pagesSelector->setCurrentItem(selectedIndex);
-    m_tqlayout->addWidget(m_pagesSelector);
+    m_layout->addWidget(m_pagesSelector);
 
     createPage(selectedIndex);
 
@@ -170,7 +170,7 @@ void rightSidebar::createPage(int index)
         default: break;
     }
 
-    m_tqlayout->addWidget(m_page);
+    m_layout->addWidget(m_page);
     m_page->show();
 
     rightSidebarSettings* settings = DolphinSettings::instance().rightsidebar();
diff --git a/src/sidebars.h b/src/sidebars.h
index 5c11461..e1da72f 100644
--- a/src/sidebars.h
+++ b/src/sidebars.h
@@ -57,7 +57,7 @@ class leftSidebar : public TQWidget
 
         TQComboBox* m_pagesSelector;
         SidebarPage* m_page;
-        TQVBoxLayout* m_tqlayout;
+        TQVBoxLayout* m_layout;
 };
 
 class rightSidebar : public TQWidget
@@ -86,7 +86,7 @@ class rightSidebar : public TQWidget
 
         TQComboBox* m_pagesSelector;
         SidebarPage* m_page;
-        TQVBoxLayout* m_tqlayout;
+        TQVBoxLayout* m_layout;
 };
 
 #endif // _SIDEBARS_H_