Enable compilation with TQt for Qt4 3.4.0 TP2

This should not break compatibility with TQt for Qt3; if it does please fix it ASAP!


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

1 files changed, 14 insertions, 14 deletions

diff --git a/kate/app/kateexternaltools.cpp b/kate/app/kateexternaltools.cpp
index 6680e26a4..a7b1f2afd 100644
--- a/kate/app/kateexternaltools.cpp
+++ b/kate/app/kateexternaltools.cpp
@@ -127,7 +127,7 @@ bool KateExternalTool::checkExec()
 
 bool KateExternalTool::valid( const TQString &mt ) const
 {
-  return mimetypes.isEmpty() || mimetypes.contains( mt );
+  return mimetypes.isEmpty() || mimetypes.tqcontains( mt );
 }
 //END KateExternalTool
 
@@ -191,7 +191,7 @@ bool KateExternalToolsCommand::exec (Kate::View *view, const TQString &cmd, TQSt
 // 		kdDebug(13001)<<"KateExternalToolsCommand::exec: Could not get view widget"<<endl;
 		return false;
 	}
-  KateMDI::MainWindow *dmw=dynamic_cast<KateMDI::MainWindow*>(wv->topLevelWidget());
+  KateMDI::MainWindow *dmw=dynamic_cast<KateMDI::MainWindow*>(wv->tqtopLevelWidget());
 	if (!dmw) {
 // 		kdDebug(13001)<<"KateExternalToolsCommand::exec: Could not get main window"<<endl;
 		return false;
@@ -204,7 +204,7 @@ bool KateExternalToolsCommand::exec (Kate::View *view, const TQString &cmd, TQSt
 		dynamic_cast<KateExternalToolsMenuAction*>(dmw->action("tools_external"));
 	if (!a) return false;
 // 	kdDebug(13001)<<"trying to find action"<<endl;
-	KAction *a1=a->actionCollection()->action(actionName.utf8());
+	KAction *a1=a->actionCollection()->action(static_cast<const char *>(actionName.utf8()));
 	if (!a1) return false;
 // 	kdDebug(13001)<<"activating action"<<endl;
 	a1->activate();
@@ -330,8 +330,8 @@ void KateExternalToolsMenuAction::reload()
     bool sepadded = false;
     for (TQStringList::iterator itg = dtools.begin(); itg != dtools.end(); ++itg )
     {
-      if ( ! tools.contains( *itg ) &&
-            ! removed.contains( *itg ) )
+      if ( ! tools.tqcontains( *itg ) &&
+            ! removed.tqcontains( *itg ) )
       {
         if ( ! sepadded )
         {
@@ -394,7 +394,7 @@ void KateExternalToolsMenuAction::slotDocumentChanged()
       if ( action )
       {
         l = action->tool->mimetypes;
-        b = ( ! l.count() || l.contains( mt ) );
+        b = ( ! l.count() || l.tqcontains( mt ) );
         action->setEnabled( b );
       }
     }
@@ -407,7 +407,7 @@ void KateExternalToolsMenuAction::slotDocumentChanged()
  * This is a TQListBoxItem, that has a KateExternalTool. The text is the Name
  * of the tool.
  */
-class ToolItem : public QListBoxPixmap
+class ToolItem : public TQListBoxPixmap
 {
   public:
     ToolItem( TQListBox *lb, const TQPixmap &icon, KateExternalTool *tool )
@@ -439,7 +439,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool *
   leName = new TQLineEdit( w );
   lo->addWidget( leName, 1, 2 );
   l = new TQLabel( leName, i18n("&Label:"), w );
-  l->setAlignment( l->alignment()|Qt::AlignRight );
+  l->tqsetAlignment( l->tqalignment()|Qt::AlignRight );
   lo->addWidget( l, 1, 1 );
   if ( tool ) leName->setText( tool->name );
   TQWhatsThis::add( leName, i18n(
@@ -454,7 +454,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool *
   teCommand = new TQTextEdit( w );
   lo->addMultiCellWidget( teCommand, 2, 2, 2, 3 );
   l = new TQLabel( teCommand, i18n("S&cript:"), w );
-  l->setAlignment( Qt::AlignTop|Qt::AlignRight );
+  l->tqsetAlignment( Qt::AlignTop|Qt::AlignRight );
   lo->addWidget( l, 2, 1 );
   if ( tool ) teCommand->setText( tool->command );
   TQWhatsThis::add( teCommand, i18n(
@@ -477,7 +477,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool *
   leExecutable = new TQLineEdit( w );
   lo->addMultiCellWidget( leExecutable, 3, 3, 2, 3 );
   l = new TQLabel( leExecutable, i18n("&Executable:"), w );
-  l->setAlignment( l->alignment()|Qt::AlignRight );
+  l->tqsetAlignment( l->tqalignment()|Qt::AlignRight );
   lo->addWidget( l, 3, 1 );
   if ( tool ) leExecutable->setText( tool->tryexec );
   TQWhatsThis::add( leExecutable, i18n(
@@ -488,7 +488,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool *
   leMimetypes = new TQLineEdit( w );
   lo->addWidget( leMimetypes, 4, 2 );
   l = new TQLabel( leMimetypes, i18n("&Mime types:"), w );
-  l->setAlignment( l->alignment()|Qt::AlignRight );
+  l->tqsetAlignment( l->tqalignment()|Qt::AlignRight );
   lo->addWidget( l, 4, 1 );
   if ( tool ) leMimetypes->setText( tool->mimetypes.join("; ") );
   TQWhatsThis::add( leMimetypes, i18n(
@@ -506,7 +506,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool *
   cmbSave = new TQComboBox(w);
   lo->addMultiCellWidget( cmbSave, 5, 5, 2, 3 );
   l = new TQLabel( cmbSave, i18n("&Save:"), w );
-  l->setAlignment( l->alignment()|Qt::AlignRight );
+  l->tqsetAlignment( l->tqalignment()|Qt::AlignRight );
   lo->addWidget( l, 5, 1 );
   TQStringList sl;
   sl << i18n("None") << i18n("Current Document") << i18n("All Documents");
@@ -521,7 +521,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool *
   leCmdLine = new TQLineEdit( w );
   lo->addMultiCellWidget( leCmdLine, 6, 6, 2, 3 );
   l = new TQLabel( leCmdLine, i18n("&Command line name:"), w );
-  l->setAlignment( l->alignment()|Qt::AlignRight );
+  l->tqsetAlignment( l->tqalignment()|Qt::AlignRight );
   lo->addWidget( l, 6, 1 );
   if ( tool ) leCmdLine->setText( tool->cmdname );
   TQWhatsThis::add( leCmdLine, i18n(
@@ -745,7 +745,7 @@ void KateExternalToolsConfigWidget::slotNew()
 
     // This is sticky, it does not change again, so that shortcuts sticks
     // TODO check for dups
-    t->acname = "externaltool_" + TQString(t->name).replace( TQRegExp("\\W+"), "" );
+    t->acname = "externaltool_" + TQString(t->name).tqreplace( TQRegExp("\\W+"), "" );
 
     new ToolItem ( lbTools, t->icon.isEmpty() ? blankIcon() : SmallIcon( t->icon ), t );