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

This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.

1 files changed, 12 insertions, 12 deletions

diff --git a/korganizer/resourceview.cpp b/korganizer/resourceview.cpp
index 322d6b63..a4475a4c 100644
--- a/korganizer/resourceview.cpp
+++ b/korganizer/resourceview.cpp
@@ -44,7 +44,7 @@
 
 #include <tqhbox.h>
 #include <tqheader.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqpainter.h>
 #include <tqpushbutton.h>
@@ -70,12 +70,12 @@ static TQString labelFromSubResName( ResourceCalendar *resource, const TQString
   TQString label;
   if ( (int)reply > 1 ) {
     if( resource && !resource->resourceName().isEmpty() ) {
-      label = i18n( "My %1 (%2)" ).arg( subRes, resource->resourceName() );
+      label = i18n( "My %1 (%2)" ).tqarg( subRes, resource->resourceName() );
     } else {
-      label = i18n( "My %1" ).arg( subRes );
+      label = i18n( "My %1" ).tqarg( subRes );
     }
   } else {
-    label = i18n( "My %1" ).arg( subRes );
+    label = i18n( "My %1" ).tqarg( subRes );
   }
   return label;
 }
@@ -238,18 +238,18 @@ void ResourceItem::setStandardResource( bool std )
 {
   if ( mIsStandardResource != std ) {
     mIsStandardResource = std;
-    repaint();
+    tqrepaint();
   }
 }
 
 void ResourceItem::paintCell(TQPainter *p, const TQColorGroup &cg,
-      int column, int width, int alignment)
+      int column, int width, int tqalignment)
 {
   TQFont oldFont = p->font();
   TQFont newFont = oldFont;
   newFont.setBold( mIsStandardResource && !mIsSubresource );
   p->setFont( newFont );
-  TQCheckListItem::paintCell( p, cg, column, width, alignment );
+  TQCheckListItem::paintCell( p, cg, column, width, tqalignment );
   p->setFont( oldFont );
 /*  TQColorGroup _cg = cg;
   if(!mResource) return;
@@ -376,7 +376,7 @@ void ResourceView::addResource()
     if ( !item->resource()->addSubresource( folderName, parentId ) ) {
       KMessageBox::error(
         this,
-        i18n( "<qt>Unable to create subresource <b>%1</b>.</qt>" ).arg( folderName ) );
+        i18n( "<qt>Unable to create subresource <b>%1</b>.</qt>" ).tqarg( folderName ) );
     }
     return;
   }
@@ -398,7 +398,7 @@ void ResourceView::addResource()
   if( !resource ) {
     KMessageBox::error(
       this,
-      i18n( "<qt>Unable to create resource of type <b>%1</b>.</qt>" ).arg( type ) );
+      i18n( "<qt>Unable to create resource of type <b>%1</b>.</qt>" ).tqarg( type ) );
     return;
   }
 
@@ -414,7 +414,7 @@ void ResourceView::addResource()
     if ( resource->isActive() && ( !resource->open() || !resource->load() ) ) {
       // ### There is a resourceLoadError() signal declared in ResourceCalendar
       //     but no subclass seems to make use of it. We could do better.
-      KMessageBox::error( this, i18n("Unable to create the resource.").arg( type ) );
+      KMessageBox::error( this, i18n("Unable to create the resource.").tqarg( type ) );
       success = false;
     }
   }
@@ -573,7 +573,7 @@ void ResourceView::removeResource()
         i18n ("<qt>Failed to remove the subresource <b>%1</b>. The "
               "reason could be that it is a built-in one which cannot "
               "be removed, or that the removal of the underlying storage "
-              "folder failed.</qt>").arg( item->resource()->name() ) );
+              "folder failed.</qt>").tqarg( item->resource()->name() ) );
       return;
   } else {
     mCalendar->resourceManager()->remove( item->resource() );
@@ -632,7 +632,7 @@ void ResourceView::editResource()
     } else {
       KMessageBox::sorry(
         this,
-        i18n ("<qt>Cannot edit the subresource <b>%1</b>.</qt>").arg( item->resource()->name() ) );
+        i18n ("<qt>Cannot edit the subresource <b>%1</b>.</qt>").tqarg( item->resource()->name() ) );
     }
   } else {
     KRES::ConfigDialog dlg( this, TQString("calendar"), resource, "KRES::ConfigDialog" );