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

This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.
---
 .../komposer/plugins/default/defaulteditor.cpp     | 22 +++++++++++-----------
 .../komposer/plugins/default/defaulteditorui.rc    |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'libtdepim/komposer/plugins')

diff --git a/libtdepim/komposer/plugins/default/defaulteditor.cpp b/libtdepim/komposer/plugins/default/defaulteditor.cpp
index 91dda85c3..27018ce5a 100644
--- a/libtdepim/komposer/plugins/default/defaulteditor.cpp
+++ b/libtdepim/komposer/plugins/default/defaulteditor.cpp
@@ -39,7 +39,7 @@
 #include <kreplacedialog.h>
 #include <kreplace.h>
 
-#include <textedit.h>
+#include <tqtextedit.h>
 #include <tqwidget.h>
 
 typedef KGenericFactory<DefaultEditor> DefaultEditorFactory;
@@ -87,7 +87,7 @@ DefaultEditor::changeSignature( const TQString &sig )
   TQString text = m_textEdit->text();
 
   int sigStart = text.findRev( "-- " );
-  TQString sigText = TQString( "-- \n%1" ).arg( sig );
+  TQString sigText = TQString( "-- \n%1" ).tqarg( sig );
 
   text.replace( sigStart, text.length(), sigText );
 }
@@ -202,10 +202,10 @@ DefaultEditor::createActions( KActionCollection *ac )
   connect( m_actionAlignJustify, TQT_SIGNAL(toggled(bool)),
            this, TQT_SLOT(setAlignJustify(bool)) );
 
-  m_actionAlignLeft->setExclusiveGroup( "alignment" );
-  m_actionAlignCenter->setExclusiveGroup( "alignment" );
-  m_actionAlignRight->setExclusiveGroup( "alignment" );
-  m_actionAlignJustify->setExclusiveGroup( "alignment" );
+  m_actionAlignLeft->setExclusiveGroup( "tqalignment" );
+  m_actionAlignCenter->setExclusiveGroup( "tqalignment" );
+  m_actionAlignRight->setExclusiveGroup( "tqalignment" );
+  m_actionAlignJustify->setExclusiveGroup( "tqalignment" );
 
   //
   // Tools
@@ -244,7 +244,7 @@ DefaultEditor::updateCharFmt()
 void
 DefaultEditor::updateAligment()
 {
-  int align = m_textEdit->alignment();
+  int align = m_textEdit->tqalignment();
 
   switch ( align ) {
   case AlignRight:
@@ -288,28 +288,28 @@ void
 DefaultEditor::setAlignLeft( bool yes )
 {
   if ( yes )
-    m_textEdit->setAlignment( AlignLeft );
+    m_textEdit->tqsetAlignment( AlignLeft );
 }
 
 void
 DefaultEditor::setAlignRight( bool yes )
 {
   if ( yes )
-    m_textEdit->setAlignment( AlignRight );
+    m_textEdit->tqsetAlignment( AlignRight );
 }
 
 void
 DefaultEditor::setAlignCenter( bool yes )
 {
   if ( yes )
-    m_textEdit->setAlignment( AlignCenter );
+    m_textEdit->tqsetAlignment( AlignCenter );
 }
 
 void
 DefaultEditor::setAlignJustify( bool yes )
 {
   if ( yes )
-    m_textEdit->setAlignment( AlignJustify );
+    m_textEdit->tqsetAlignment( AlignJustify );
 }
 
 //
diff --git a/libtdepim/komposer/plugins/default/defaulteditorui.rc b/libtdepim/komposer/plugins/default/defaulteditorui.rc
index 479fa8b06..de8c2e6d2 100644
--- a/libtdepim/komposer/plugins/default/defaulteditorui.rc
+++ b/libtdepim/komposer/plugins/default/defaulteditorui.rc
@@ -24,7 +24,7 @@
     <Action name="format_color"/>
     <DefineGroup name="format_chars_group" />
     <Separator/>
-    <Menu name="alignment"><text>&amp;Alignment</text>
+    <Menu name="tqalignment"><text>&amp;Alignment</text>
        <Action name="format_align_left"/>
        <Action name="format_align_center"/>
        <Action name="format_align_right"/>
-- 
cgit v1.2.1