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

This reverts commit f3a9c5ace2048794e4432ddc71401b41d3361e4b.

5 files changed, 47 insertions, 47 deletions

diff --git a/smb4k/listview/smb4kshareslistview.cpp b/smb4k/listview/smb4kshareslistview.cpp
index 0943f7a..994d8d7 100644
--- a/smb4k/listview/smb4kshareslistview.cpp
+++ b/smb4k/listview/smb4kshareslistview.cpp
@@ -59,7 +59,7 @@ Smb4KSharesListView::Smb4KSharesListView( TQWidget *parent, const char *name )
   addColumn( i18n( "Total" ) );
   addColumn( i18n( "Usage" ) );
 
-  // Set alignment
+  // Set tqalignment
   setColumnAlignment( Free, TQt::AlignRight );
   setColumnAlignment( Used, TQt::AlignRight );
   setColumnAlignment( Total, TQt::AlignRight );
diff --git a/smb4k/listview/smb4kshareslistviewitem.cpp b/smb4k/listview/smb4kshareslistviewitem.cpp
index a05d969..3930f66 100644
--- a/smb4k/listview/smb4kshareslistviewitem.cpp
+++ b/smb4k/listview/smb4kshareslistviewitem.cpp
@@ -128,13 +128,13 @@ void Smb4KSharesListViewItem::setupItem( const Smb4KShare &share, bool mountpoin
           used_dim = "GB";
         }
 
-        used = TQString( "%1" ).arg( tmp_used, 0, 'f', 1 );
+        used = TQString( "%1" ).tqarg( tmp_used, 0, 'f', 1 );
       }
       else
       {
         used_dim = "kB";
         double tmp_used = shareObject()->totalDiskSpace() - shareObject()->freeDiskSpace();
-        used = TQString( "%1" ).arg( tmp_used, 0, 'f', 1 );
+        used = TQString( "%1" ).tqarg( tmp_used, 0, 'f', 1 );
       }
 
       if ( shareObject()->freeDiskSpace() >= 1024 )
@@ -148,12 +148,12 @@ void Smb4KSharesListViewItem::setupItem( const Smb4KShare &share, bool mountpoin
           free_dim = "GB";
         }
 
-        free = TQString( "%1" ).arg( tmp_free, 0, 'f', 1 );
+        free = TQString( "%1" ).tqarg( tmp_free, 0, 'f', 1 );
       }
       else
       {
         free_dim = "kB";
-        free = TQString( "%1" ).arg( shareObject()->freeDiskSpace(), 0, 'f', 1 );
+        free = TQString( "%1" ).tqarg( shareObject()->freeDiskSpace(), 0, 'f', 1 );
       }
 
       if ( shareObject()->totalDiskSpace() >= 1024 )
@@ -167,24 +167,24 @@ void Smb4KSharesListViewItem::setupItem( const Smb4KShare &share, bool mountpoin
           total_dim = "GB";
         }
 
-        total = TQString( "%1" ).arg( tmp_total, 0, 'f', 1 );
+        total = TQString( "%1" ).tqarg( tmp_total, 0, 'f', 1 );
       }
       else
       {
         total_dim = "kB";
-        total = TQString( "%1" ).arg( shareObject()->totalDiskSpace(), 0, 'f', 1 );
+        total = TQString( "%1" ).tqarg( shareObject()->totalDiskSpace(), 0, 'f', 1 );
       }
 
-      setText( Free, TQString( "%1 %2" ).arg( free, free_dim ) );
-      setText( Used, TQString( "%1 %2" ).arg( used, used_dim ) );
-      setText( Total, TQString( "%1 %2" ).arg( total, total_dim ) );
+      setText( Free, TQString( "%1 %2" ).tqarg( free, free_dim ) );
+      setText( Used, TQString( "%1 %2" ).tqarg( used, used_dim ) );
+      setText( Total, TQString( "%1 %2" ).tqarg( total, total_dim ) );
     }
     else
     {
       setText( Item, (m_mountpoint ? m_share.path() : m_share.name()) );
 
       setText( Owner, TQString::compare( m_share.filesystem(), "smbfs" ) == 0 ?
-               TQString( "%1 - %2" ).arg( m_share.user() ).arg( m_share.group() ) :
+               TQString( "%1 - %2" ).tqarg( m_share.user() ).tqarg( m_share.group() ) :
                TQString() );
 #ifndef __FreeBSD__
       setText( Login, TQString::compare( m_share.filesystem(), "cifs" ) == 0 ?
@@ -206,13 +206,13 @@ void Smb4KSharesListViewItem::setupItem( const Smb4KShare &share, bool mountpoin
           used_dim = "GB";
         }
 
-        used = TQString( "%1" ).arg( tmp_used, 0, 'f', 1 );
+        used = TQString( "%1" ).tqarg( tmp_used, 0, 'f', 1 );
       }
       else
       {
         used_dim = "kB";
         double tmp_used = shareObject()->totalDiskSpace() - shareObject()->freeDiskSpace();
-        used = TQString( "%1" ).arg( tmp_used, 0, 'f', 1 );
+        used = TQString( "%1" ).tqarg( tmp_used, 0, 'f', 1 );
       }
 
       if ( shareObject()->freeDiskSpace() >= 1024 )
@@ -226,12 +226,12 @@ void Smb4KSharesListViewItem::setupItem( const Smb4KShare &share, bool mountpoin
           free_dim = "GB";
         }
 
-        free = TQString( "%1" ).arg( tmp_free, 0, 'f', 1 );
+        free = TQString( "%1" ).tqarg( tmp_free, 0, 'f', 1 );
       }
       else
       {
         free_dim = "kB";
-        free = TQString( "%1" ).arg( shareObject()->freeDiskSpace(), 0, 'f', 1 );
+        free = TQString( "%1" ).tqarg( shareObject()->freeDiskSpace(), 0, 'f', 1 );
       }
 
       if ( shareObject()->totalDiskSpace() >= 1024 )
@@ -245,17 +245,17 @@ void Smb4KSharesListViewItem::setupItem( const Smb4KShare &share, bool mountpoin
           total_dim = "GB";
         }
 
-        total = TQString( "%1" ).arg( tmp_total, 0, 'f', 1 );
+        total = TQString( "%1" ).tqarg( tmp_total, 0, 'f', 1 );
       }
       else
       {
         total_dim = "kB";
-        total = TQString( "%1" ).arg( shareObject()->totalDiskSpace(), 0, 'f', 1 );
+        total = TQString( "%1" ).tqarg( shareObject()->totalDiskSpace(), 0, 'f', 1 );
       }
 
-      setText( Free, TQString( "%1 %2" ).arg( free, free_dim ) );
-      setText( Used, TQString( "%1 %2" ).arg( used, used_dim ) );
-      setText( Total, TQString( "%1 %2" ).arg( total, total_dim ) );
+      setText( Free, TQString( "%1 %2" ).tqarg( free, free_dim ) );
+      setText( Used, TQString( "%1 %2" ).tqarg( used, used_dim ) );
+      setText( Total, TQString( "%1 %2" ).tqarg( total, total_dim ) );
     }
 
     m_initial_setup = false;
@@ -330,7 +330,7 @@ void Smb4KSharesListViewItem::paintCell( TQPainter *p, const TQColorGroup &cg, i
     //     p->setPen( colorgrp.highlightedText() );
     //   }
 
-    p->drawText( 0, 0, width-1, height()-1, TQt::AlignCenter, TQString( "%1 \%" ).arg( m_share.percentage(), 0, 'f', 1 ) );
+    p->drawText( 0, 0, width-1, height()-1, TQt::AlignCenter, TQString( "%1 \%" ).tqarg( m_share.percentage(), 0, 'f', 1 ) );
   }
   else
   {
diff --git a/smb4k/listview/smb4kshareslistviewitem.h b/smb4k/listview/smb4kshareslistviewitem.h
index 679de44..b47f888 100644
--- a/smb4k/listview/smb4kshareslistviewitem.h
+++ b/smb4k/listview/smb4kshareslistviewitem.h
@@ -32,7 +32,7 @@
 
 // TQt includes
 #include <tqpainter.h>
-#include <palette.h>
+#include <tqpalette.h>
 
 // KDE includes
 #include <klistview.h>
@@ -144,13 +144,13 @@ class Smb4KSharesListViewItem : public KListViewItem
      *
      * @param width         The width of the area that will be painted.
      *
-     * @param alignment     The alignment of the column that will be used.
+     * @param tqalignment     The tqalignment of the column that will be used.
      */
     void paintCell( TQPainter *p,
                     const TQColorGroup &cg,
                     int column,
                     int width,
-                    int alignment );
+                    int tqalignment );
 
     /**
      * Reimplemented from KListViewItem.
diff --git a/smb4k/listview/smb4kshareslistviewtooltip.cpp b/smb4k/listview/smb4kshareslistviewtooltip.cpp
index 9381be7..a2c49cc 100644
--- a/smb4k/listview/smb4kshareslistviewtooltip.cpp
+++ b/smb4k/listview/smb4kshareslistviewtooltip.cpp
@@ -125,7 +125,7 @@ void Smb4KSharesListViewToolTip::setupTip()
   if ( TQString::compare( m_item->shareObject()->filesystem(), "smbfs" ) == 0 )
   {
     m_layout->addWidget( new TQLabel( "Owner:", this ), 2, 1, 0 );
-    m_layout->addWidget( new TQLabel( TQString( "%1 - %2" ).arg( m_item->shareObject()->user(), m_item->shareObject()->group() ), this ), 2, 2, 0 );
+    m_layout->addWidget( new TQLabel( TQString( "%1 - %2" ).tqarg( m_item->shareObject()->user(), m_item->shareObject()->group() ), this ), 2, 2, 0 );
   }
   else
   {
@@ -161,13 +161,13 @@ void Smb4KSharesListViewToolTip::setupTip()
         used_dim = "GB";
       }
 
-      used = TQString( "%1" ).arg( tmp_used, 0, 'f', 1 );
+      used = TQString( "%1" ).tqarg( tmp_used, 0, 'f', 1 );
     }
     else
     {
       used_dim = "kB";
       double tmp_used = m_item->shareObject()->totalDiskSpace() - m_item->shareObject()->freeDiskSpace();
-      used = TQString( "%1" ).arg( tmp_used, 0, 'f', 1 );
+      used = TQString( "%1" ).tqarg( tmp_used, 0, 'f', 1 );
     }
 
     if ( m_item->shareObject()->freeDiskSpace() >= 1024 )
@@ -181,12 +181,12 @@ void Smb4KSharesListViewToolTip::setupTip()
         free_dim = "GB";
       }
 
-      free = TQString( "%1" ).arg( tmp_free, 0, 'f', 1 );
+      free = TQString( "%1" ).tqarg( tmp_free, 0, 'f', 1 );
     }
     else
     {
       free_dim = "kB";
-      free = TQString( "%1" ).arg( m_item->shareObject()->freeDiskSpace(), 0, 'f', 1 );
+      free = TQString( "%1" ).tqarg( m_item->shareObject()->freeDiskSpace(), 0, 'f', 1 );
     }
 
     if ( m_item->shareObject()->totalDiskSpace() >= 1024 )
@@ -200,28 +200,28 @@ void Smb4KSharesListViewToolTip::setupTip()
         total_dim = "GB";
       }
 
-      total = TQString( "%1" ).arg( tmp_total, 0, 'f', 1 );
+      total = TQString( "%1" ).tqarg( tmp_total, 0, 'f', 1 );
     }
     else
     {
       total_dim = "kB";
-      total = TQString( "%1" ).arg( m_item->shareObject()->totalDiskSpace(), 0, 'f', 1 );
+      total = TQString( "%1" ).tqarg( m_item->shareObject()->totalDiskSpace(), 0, 'f', 1 );
     }
 
     m_layout->addWidget( new TQLabel( i18n( "Free:" ), this, "FreeLabel" ), 5, 1, 0 );
-    m_free = new TQLabel( TQString( "%1 %2" ).arg( free, free_dim ), this );
+    m_free = new TQLabel( TQString( "%1 %2" ).tqarg( free, free_dim ), this );
     m_layout->addWidget( m_free, 5, 2, 0 );
 
     m_layout->addWidget( new TQLabel( i18n( "Used:" ), this, "UsedLabel" ), 6, 1, 0 );
-    m_used = new TQLabel( TQString( "%1 %2" ).arg( used, used_dim ), this );
+    m_used = new TQLabel( TQString( "%1 %2" ).tqarg( used, used_dim ), this );
     m_layout->addWidget( m_used, 6, 2, 0 );
 
     m_layout->addWidget( new TQLabel( i18n( "Total:" ), this, "TotalLabel" ), 7, 1, 0 );
-    m_total = new TQLabel( TQString( "%1 %2" ).arg( total, total_dim ), this );
+    m_total = new TQLabel( TQString( "%1 %2" ).tqarg( total, total_dim ), this );
     m_layout->addWidget( m_total, 7, 2, 0 );
 
     m_layout->addWidget( new TQLabel( i18n( "Usage:" ), this, "UsageLabel" ), 8, 1, 0 );
-    m_usage = new TQLabel( TQString( "%1 %" ).arg( m_item->shareObject()->percentage(), 0, 'f', 1 ), this );
+    m_usage = new TQLabel( TQString( "%1 %" ).tqarg( m_item->shareObject()->percentage(), 0, 'f', 1 ), this );
     m_layout->addWidget( m_usage, 8, 2, 0 );
   }
   else
@@ -268,13 +268,13 @@ void Smb4KSharesListViewToolTip::update()
         used_dim = "GB";
       }
 
-      used = TQString( "%1" ).arg( tmp_used, 0, 'f', 1 );
+      used = TQString( "%1" ).tqarg( tmp_used, 0, 'f', 1 );
     }
     else
     {
       used_dim = "kB";
       double tmp_used = m_item->shareObject()->totalDiskSpace() - m_item->shareObject()->freeDiskSpace();
-      used = TQString( "%1" ).arg( tmp_used, 0, 'f', 1 );
+      used = TQString( "%1" ).tqarg( tmp_used, 0, 'f', 1 );
     }
 
     if ( m_item->shareObject()->freeDiskSpace() >= 1024 )
@@ -288,12 +288,12 @@ void Smb4KSharesListViewToolTip::update()
         free_dim = "GB";
       }
 
-      free = TQString( "%1" ).arg( tmp_free, 0, 'f', 1 );
+      free = TQString( "%1" ).tqarg( tmp_free, 0, 'f', 1 );
     }
     else
     {
       free_dim = "kB";
-      free = TQString( "%1" ).arg( m_item->shareObject()->freeDiskSpace(), 0, 'f', 1 );
+      free = TQString( "%1" ).tqarg( m_item->shareObject()->freeDiskSpace(), 0, 'f', 1 );
     }
 
     if ( m_item->shareObject()->totalDiskSpace() >= 1024 )
@@ -307,18 +307,18 @@ void Smb4KSharesListViewToolTip::update()
         total_dim = "GB";
       }
 
-      total = TQString( "%1" ).arg( tmp_total, 0, 'f', 1 );
+      total = TQString( "%1" ).tqarg( tmp_total, 0, 'f', 1 );
     }
     else
     {
       total_dim = "kB";
-      total = TQString( "%1" ).arg( m_item->shareObject()->totalDiskSpace(), 0, 'f', 1 );
+      total = TQString( "%1" ).tqarg( m_item->shareObject()->totalDiskSpace(), 0, 'f', 1 );
     }
 
-    m_free->setText( TQString( "%1 %2" ).arg( free, free_dim ) );
-    m_used->setText( TQString( "%1 %2" ).arg( used, used_dim ) );
-    m_total->setText( TQString( "%1 %2" ).arg( total, total_dim ) );
-    m_usage->setText( TQString( "%1 %" ).arg( m_item->shareObject()->percentage(), 0, 'f', 1 ) );
+    m_free->setText( TQString( "%1 %2" ).tqarg( free, free_dim ) );
+    m_used->setText( TQString( "%1 %2" ).tqarg( used, used_dim ) );
+    m_total->setText( TQString( "%1 %2" ).tqarg( total, total_dim ) );
+    m_usage->setText( TQString( "%1 %" ).tqarg( m_item->shareObject()->percentage(), 0, 'f', 1 ) );
   }
   else
   {
diff --git a/smb4k/listview/smb4kshareslistviewtooltip.h b/smb4k/listview/smb4kshareslistviewtooltip.h
index 38c58a2..41fc91f 100644
--- a/smb4k/listview/smb4kshareslistviewtooltip.h
+++ b/smb4k/listview/smb4kshareslistviewtooltip.h
@@ -33,7 +33,7 @@
 // TQt includes
 #include <tqlabel.h>
 #include <tqpoint.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 // Forward declarations:
 class Smb4KSharesListViewItem;
@@ -115,7 +115,7 @@ class Smb4KSharesListViewToolTip : public TQLabel
     Smb4KSharesListViewItem *m_item;
 
     /**
-     * The layout of the tool tip.
+     * The tqlayout of the tool tip.
      */
     TQGridLayout *m_layout;