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

This reverts commit 4faf11eccc5f08d2aa0540157d6eff80b7cdb02a.
---
 src/gui/widgets/CollapsingFrame.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/gui/widgets/CollapsingFrame.cpp')

diff --git a/src/gui/widgets/CollapsingFrame.cpp b/src/gui/widgets/CollapsingFrame.cpp
index 78404e1..56c530b 100644
--- a/src/gui/widgets/CollapsingFrame.cpp
+++ b/src/gui/widgets/CollapsingFrame.cpp
@@ -30,7 +30,7 @@
 #include <kglobal.h>
 #include <tqfont.h>
 #include <tqframe.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpixmap.h>
 #include <tqstring.h>
 #include <tqtoolbutton.h>
@@ -47,7 +47,7 @@ CollapsingFrame::CollapsingFrame(TQString label, TQWidget *parent, const char *n
         m_fill(false),
         m_collapsed(false)
 {
-    m_layout = new TQGridLayout(this, 3, 3, 0, 0);
+    m_tqlayout = new TQGridLayout(this, 3, 3, 0, 0);
 
     m_toggleButton = new TQToolButton(this);
     m_toggleButton->setTextLabel(label);
@@ -66,7 +66,7 @@ CollapsingFrame::CollapsingFrame(TQString label, TQWidget *parent, const char *n
 
     connect(m_toggleButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(toggle()));
 
-    m_layout->addMultiCellWidget(m_toggleButton, 0, 0, 0, 2);
+    m_tqlayout->addMultiCellWidget(m_toggleButton, 0, 0, 0, 2);
 }
 
 CollapsingFrame::~CollapsingFrame()
@@ -96,9 +96,9 @@ CollapsingFrame::setWidget(TQWidget *widget)
     assert(!m_widget);
     m_widget = widget;
     if (m_fill) {
-        m_layout->addMultiCellWidget(widget, 1, 1, 0, 2);
+        m_tqlayout->addMultiCellWidget(widget, 1, 1, 0, 2);
     } else {
-        m_layout->addWidget(widget, 1, 1);
+        m_tqlayout->addWidget(widget, 1, 1);
     }
 
     bool expanded = true;
-- 
cgit v1.2.3