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

3 files changed, 24 insertions, 24 deletions

diff --git a/smb4k/iconview/smb4ksharesiconviewitem.h b/smb4k/iconview/smb4ksharesiconviewitem.h
index 9be9502..0d247f6 100644
--- a/smb4k/iconview/smb4ksharesiconviewitem.h
+++ b/smb4k/iconview/smb4ksharesiconviewitem.h
@@ -32,7 +32,7 @@
 
 // TQt includes
 #include <tqpainter.h>
-#include <tqpalette.h>
+#include <palette.h>
 
 // KDE includes
 #include <kiconview.h>
diff --git a/smb4k/iconview/smb4ksharesiconviewtooltip.cpp b/smb4k/iconview/smb4ksharesiconviewtooltip.cpp
index 0fc29a6..235b198 100644
--- a/smb4k/iconview/smb4ksharesiconviewtooltip.cpp
+++ b/smb4k/iconview/smb4ksharesiconviewtooltip.cpp
@@ -125,7 +125,7 @@ void Smb4KSharesIconViewToolTip::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" ).tqarg( m_item->shareObject()->user(), m_item->shareObject()->group() ), this ), 2, 2, 0 );
+    m_layout->addWidget( new TQLabel( TQString( "%1 - %2" ).arg( m_item->shareObject()->user(), m_item->shareObject()->group() ), this ), 2, 2, 0 );
   }
   else
   {
@@ -161,13 +161,13 @@ void Smb4KSharesIconViewToolTip::setupTip()
         used_dim = "GB";
       }
 
-      used = TQString( "%1" ).tqarg( tmp_used, 0, 'f', 1 );
+      used = TQString( "%1" ).arg( tmp_used, 0, 'f', 1 );
     }
     else
     {
       used_dim = "kB";
       double tmp_used = m_item->shareObject()->totalDiskSpace() - m_item->shareObject()->freeDiskSpace();
-      used = TQString( "%1" ).tqarg( tmp_used, 0, 'f', 1 );
+      used = TQString( "%1" ).arg( tmp_used, 0, 'f', 1 );
     }
 
     if ( m_item->shareObject()->freeDiskSpace() >= 1024 )
@@ -181,12 +181,12 @@ void Smb4KSharesIconViewToolTip::setupTip()
         free_dim = "GB";
       }
 
-      free = TQString( "%1" ).tqarg( tmp_free, 0, 'f', 1 );
+      free = TQString( "%1" ).arg( tmp_free, 0, 'f', 1 );
     }
     else
     {
       free_dim = "kB";
-      free = TQString( "%1" ).tqarg( m_item->shareObject()->freeDiskSpace(), 0, 'f', 1 );
+      free = TQString( "%1" ).arg( m_item->shareObject()->freeDiskSpace(), 0, 'f', 1 );
     }
 
     if ( m_item->shareObject()->totalDiskSpace() >= 1024 )
@@ -200,28 +200,28 @@ void Smb4KSharesIconViewToolTip::setupTip()
         total_dim = "GB";
       }
 
-      total = TQString( "%1" ).tqarg( tmp_total, 0, 'f', 1 );
+      total = TQString( "%1" ).arg( tmp_total, 0, 'f', 1 );
     }
     else
     {
       total_dim = "kB";
-      total = TQString( "%1" ).tqarg( m_item->shareObject()->totalDiskSpace(), 0, 'f', 1 );
+      total = TQString( "%1" ).arg( 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" ).tqarg( free, free_dim ), this );
+    m_free = new TQLabel( TQString( "%1 %2" ).arg( 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" ).tqarg( used, used_dim ), this );
+    m_used = new TQLabel( TQString( "%1 %2" ).arg( 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" ).tqarg( total, total_dim ), this );
+    m_total = new TQLabel( TQString( "%1 %2" ).arg( 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 %" ).tqarg( m_item->shareObject()->percentage(), 0, 'f', 1 ), this );
+    m_usage = new TQLabel( TQString( "%1 %" ).arg( m_item->shareObject()->percentage(), 0, 'f', 1 ), this );
     m_layout->addWidget( m_usage, 8, 2, 0 );
   }
   else
@@ -268,13 +268,13 @@ void Smb4KSharesIconViewToolTip::update()
         used_dim = "GB";
       }
 
-      used = TQString( "%1" ).tqarg( tmp_used, 0, 'f', 1 );
+      used = TQString( "%1" ).arg( tmp_used, 0, 'f', 1 );
     }
     else
     {
       used_dim = "kB";
       double tmp_used = m_item->shareObject()->totalDiskSpace() - m_item->shareObject()->freeDiskSpace();
-      used = TQString( "%1" ).tqarg( tmp_used, 0, 'f', 1 );
+      used = TQString( "%1" ).arg( tmp_used, 0, 'f', 1 );
     }
 
     if ( m_item->shareObject()->freeDiskSpace() >= 1024 )
@@ -288,12 +288,12 @@ void Smb4KSharesIconViewToolTip::update()
         free_dim = "GB";
       }
 
-      free = TQString( "%1" ).tqarg( tmp_free, 0, 'f', 1 );
+      free = TQString( "%1" ).arg( tmp_free, 0, 'f', 1 );
     }
     else
     {
       free_dim = "kB";
-      free = TQString( "%1" ).tqarg( m_item->shareObject()->freeDiskSpace(), 0, 'f', 1 );
+      free = TQString( "%1" ).arg( m_item->shareObject()->freeDiskSpace(), 0, 'f', 1 );
     }
 
     if ( m_item->shareObject()->totalDiskSpace() >= 1024 )
@@ -307,18 +307,18 @@ void Smb4KSharesIconViewToolTip::update()
         total_dim = "GB";
       }
 
-      total = TQString( "%1" ).tqarg( tmp_total, 0, 'f', 1 );
+      total = TQString( "%1" ).arg( tmp_total, 0, 'f', 1 );
     }
     else
     {
       total_dim = "kB";
-      total = TQString( "%1" ).tqarg( m_item->shareObject()->totalDiskSpace(), 0, 'f', 1 );
+      total = TQString( "%1" ).arg( m_item->shareObject()->totalDiskSpace(), 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 ) );
+    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 ) );
   }
   else
   {
diff --git a/smb4k/iconview/smb4ksharesiconviewtooltip.h b/smb4k/iconview/smb4ksharesiconviewtooltip.h
index 4b61345..f009a1b 100644
--- a/smb4k/iconview/smb4ksharesiconviewtooltip.h
+++ b/smb4k/iconview/smb4ksharesiconviewtooltip.h
@@ -33,7 +33,7 @@
 // TQt includes
 #include <tqlabel.h>
 #include <tqpoint.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 // Forward declarations:
 class Smb4KSharesIconViewItem;
@@ -115,7 +115,7 @@ class Smb4KSharesIconViewToolTip : public TQLabel
     Smb4KSharesIconViewItem *m_item;
 
     /**
-     * The tqlayout of the tool tip.
+     * The layout of the tool tip.
      */
     TQGridLayout *m_layout;