Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit a836ba332960d5fc28c3f3ca9fbe52d63e9b7218.

5 files changed, 14 insertions, 14 deletions

diff --git a/src/codeeditor.cpp b/src/codeeditor.cpp
index 92a119e..a8e1dae 100755
--- a/src/codeeditor.cpp
+++ b/src/codeeditor.cpp
@@ -22,13 +22,13 @@
 
 #include <tqmessagebox.h>
 #include <kmessagebox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <kfiledialog.h>
 
 CodeEditor::CodeEditor(TQWidget *parent, const char *name)
  : TQWidget(parent, name)
 {
-	TQVBoxLayout *layout = new TQVBoxLayout(this) ;
+	TQVBoxLayout *tqlayout = new TQVBoxLayout(this) ;
 		
 	KLibFactory *factory = KLibLoader::self()->factory( "libkatepart" ) ;
 	m_doc =  ( Kate::Document* ) factory->create( 0L, "kate", "KTextEditor::Document" ) ;
@@ -37,7 +37,7 @@ CodeEditor::CodeEditor(TQWidget *parent, const char *name)
 
     connect( m_view, TQT_SIGNAL(cursorPositionChanged()), this, TQT_SLOT(slotCursorPositionChanged()) );
 
-	layout->addWidget( m_view ) ;
+	tqlayout->addWidget( m_view ) ;
 	
 	m_exeLine = 0 ;
 	m_filename = "" ;
@@ -56,7 +56,7 @@ CodeEditor::CodeEditor(TQWidget *parent, const char *name)
 
 
 	m_statusBar = new KStatusBar( this ) ;
-	layout->addWidget( m_statusBar ) ;
+	tqlayout->addWidget( m_statusBar ) ;
 	m_statusBar->insertItem( "", 0, 0, true ) ;		
 
 	slotCursorPositionChanged() ;
@@ -74,7 +74,7 @@ void CodeEditor::slotCursorPositionChanged()
 {
 	unsigned int line, column ;
 	m_view->cursorPosition(  &line, &column ) ;
-	m_statusBar->changeItem( TQString( " Line: %1 Col: %2 " ).arg( TQString::number( line+1 ) ).arg( TQString::number( column+1 ) ), 0 ) ;
+	m_statusBar->changeItem( TQString( " Line: %1 Col: %2 " ).tqarg( TQString::number( line+1 ) ).tqarg( TQString::number( column+1 ) ), 0 ) ;
 }
 
 void CodeEditor::slotToggleBreakpoint()
@@ -250,7 +250,7 @@ bool CodeEditor::askSave()
 	else
 		filename = "Untitled" ;
 
-	int choice = KMessageBox::warningYesNoCancel( this, TQString( "The document \'%1\' has been modified.\nDo you want to save it?").arg( filename ), "Save Document?", KGuiItem( "Save" ), KGuiItem( "Discard" ) );
+	int choice = KMessageBox::warningYesNoCancel( this, TQString( "The document \'%1\' has been modified.\nDo you want to save it?").tqarg( filename ), "Save Document?", KGuiItem( "Save" ), KGuiItem( "Discard" ) );
 
     if ( choice == KMessageBox::Yes ) 
 		save() ;
diff --git a/src/kpicosim.cpp b/src/kpicosim.cpp
index 126fbb6..0f75111 100755
--- a/src/kpicosim.cpp
+++ b/src/kpicosim.cpp
@@ -67,7 +67,7 @@
 #include <klocale.h>
 
 #include <kmenubar.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqkeysequence.h>
 #include <knuminput.h>
 #include <tqnamespace.h>
@@ -79,7 +79,7 @@
 #include "kjtagdialog.h"
 #include <kfiledialog.h>
 #include <kmessagebox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <ksimpleconfig.h>
 #include <khelpmenu.h>
 #include <kaboutdata.h>
diff --git a/src/kportview.cpp b/src/kportview.cpp
index 6744265..7f45115 100755
--- a/src/kportview.cpp
+++ b/src/kportview.cpp
@@ -18,7 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 #include "kportview.h"
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 
 KPortView::KPortView( CPicoBlaze *cpu, TQWidget *parent, const char *name)
diff --git a/src/kprocessorview.cpp b/src/kprocessorview.cpp
index 06dc491..3a238ec 100755
--- a/src/kprocessorview.cpp
+++ b/src/kprocessorview.cpp
@@ -1,7 +1,7 @@
 #include "kprocessorview.h"
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqscrollview.h>
 #include <tqsize.h>
 #include <tqmessagebox.h>
diff --git a/src/kserialview.cpp b/src/kserialview.cpp
index 4cac22b..579313c 100755
--- a/src/kserialview.cpp
+++ b/src/kserialview.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 #include "kserialview.h"
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqgroupbox.h>
 #include <tqframe.h>
 
@@ -40,9 +40,9 @@ KSerialView::KSerialView( CPicoBlaze *cpu, TQWidget * parent ) : TQWidget( paren
 	TQWidget *settings = new TQWidget( this ) ;
 	settings->setMinimumSize( 90, 90 ) ;
 	
-	TQVBoxLayout *layout = new TQVBoxLayout( this ) ;
-	layout->addWidget( view ) ;
-	layout->addWidget( settings ) ;
+	TQVBoxLayout *tqlayout = new TQVBoxLayout( this ) ;
+	tqlayout->addWidget( view ) ;
+	tqlayout->addWidget( settings ) ;
 	
 	TQGroupBox *groupBox = new TQGroupBox( "Serial Settings", settings ) ;
 	groupBox->setFixedSize( 200, 80 ) ;