From b45817ccac7985d286c754b95f40eda5e105efda Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 16 Dec 2011 09:55:43 -0600
Subject: Revert "Rename a number of old tq methods that are no longer tq
 specific"

This reverts commit 59d9dbf810de71334e1173fa7dda59209c10032c.
---
 src/sidebars.cpp | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'src/sidebars.cpp')

diff --git a/src/sidebars.cpp b/src/sidebars.cpp
index 02f74a0..11f1ca1 100644
--- a/src/sidebars.cpp
+++ b/src/sidebars.cpp
@@ -20,7 +20,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpixmap.h>
 #include <kiconloader.h>
 #include <klocale.h>
@@ -42,16 +42,16 @@ leftSidebar::leftSidebar(TQWidget* parent) :
         TQWidget(parent),
         m_pagesSelector(0),
         m_page(0),
-        m_layout(0)
+        m_tqlayout(0)
 {
-    m_layout = new TQVBoxLayout(this);
+    m_tqlayout = 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 layout.
+    // a clean tqlayout.
     // 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_layout->addWidget(m_pagesSelector);
+    m_tqlayout->addWidget(m_pagesSelector);
 
     createPage(selectedIndex);
 
@@ -73,9 +73,9 @@ leftSidebar::~leftSidebar()
 {
 }
 
-TQSize leftSidebar::sizeHint() const
+TQSize leftSidebar::tqsizeHint() const
 {
-    TQSize size(TQWidget::sizeHint());
+    TQSize size(TQWidget::tqsizeHint());
 
     leftSidebarSettings* settings = DolphinSettings::instance().leftsidebar();
     size.setWidth(settings->width());
@@ -95,7 +95,7 @@ void leftSidebar::createPage(int index)
         default: break;
     }
 
-    m_layout->addWidget(m_page);
+    m_tqlayout->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_layout(0)
+        m_tqlayout(0)
 {
-    m_layout = new TQVBoxLayout(this);
+    m_tqlayout = 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 layout.
+    // a clean tqlayout.
     // 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_layout->addWidget(m_pagesSelector);
+    m_tqlayout->addWidget(m_pagesSelector);
 
     createPage(selectedIndex);
 
@@ -148,9 +148,9 @@ rightSidebar::~rightSidebar()
 {
 }
 
-TQSize rightSidebar::sizeHint() const
+TQSize rightSidebar::tqsizeHint() const
 {
-    TQSize size(TQWidget::sizeHint());
+    TQSize size(TQWidget::tqsizeHint());
 
     rightSidebarSettings* settings = DolphinSettings::instance().rightsidebar();
     size.setWidth(settings->width());
@@ -170,7 +170,7 @@ void rightSidebar::createPage(int index)
         default: break;
     }
 
-    m_layout->addWidget(m_page);
+    m_tqlayout->addWidget(m_page);
     m_page->show();
 
     rightSidebarSettings* settings = DolphinSettings::instance().rightsidebar();
-- 
cgit v1.2.3