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

This reverts commit 2b0e1de2ffcca7bb93f1fd8ddd32f74041d0d076.
---
 kommander/widgets/richtexteditor.cpp | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'kommander/widgets/richtexteditor.cpp')

diff --git a/kommander/widgets/richtexteditor.cpp b/kommander/widgets/richtexteditor.cpp
index 04014c17..5c6c530c 100644
--- a/kommander/widgets/richtexteditor.cpp
+++ b/kommander/widgets/richtexteditor.cpp
@@ -17,12 +17,12 @@
 #include <klocale.h>
 
 /* QT INCLUDES */
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqevent.h>
-#include <textedit.h>
+#include <tqtextedit.h>
 #include <tqframe.h>
 #include <tqwidget.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtoolbutton.h>
 #include <tqpixmap.h>
 #include <tqhbuttongroup.h>
@@ -61,11 +61,11 @@ RichTextEditor::RichTextEditor(TQWidget *a_parent, const char *a_name)
 	m_textedit = new TQTextEdit(this, "editor");
 	m_textedit->setTextFormat(RichText);
 
-	// layout the widgets
-	TQVBoxLayout *layout = new TQVBoxLayout(this);
-	layout->addWidget(m_toolbar);
-	layout->addWidget(m_textedit);
-	layout->setSpacing(1);
+	// tqlayout the widgets
+	TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
+	tqlayout->addWidget(m_toolbar);
+	tqlayout->addWidget(m_textedit);
+	tqlayout->setSpacing(1);
 
 	// setup buttons
 	TQHBoxLayout *tbLayout = new TQHBoxLayout(m_toolbar);
@@ -182,11 +182,11 @@ void RichTextEditor::textAlign(int a_id)
 {
   TQToolButton *b = (TQToolButton *)m_alignGroup->find(a_id);
   if(b == m_buttonTextLeft)
-    m_textedit->setAlignment(TQt::AlignLeft);
+    m_textedit->tqsetAlignment(TQt::AlignLeft);
   else if(b == m_buttonTextCenter)
-    m_textedit->setAlignment(TQt::AlignCenter);
+    m_textedit->tqsetAlignment(TQt::AlignCenter);
   else if(b == m_buttonTextRight)
-    m_textedit->setAlignment(TQt::AlignRight);
+    m_textedit->tqsetAlignment(TQt::AlignRight);
 }
 
 void RichTextEditor::fontChanged(const TQFont &a_font)
@@ -196,13 +196,13 @@ void RichTextEditor::fontChanged(const TQFont &a_font)
   m_buttonTextUnder->setOn(a_font.underline());
 }
 
-void RichTextEditor::alignmentChanged(int a_alignment)
+void RichTextEditor::alignmentChanged(int a_tqalignment)
 {
-  if((a_alignment == AlignAuto) || (a_alignment & AlignLeft)) 
+  if((a_tqalignment == AlignAuto) || (a_tqalignment & AlignLeft)) 
     m_buttonTextLeft->setOn(true);
-  else if(a_alignment & AlignHCenter) 
+  else if(a_tqalignment & AlignHCenter) 
     m_buttonTextCenter->setOn(true);
-  else if(a_alignment & AlignRight) 
+  else if(a_tqalignment & AlignRight) 
     m_buttonTextRight->setOn(true);
 }
 
-- 
cgit v1.2.1