Revert automated changes

Sorry guys, they are just not ready for prime time
Work will continue as always


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1212479 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

26 files changed, 102 insertions, 102 deletions

diff --git a/interfaces/ktexteditor/.kateconfig b/interfaces/ktexteditor/.kateconfig
index 46471127e..5b0885abe 100644
--- a/interfaces/ktexteditor/.kateconfig
+++ b/interfaces/ktexteditor/.kateconfig
@@ -1 +1 @@
-kate: space-indent on; indent-width 2; tqreplace-tabs on;
+kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/interfaces/ktexteditor/blockselectiondcopinterface.h b/interfaces/ktexteditor/blockselectiondcopinterface.h
index 66045239b..4b74fd2a0 100644
--- a/interfaces/ktexteditor/blockselectiondcopinterface.h
+++ b/interfaces/ktexteditor/blockselectiondcopinterface.h
@@ -24,7 +24,7 @@ namespace KTextEditor
 		Construct a new interface object for the text editor.
 		@param Parent the parent BlockSelectionInterface object
 		that will provide us with the functions for the interface.
-		@param name the TQObject's name
+		@param name the QObject's name
 		*/
 		BlockSelectionDCOPInterface( BlockSelectionInterface *Parent, const char *name );
 		/**
diff --git a/interfaces/ktexteditor/clipboarddcopinterface.h b/interfaces/ktexteditor/clipboarddcopinterface.h
index 9a75f9b97..8104e9d4d 100644
--- a/interfaces/ktexteditor/clipboarddcopinterface.h
+++ b/interfaces/ktexteditor/clipboarddcopinterface.h
@@ -24,7 +24,7 @@ namespace KTextEditor
 		Construct a new interface object for the text editor.
 		@param Parent the parent ClipboardInterface object
 		that will provide us with the functions for the interface.
-		@param name the TQObject's name
+		@param name the QObject's name
 		*/
 		ClipboardDCOPInterface( ClipboardInterface *Parent, const char *name );
 		/**
diff --git a/interfaces/ktexteditor/documentdcopinfo.h b/interfaces/ktexteditor/documentdcopinfo.h
index aedaee6a5..ea25284fe 100644
--- a/interfaces/ktexteditor/documentdcopinfo.h
+++ b/interfaces/ktexteditor/documentdcopinfo.h
@@ -25,7 +25,7 @@ namespace KTextEditor
 		Construct a new interface object for the text editor.
 		@param Parent the parent DocumentInfoInterface object
 		that will provide us with the functions for the interface.
-		@param name the TQObject's name
+		@param name the QObject's name
 		*/
 		DocumentInfoDCOPInterface( DocumentInfoInterface *Parent, const char *name );
 		/**
diff --git a/interfaces/ktexteditor/editdcopinterface.h b/interfaces/ktexteditor/editdcopinterface.h
index 5b4a6ebb7..f169fb15b 100644
--- a/interfaces/ktexteditor/editdcopinterface.h
+++ b/interfaces/ktexteditor/editdcopinterface.h
@@ -24,7 +24,7 @@ namespace KTextEditor
     Construct a new interface object for the text editor.
     @param Parent the parent EditInterface object
     that will provide us with the functions for the interface.
-    @param name the TQObject's name
+    @param name the QObject's name
     */
     EditDCOPInterface( EditInterface *Parent, const char *name );
     /**
diff --git a/interfaces/ktexteditor/editinterfaceext.h b/interfaces/ktexteditor/editinterfaceext.h
index e5f2d9101..650bb9ec2 100644
--- a/interfaces/ktexteditor/editinterfaceext.h
+++ b/interfaces/ktexteditor/editinterfaceext.h
@@ -44,7 +44,7 @@ class KTEXTEDITOR_EXPORT EditInterfaceExt
     /**
 	 * Begin an editing sequence.  Edit commands during this sequence will be
 	 * bunched together such that they represent a single undo command in the
-	 * editor, and so that tqrepaint events do not occur inbetween.
+	 * editor, and so that repaint events do not occur inbetween.
 	 *
 	 * Your application should not return control to the event loop while it
 	 * has an unterminated (no matching editEnd() call) editing sequence
diff --git a/interfaces/ktexteditor/editor.h b/interfaces/ktexteditor/editor.h
index 79c731584..11f9a8c15 100644
--- a/interfaces/ktexteditor/editor.h
+++ b/interfaces/ktexteditor/editor.h
@@ -32,7 +32,7 @@ namespace KTextEditor
  * Usage: Load it, merge it's gui + be happy
  * Extensibility: Use the Document / View classes if you want
  * advanced features, interfaces, etc. This class is just a good text editor
- * widget tqreplacement for applications which just need an embedded text edtor
+ * widget replacement for applications which just need an embedded text edtor
  * and are not interested in using advanced interfaces.
  */
 
@@ -57,7 +57,7 @@ class KTEXTEDITOR_EXPORT Editor : public KParts::ReadWritePart
     unsigned int myEditorNumber;
 };     
 
-KTEXTEDITOR_EXPORT Editor *createEditor ( const char* libname, TQWidget *tqparentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0 );
+KTEXTEDITOR_EXPORT Editor *createEditor ( const char* libname, TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0 );
 
 }
 
diff --git a/interfaces/ktexteditor/editorchooser.cpp b/interfaces/ktexteditor/editorchooser.cpp
index 0d48f6b75..96cf3649e 100644
--- a/interfaces/ktexteditor/editorchooser.cpp
+++ b/interfaces/ktexteditor/editorchooser.cpp
@@ -55,7 +55,7 @@ EditorChooser::EditorChooser(TQWidget *parent,const char *name) :
 
 	for (KTrader::OfferList::Iterator it = offers.begin(); it != offers.end(); ++it)
 	{
-    		if ((*it)->desktopEntryName().tqcontains(editor))
+    		if ((*it)->desktopEntryName().contains(editor))
 		{
 			d->chooser->editorCombo->insertItem(i18n("System Default (%1)").arg((*it)->name()));
 			break;
@@ -82,7 +82,7 @@ void EditorChooser::readAppSetting(const TQString& postfix){
 	if (editor.isEmpty()) d->chooser->editorCombo->setCurrentItem(0);
 	else
 	{
-		int idx=d->elements.tqfindIndex(editor);
+		int idx=d->elements.findIndex(editor);
 		idx=idx+1;
 		d->chooser->editorCombo->setCurrentItem(idx);
 	}
@@ -130,7 +130,7 @@ KTextEditor::Document *EditorChooser::createDocument(TQObject *parent,const char
 	return 0;
 }
 
-KTextEditor::Editor *EditorChooser::createEditor(TQWidget *tqparentWidget,TQObject *parent,const char* widgetName,
+KTextEditor::Editor *EditorChooser::createEditor(TQWidget *parentWidget,TQObject *parent,const char* widgetName,
 	const char* name,const TQString& postfix,bool fallBackToKatePart){
 
         KTextEditor::Editor *tmpEd=0;
@@ -151,11 +151,11 @@ KTextEditor::Editor *EditorChooser::createEditor(TQWidget *tqparentWidget,TQObje
         KService::Ptr serv=KService::serviceByDesktopName(editor);
         if (serv)
         {
-                tmpEd=KTextEditor::createEditor(serv->library().latin1(),tqparentWidget,widgetName,parent,name);
+                tmpEd=KTextEditor::createEditor(serv->library().latin1(),parentWidget,widgetName,parent,name);
                 if (tmpEd) return tmpEd;
         }
         if (fallBackToKatePart)
-                return KTextEditor::createEditor("libkatepart",tqparentWidget,widgetName,parent,name);
+                return KTextEditor::createEditor("libkatepart",parentWidget,widgetName,parent,name);
 
         return 0;
 }
diff --git a/interfaces/ktexteditor/editorchooser.h b/interfaces/ktexteditor/editorchooser.h
index bf09907d4..20fba94e1 100644
--- a/interfaces/ktexteditor/editorchooser.h
+++ b/interfaces/ktexteditor/editorchooser.h
@@ -28,7 +28,7 @@ class KTEXTEDITOR_EXPORT EditorChooser: public QWidget
     void writeAppSetting(const TQString& postfix=TQString::null);
 
     static KTextEditor::Document *createDocument(TQObject* parent=0,const char *name=0,const TQString& postfix=TQString::null, bool fallBackToKatePart=true);
-    static KTextEditor::Editor *createEditor(TQWidget *tqparentWidget,TQObject *parent,const char* widgetName=0,const char* name=0,const TQString& postfix=TQString::null,bool fallBackToKatePart=true);
+    static KTextEditor::Editor *createEditor(TQWidget *parentWidget,TQObject *parent,const char* widgetName=0,const char* name=0,const TQString& postfix=TQString::null,bool fallBackToKatePart=true);
   private:
     class PrivateEditorChooser *d;
 };
diff --git a/interfaces/ktexteditor/editorchooser_ui.ui b/interfaces/ktexteditor/editorchooser_ui.ui
index ff6b7eba3..fa1d99184 100644
--- a/interfaces/ktexteditor/editorchooser_ui.ui
+++ b/interfaces/ktexteditor/editorchooser_ui.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>EditorChooser</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -21,7 +21,7 @@
         </property>
         <widget class="QLayoutWidget">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -31,7 +31,7 @@
                     <property name="name">
                         <cstring>TextLabel1</cstring>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>460</width>
                             <height>0</height>
@@ -40,7 +40,7 @@
                     <property name="text">
                         <string>Please choose the default text editing component that you wish to use in this application. If you choose &lt;B&gt;System Default&lt;/B&gt;, the application will honor your changes in the Control Center. All other choices will override that setting.</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>WordBreak|AlignVCenter|AlignLeft</set>
                     </property>
                 </widget>
@@ -59,6 +59,6 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/interfaces/ktexteditor/encodingdcopinterface.h b/interfaces/ktexteditor/encodingdcopinterface.h
index e13a6dff4..38de4e0aa 100644
--- a/interfaces/ktexteditor/encodingdcopinterface.h
+++ b/interfaces/ktexteditor/encodingdcopinterface.h
@@ -24,7 +24,7 @@ namespace KTextEditor
 		Construct a new interface object for the text editor.
 		@param Parent the parent EncodingInterface object
 		that will provide us with the functions for the interface.
-		@param name the TQObject's name
+		@param name the QObject's name
 		*/
 		EncodingDCOPInterface( EncodingInterface *Parent, const char *name );
 		/**
diff --git a/interfaces/ktexteditor/ktexteditor.cpp b/interfaces/ktexteditor/ktexteditor.cpp
index ef199c819..0b50fdaeb 100644
--- a/interfaces/ktexteditor/ktexteditor.cpp
+++ b/interfaces/ktexteditor/ktexteditor.cpp
@@ -206,9 +206,9 @@ unsigned int Editor::editorNumber () const
   return myEditorNumber;
 }                         
 
-Editor *KTextEditor::createEditor ( const char* libname, TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name )
+Editor *KTextEditor::createEditor ( const char* libname, TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name )
 {
-  return KParts::ComponentFactory::createPartInstanceFromLibrary<Editor>( libname, tqparentWidget, widgetName, parent, name );
+  return KParts::ComponentFactory::createPartInstanceFromLibrary<Editor>( libname, parentWidget, widgetName, parent, name );
 }
 
 Document *KTextEditor::createDocument ( const char* libname, TQObject *parent, const char *name )
diff --git a/interfaces/ktexteditor/markinterface.h b/interfaces/ktexteditor/markinterface.h
index 7c8b0212f..d3b3dbe7f 100644
--- a/interfaces/ktexteditor/markinterface.h
+++ b/interfaces/ktexteditor/markinterface.h
@@ -63,7 +63,7 @@ class KTEXTEDITOR_EXPORT MarkInterface
     
     /** 
     * Adds a mark of type @p markType to @p line.
-    * Has no effect if the line allready tqcontains a mark of that type. 
+    * Has no effect if the line allready contains a mark of that type. 
     */
     virtual void setMark (uint line, uint markType) = 0;
     /**
diff --git a/interfaces/ktexteditor/plugin.h b/interfaces/ktexteditor/plugin.h
index 71266d3e2..dc7978f92 100644
--- a/interfaces/ktexteditor/plugin.h
+++ b/interfaces/ktexteditor/plugin.h
@@ -33,7 +33,7 @@ class View;
  * Basic KTextEditor plugin class.
  * This plugin will be bound to a Document.
  */                     
-class KTEXTEDITOR_EXPORT Plugin : public TQObject
+class KTEXTEDITOR_EXPORT Plugin : public QObject
 {
   friend class PrivatePlugin;
 
diff --git a/interfaces/ktexteditor/printdcopinterface.h b/interfaces/ktexteditor/printdcopinterface.h
index f3d176fbd..e41e6da5d 100644
--- a/interfaces/ktexteditor/printdcopinterface.h
+++ b/interfaces/ktexteditor/printdcopinterface.h
@@ -24,7 +24,7 @@ namespace KTextEditor
 		Construct a new interface object for the text editor.
 		@param Parent the parent PrintInterface object
 		that will provide us with the functions for the interface.
-		@param name the TQObject's name
+		@param name the QObject's name
 		*/
 		PrintDCOPInterface( PrintInterface *Parent, const char *name );
 		/**
diff --git a/interfaces/ktexteditor/searchdcopinterface.cpp b/interfaces/ktexteditor/searchdcopinterface.cpp
index 81834cef2..ce29e4927 100644
--- a/interfaces/ktexteditor/searchdcopinterface.cpp
+++ b/interfaces/ktexteditor/searchdcopinterface.cpp
@@ -20,16 +20,16 @@ SearchDCOPInterface::~SearchDCOPInterface()
 
 }
 
-bool SearchDCOPInterface::tqfindFirstString( TQString text, bool caseSensitive)
+bool SearchDCOPInterface::findFirstString( TQString text, bool caseSensitive)
 {
 	return m_parent->searchText(0, 0, text, &m_currentrow, &m_currentcol,  &m_currentmatchlen, caseSensitive);
 }
-bool SearchDCOPInterface::tqfindNextString( TQString text, bool caseSensitive)
+bool SearchDCOPInterface::findNextString( TQString text, bool caseSensitive)
 {
 	return m_parent->searchText(m_currentrow, m_currentcol+1, text, &m_currentrow, &m_currentcol,  &m_currentmatchlen, caseSensitive);
 }
 
-bool SearchDCOPInterface::tqfindPreviousString( TQString text, bool caseSensitive)
+bool SearchDCOPInterface::findPreviousString( TQString text, bool caseSensitive)
 {
 	if( m_currentcol == 0)
 		m_currentrow--;
@@ -38,28 +38,28 @@ bool SearchDCOPInterface::tqfindPreviousString( TQString text, bool caseSensitiv
 	return m_parent->searchText(m_currentrow, m_currentcol, text, &m_currentrow, &m_currentcol,  &m_currentmatchlen, caseSensitive, true);
 }
 
-bool SearchDCOPInterface::tqfindLastString( TQString text, bool caseSensitive)
+bool SearchDCOPInterface::findLastString( TQString text, bool caseSensitive)
 {
 	return m_parent->searchText(0,0, text, &m_currentrow, &m_currentcol,  &m_currentmatchlen, caseSensitive, true);
 }
 
-bool SearchDCOPInterface::tqfindStringAt( uint  row, uint  col, TQString text, bool caseSensitive)
+bool SearchDCOPInterface::findStringAt( uint  row, uint  col, TQString text, bool caseSensitive)
 {
 	return m_parent->searchText(row,col, text, &m_currentrow, &m_currentcol,  &m_currentmatchlen, caseSensitive);
 
 }
 
-bool SearchDCOPInterface::tqfindFirstRegExp( TQString regexp)
+bool SearchDCOPInterface::findFirstRegExp( TQString regexp)
 {
 	return m_parent->searchText( 0,0, TQRegExp(regexp), &m_currentrow, &m_currentcol,  &m_currentmatchlen);
 }
 
-bool SearchDCOPInterface::tqfindNextRegExp( TQString regexp)
+bool SearchDCOPInterface::findNextRegExp( TQString regexp)
 {
 	return m_parent->searchText( m_currentrow, m_currentcol+1, TQRegExp(regexp), &m_currentrow, &m_currentcol,  &m_currentmatchlen);
 }
 
-bool SearchDCOPInterface::tqfindPreviousRegExp( TQString regexp)
+bool SearchDCOPInterface::findPreviousRegExp( TQString regexp)
 {
 	if( m_currentcol == 0)
 		m_currentrow--;
@@ -69,12 +69,12 @@ bool SearchDCOPInterface::tqfindPreviousRegExp( TQString regexp)
 
 }
 
-bool SearchDCOPInterface::tqfindLastRegExp(TQString regexp)
+bool SearchDCOPInterface::findLastRegExp(TQString regexp)
 {
 	return m_parent->searchText( 0,0, TQRegExp(regexp), &m_currentrow, &m_currentcol,  &m_currentmatchlen, true);
 }
 
-bool SearchDCOPInterface::tqfindRegExpAt( uint  row, uint  col, TQString regexp)
+bool SearchDCOPInterface::findRegExpAt( uint  row, uint  col, TQString regexp)
 {
 	return m_parent->searchText( row, col, TQRegExp(regexp), &m_currentrow, &m_currentcol, &m_currentmatchlen, false);
 }
diff --git a/interfaces/ktexteditor/searchdcopinterface.h b/interfaces/ktexteditor/searchdcopinterface.h
index 298cf8962..d4f558a26 100644
--- a/interfaces/ktexteditor/searchdcopinterface.h
+++ b/interfaces/ktexteditor/searchdcopinterface.h
@@ -24,7 +24,7 @@ namespace KTextEditor
 		Construct a new interface object for the text editor.
 		@param Parent the parent SearchInterface object
 		that will provide us with the functions for the interface.
-		@param name the TQObject's name
+		@param name the QObject's name
 		*/
 		SearchDCOPInterface( SearchInterface *Parent, const char *name );
 		/**
@@ -33,17 +33,17 @@ namespace KTextEditor
 		**/
 		virtual ~SearchDCOPInterface();
 	k_dcop:
-		bool tqfindFirstString(TQString text, bool caseSensitive);
-		bool tqfindNextString(TQString text, bool caseSensitive);
-		bool tqfindPreviousString( TQString text, bool caseSensitive);
-		bool tqfindLastString(TQString text, bool caseSensitive);
-		bool tqfindStringAt( uint  row, uint  col, TQString text, bool caseSensitive);
+		bool findFirstString(TQString text, bool caseSensitive);
+		bool findNextString(TQString text, bool caseSensitive);
+		bool findPreviousString( TQString text, bool caseSensitive);
+		bool findLastString(TQString text, bool caseSensitive);
+		bool findStringAt( uint  row, uint  col, TQString text, bool caseSensitive);
 
-		bool tqfindFirstRegExp( TQString regexp);
-		bool tqfindNextRegExp( TQString regexp);
-		bool tqfindPreviousRegExp( TQString regexp);
-		bool tqfindLastRegExp( TQString regexp);
-		bool tqfindRegExpAt( uint  row, uint  col, TQString regexp);
+		bool findFirstRegExp( TQString regexp);
+		bool findNextRegExp( TQString regexp);
+		bool findPreviousRegExp( TQString regexp);
+		bool findLastRegExp( TQString regexp);
+		bool findRegExpAt( uint  row, uint  col, TQString regexp);
 
 		uint currentMatchLine();
 		uint currentMatchCol();
diff --git a/interfaces/ktexteditor/selectiondcopinterface.h b/interfaces/ktexteditor/selectiondcopinterface.h
index 70e6e2f0b..aa2973540 100644
--- a/interfaces/ktexteditor/selectiondcopinterface.h
+++ b/interfaces/ktexteditor/selectiondcopinterface.h
@@ -24,7 +24,7 @@ namespace KTextEditor
 		Construct a new interface object for the text editor.
 		@param Parent the parent SelectionInterface object
 		that will provide us with the functions for the interface.
-		@param name the TQObject's name
+		@param name the QObject's name
 		*/
 		SelectionDCOPInterface( SelectionInterface *Parent, const char *name );
 		/**
diff --git a/interfaces/ktexteditor/templateinterface.cpp b/interfaces/ktexteditor/templateinterface.cpp
index f84ab691b..4f9f83706 100644
--- a/interfaces/ktexteditor/templateinterface.cpp
+++ b/interfaces/ktexteditor/templateinterface.cpp
@@ -74,7 +74,7 @@ bool TemplateInterface::expandMacros( TQMap<TQString, TQString> &map, TQWidget *
 {
   KABC::StdAddressBook *addrBook = 0;
   KABC::Addressee userAddress;
-  TQDateTime datetime = TQDateTime::tqcurrentDateTime();
+  TQDateTime datetime = TQDateTime::currentDateTime();
   TQDate date = datetime.date();
   TQTime time = datetime.time();
 
@@ -173,7 +173,7 @@ bool TemplateInterface::insertTemplateText ( uint line, uint column, const TQStr
         }
       }
       TQString placeholder = rx.cap( 1 );
-      if ( ! enhancedInitValues.tqcontains( placeholder ) )
+      if ( ! enhancedInitValues.contains( placeholder ) )
         enhancedInitValues[ placeholder ] = "";
 
       pos += rx.matchedLength();
diff --git a/interfaces/ktexteditor/templateinterface.h b/interfaces/ktexteditor/templateinterface.h
index f31daeb3b..ec864a5e4 100644
--- a/interfaces/ktexteditor/templateinterface.h
+++ b/interfaces/ktexteditor/templateinterface.h
@@ -43,7 +43,7 @@ class KTEXTEDITOR_EXPORT TemplateInterface //should be named AbstractTemplateInt
     virtual ~TemplateInterface();
 
     /**
-     * Parses @p templateString for macros in the form [$%]{NAME} and tqfinds
+     * Parses @p templateString for macros in the form [$%]{NAME} and finds
      * the value corresponding to NAME if any. The NAME string may contain
      * any non-whitespace character execpt '}'
      * @param initialValues a map with the keys for the macros to expand. 
@@ -101,7 +101,7 @@ class KTEXTEDITOR_EXPORT TemplateInterface //should be named AbstractTemplateInt
      * differing from the macro name is found.
      *
      * If the editor supports some kind of smart indentation, the inserted code
-     * should be tqlayouted by the indenter.
+     * should be layouted by the indenter.
      */
     bool insertTemplateText ( uint line, uint column, const TQString &templateString, const TQMap<TQString,TQString> &initialValues, TQWidget *parentWindow=0);
 
diff --git a/interfaces/ktexteditor/undodcopinterface.h b/interfaces/ktexteditor/undodcopinterface.h
index 5e324da03..b1a217036 100644
--- a/interfaces/ktexteditor/undodcopinterface.h
+++ b/interfaces/ktexteditor/undodcopinterface.h
@@ -24,7 +24,7 @@ namespace KTextEditor
 		Construct a new interface object for the text editor.
 		@param Parent the parent UndoInterface object
 		that will provide us with the functions for the interface.
-		@param name the TQObject's name
+		@param name the QObject's name
 		*/
 		UndoDCOPInterface( UndoInterface *Parent, const char *name );
 		/**
diff --git a/interfaces/ktexteditor/viewcursordcopinterface.h b/interfaces/ktexteditor/viewcursordcopinterface.h
index e0c956da0..4bae0b520 100644
--- a/interfaces/ktexteditor/viewcursordcopinterface.h
+++ b/interfaces/ktexteditor/viewcursordcopinterface.h
@@ -24,7 +24,7 @@ namespace KTextEditor
 		Construct a new interface object for the text editor.
 		@param Parent the parent ViewCursorInterface object
 		that will provide us with the functions for the interface.
-		@param name the TQObject's name
+		@param name the QObject's name
 		*/
 		ViewCursorDCOPInterface( ViewCursorInterface *Parent, const char *name );
 		/**
diff --git a/interfaces/ktexteditor/viewstatusmsgdcopinterface.cpp b/interfaces/ktexteditor/viewstatusmsgdcopinterface.cpp
index b629cfc40..d38b9b938 100644
--- a/interfaces/ktexteditor/viewstatusmsgdcopinterface.cpp
+++ b/interfaces/ktexteditor/viewstatusmsgdcopinterface.cpp
@@ -6,24 +6,24 @@
 #include <dcopclient.h>
 using namespace KTextEditor;
 
-ViewtqStatusMsgDCOPInterface::ViewtqStatusMsgDCOPInterface( ViewtqStatusMsgInterface *Parent, const char *name)
+ViewStatusMsgDCOPInterface::ViewStatusMsgDCOPInterface( ViewStatusMsgInterface *Parent, const char *name)
 	: DCOPObject(name)
 {
 	m_parent = Parent;
 }
 
-ViewtqStatusMsgDCOPInterface::~ViewtqStatusMsgDCOPInterface()
+ViewStatusMsgDCOPInterface::~ViewStatusMsgDCOPInterface()
 {
 
 }
 
-uint ViewtqStatusMsgDCOPInterface::viewtqStatusMsgInterfaceNumber ()
+uint ViewStatusMsgDCOPInterface::viewStatusMsgInterfaceNumber ()
 {
-	return m_parent->viewtqStatusMsgInterfaceNumber ();
+	return m_parent->viewStatusMsgInterfaceNumber ();
 }
 
-void ViewtqStatusMsgDCOPInterface::viewtqStatusMsg (TQString msg)
+void ViewStatusMsgDCOPInterface::viewStatusMsg (TQString msg)
 {
-	m_parent->viewtqStatusMsg(msg);
+	m_parent->viewStatusMsg(msg);
 }
 
diff --git a/interfaces/ktexteditor/viewstatusmsgdcopinterface.h b/interfaces/ktexteditor/viewstatusmsgdcopinterface.h
index 3bdba906a..b4c5cf72e 100644
--- a/interfaces/ktexteditor/viewstatusmsgdcopinterface.h
+++ b/interfaces/ktexteditor/viewstatusmsgdcopinterface.h
@@ -1,5 +1,5 @@
-#ifndef ViewtqStatusMsg_DCOP_INTERFACE_H
-#define ViewtqStatusMsg_DCOP_INTERFACE_H
+#ifndef ViewStatusMsg_DCOP_INTERFACE_H
+#define ViewStatusMsg_DCOP_INTERFACE_H
 
 #include <dcopobject.h>
 #include <dcopref.h>
@@ -8,36 +8,36 @@
 //#include "editdcopinterface.moc"
 namespace KTextEditor
 {
-	class ViewtqStatusMsgInterface;
+	class ViewStatusMsgInterface;
 	/**
-	This is the main interface to the ViewtqStatusMsgInterface of KTextEdit.
+	This is the main interface to the ViewStatusMsgInterface of KTextEdit.
 	This will provide a consistant dcop interface to all KDE applications that use it.
-	@short DCOP interface to ViewtqStatusMsgInterface.
+	@short DCOP interface to ViewStatusMsgInterface.
 	@author Ian Reinhart Geiser <geiseri@kde.org>
 	*/
-	class KTEXTEDITOR_EXPORT ViewtqStatusMsgDCOPInterface : virtual public DCOPObject
+	class KTEXTEDITOR_EXPORT ViewStatusMsgDCOPInterface : virtual public DCOPObject
 	{
 	K_DCOP
 
 	public:
 		/**
 		Construct a new interface object for the text editor.
-		@param Parent the parent ViewtqStatusMsgInterface object
+		@param Parent the parent ViewStatusMsgInterface object
 		that will provide us with the functions for the interface.
-		@param name the TQObject's name
+		@param name the QObject's name
 		*/
-		ViewtqStatusMsgDCOPInterface( ViewtqStatusMsgInterface *Parent, const char *name );
+		ViewStatusMsgDCOPInterface( ViewStatusMsgInterface *Parent, const char *name );
 		/**
 		Destructor
 		Cleans up the object.
 		*/
-		virtual ~ViewtqStatusMsgDCOPInterface();
+		virtual ~ViewStatusMsgDCOPInterface();
 	k_dcop:
-		uint viewtqStatusMsgInterfaceNumber ();
-		void viewtqStatusMsg (class TQString msg) ;
+		uint viewStatusMsgInterfaceNumber ();
+		void viewStatusMsg (class TQString msg) ;
 	
 	private:
-		ViewtqStatusMsgInterface *m_parent;
+		ViewStatusMsgInterface *m_parent;
 	};
 }
 #endif
diff --git a/interfaces/ktexteditor/viewstatusmsginterface.cpp b/interfaces/ktexteditor/viewstatusmsginterface.cpp
index 371cb15e3..ff0815c89 100644
--- a/interfaces/ktexteditor/viewstatusmsginterface.cpp
+++ b/interfaces/ktexteditor/viewstatusmsginterface.cpp
@@ -27,50 +27,50 @@
 namespace KTextEditor
 {
 
-class PrivateViewtqStatusMsgInterface
+class PrivateViewStatusMsgInterface
 {
   public:
-    PrivateViewtqStatusMsgInterface() {interface=0;}
-    ~PrivateViewtqStatusMsgInterface() {}
-    ViewtqStatusMsgDCOPInterface  *interface;
+    PrivateViewStatusMsgInterface() {interface=0;}
+    ~PrivateViewStatusMsgInterface() {}
+    ViewStatusMsgDCOPInterface  *interface;
 };
 
 }
 
 using namespace KTextEditor;
 
-unsigned int ViewtqStatusMsgInterface::globalViewtqStatusMsgInterfaceNumber = 0;
+unsigned int ViewStatusMsgInterface::globalViewStatusMsgInterfaceNumber = 0;
 
-ViewtqStatusMsgInterface::ViewtqStatusMsgInterface()
+ViewStatusMsgInterface::ViewStatusMsgInterface()
 {
-  globalViewtqStatusMsgInterfaceNumber++;
-  myViewtqStatusMsgInterfaceNumber = globalViewtqStatusMsgInterfaceNumber++;
+  globalViewStatusMsgInterfaceNumber++;
+  myViewStatusMsgInterfaceNumber = globalViewStatusMsgInterfaceNumber++;
 
-  d = new PrivateViewtqStatusMsgInterface();
-  ::TQString name = "ViewtqStatusMsgInterface#" + ::TQString::number(myViewtqStatusMsgInterfaceNumber);
-  d->interface = new ViewtqStatusMsgDCOPInterface(this, name.latin1());
+  d = new PrivateViewStatusMsgInterface();
+  ::TQString name = "ViewStatusMsgInterface#" + ::TQString::number(myViewStatusMsgInterfaceNumber);
+  d->interface = new ViewStatusMsgDCOPInterface(this, name.latin1());
 }
 
-ViewtqStatusMsgInterface::~ViewtqStatusMsgInterface()
+ViewStatusMsgInterface::~ViewStatusMsgInterface()
 {
   delete d->interface;
   delete d;
 }
 
-unsigned int ViewtqStatusMsgInterface::viewtqStatusMsgInterfaceNumber () const
+unsigned int ViewStatusMsgInterface::viewStatusMsgInterfaceNumber () const
 {
-  return myViewtqStatusMsgInterfaceNumber;
+  return myViewStatusMsgInterfaceNumber;
 }
 
-void ViewtqStatusMsgInterface::setViewtqStatusMsgInterfaceDCOPSuffix (const TQCString &suffix)
+void ViewStatusMsgInterface::setViewStatusMsgInterfaceDCOPSuffix (const TQCString &suffix)
 {
-  d->interface->setObjId ("ViewtqStatusMsgInterface#"+suffix);
+  d->interface->setObjId ("ViewStatusMsgInterface#"+suffix);
 }
 
-ViewtqStatusMsgInterface *KTextEditor::viewtqStatusMsgInterface (View *view)
+ViewStatusMsgInterface *KTextEditor::viewStatusMsgInterface (View *view)
 {           
   if (!view)
     return 0;
 
-  return static_cast<ViewtqStatusMsgInterface*>(view->qt_cast("KTextEditor::ViewtqStatusMsgInterface"));
+  return static_cast<ViewStatusMsgInterface*>(view->qt_cast("KTextEditor::ViewStatusMsgInterface"));
 }
diff --git a/interfaces/ktexteditor/viewstatusmsginterface.h b/interfaces/ktexteditor/viewstatusmsginterface.h
index 7286a9528..d692f3b7b 100644
--- a/interfaces/ktexteditor/viewstatusmsginterface.h
+++ b/interfaces/ktexteditor/viewstatusmsginterface.h
@@ -30,33 +30,33 @@ namespace KTextEditor
 /**
 *  This is an interface for retrieving status bar messages from the Document class.
 */
-class KTEXTEDITOR_EXPORT ViewtqStatusMsgInterface
+class KTEXTEDITOR_EXPORT ViewStatusMsgInterface
 {
-  friend class PrivateViewtqStatusMsgInterface;
+  friend class PrivateViewStatusMsgInterface;
 
   public:
-    ViewtqStatusMsgInterface();
-    virtual ~ViewtqStatusMsgInterface();
+    ViewStatusMsgInterface();
+    virtual ~ViewStatusMsgInterface();
 
-    unsigned int viewtqStatusMsgInterfaceNumber () const;
+    unsigned int viewStatusMsgInterfaceNumber () const;
     
   protected:  
-    void setViewtqStatusMsgInterfaceDCOPSuffix (const TQCString &suffix); 
+    void setViewStatusMsgInterfaceDCOPSuffix (const TQCString &suffix); 
 
   //
   // signals !!!
   //  
   public:
-    virtual void viewtqStatusMsg (const class TQString &msg) = 0;
+    virtual void viewStatusMsg (const class TQString &msg) = 0;
     
 
   private:
-    class PrivateViewtqStatusMsgInterface *d;
-    static unsigned int globalViewtqStatusMsgInterfaceNumber;
-    unsigned int myViewtqStatusMsgInterfaceNumber;
+    class PrivateViewStatusMsgInterface *d;
+    static unsigned int globalViewStatusMsgInterfaceNumber;
+    unsigned int myViewStatusMsgInterfaceNumber;
 };
                   
-KTEXTEDITOR_EXPORT ViewtqStatusMsgInterface *viewtqStatusMsgInterface (class View *view);
+KTEXTEDITOR_EXPORT ViewStatusMsgInterface *viewStatusMsgInterface (class View *view);
 
 }