From 83677e35509b4dafac63b76995652bdf3b49f209 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 16 Dec 2011 09:59:34 -0600
Subject: Revert "Rename a number of old tq methods that are no longer tq
 specific"

This reverts commit 808e453c56036211f57482ed847d54aca01bba68.
---
 wifi/kwifimanager.cpp | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

(limited to 'wifi/kwifimanager.cpp')

diff --git a/wifi/kwifimanager.cpp b/wifi/kwifimanager.cpp
index 8ce5b07e..67b9378e 100644
--- a/wifi/kwifimanager.cpp
+++ b/wifi/kwifimanager.cpp
@@ -22,7 +22,7 @@
 // include files for QT
 #include <tqdatetime.h>
 #include <tqdir.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtooltip.h>
 #include <tqimage.h>
 #include <tqbitmap.h>
@@ -184,7 +184,7 @@ KWiFiManagerApp::slotLogESSID (TQString essid)
   if (!log_file.open (IO_WriteOnly | IO_Append))
     kdDebug () << "Logging failed!" << endl;
   TQTextStream stream (&log_file);
-  stream << TQDateTime::currentDateTime().toString ().latin1 ();
+  stream << TQDateTime::tqcurrentDateTime().toString ().latin1 ();
   stream << " Entering network: " << essid.latin1() << endl;
   log_file.close ();
 }
@@ -262,7 +262,7 @@ KWiFiManagerApp::slotChangeTrayIcon ()
     }
   else if (((str == 0) && (mode == 2)) || (!validdata))
     {
-      sstrength2.setText( TQString::fromLatin1("0") );
+      sstrength2.setText( TQString::tqfromLatin1("0") );
       ICON = strength->OOR_DOWN;
       if (led->state == true)
 	led->Off ();
@@ -286,7 +286,7 @@ KWiFiManagerApp::slotChangeTrayIcon ()
     labelfont.setStretch( TQFont::Condensed );
     labelfont.setBold( true );
     sstrength2.setFont( labelfont );
-    sstrength2.setFixedSize( sstrength2.sizeHint() );
+    sstrength2.setFixedSize( sstrength2.tqsizeHint() );
       }
     TQPixmap labeltemp = TQPixmap::grabWidget( &sstrength2 );
     labeltemp.setMask( labeltemp.createHeuristicMask() );
@@ -360,10 +360,10 @@ KWiFiManagerApp::initView ()
   view = new TQWidget (this, "mainwidget");
   view->setBackgroundMode (PaletteBackground);
   setCentralWidget (view);
-  TQGridLayout *zentrallayout = new TQGridLayout (view);
-  zentrallayout->setMargin( KDialog::marginHint() );
+  TQGridLayout *zentraltqlayout = new TQGridLayout (view);
+  zentraltqlayout->setMargin( KDialog::marginHint() );
   speedmeter = new Speed (view, device);
-  status = new Status (view, device);
+  status = new tqStatus (view, device);
   location = new Locator (view, device);
   strength = new Strength (view, device);
   pictogram = new Picture (view, device);
@@ -377,25 +377,25 @@ KWiFiManagerApp::initView ()
   strength->setMinimumSize (strength->mySizeHint());
   speedmeter->setMinimumHeight (60);
   status->setMinimumHeight (60);
-  zentrallayout->addWidget (pictogram, 0, 0);
-  zentrallayout->addWidget (strength, 1, 0);
-  zentrallayout->addWidget (speedmeter, 0, 1);
-  zentrallayout->addMultiCellWidget (status, 1, 2, 1, 1);
-  zentrallayout->addWidget (scan, 2, 0);
-  zentrallayout->addMultiCellWidget (location, 3, 3, 0, 1, TQt::AlignLeft);
+  zentraltqlayout->addWidget (pictogram, 0, 0);
+  zentraltqlayout->addWidget (strength, 1, 0);
+  zentraltqlayout->addWidget (speedmeter, 0, 1);
+  zentraltqlayout->addMultiCellWidget (status, 1, 2, 1, 1);
+  zentraltqlayout->addWidget (scan, 2, 0);
+  zentraltqlayout->addMultiCellWidget (location, 3, 3, 0, 1, TQt::AlignLeft);
   connect (device, TQT_SIGNAL (interfaceChanged ()), this, TQT_SLOT (slotChangeWindowCaption ()));
   connect (device, TQT_SIGNAL (strengthChanged ()), this, TQT_SLOT (slotChangeTrayIcon ()));
-  connect (device, TQT_SIGNAL (strengthChanged ()), strength, TQT_SLOT (repaint ()));
-  connect (device, TQT_SIGNAL (statusChanged ()), status, TQT_SLOT (repaint ()));
-  connect (device, TQT_SIGNAL (speedChanged ()), speedmeter, TQT_SLOT (repaint ()));
-  connect (device, TQT_SIGNAL (modeChanged ()), pictogram, TQT_SLOT (repaint ()));
+  connect (device, TQT_SIGNAL (strengthChanged ()), strength, TQT_SLOT (tqrepaint ()));
+  connect (device, TQT_SIGNAL (statusChanged ()), status, TQT_SLOT (tqrepaint ()));
+  connect (device, TQT_SIGNAL (speedChanged ()), speedmeter, TQT_SLOT (tqrepaint ()));
+  connect (device, TQT_SIGNAL (modeChanged ()), pictogram, TQT_SLOT (tqrepaint ()));
   connect (device, TQT_SIGNAL (essidChanged (TQString)), this, TQT_SLOT (slotLogESSID (TQString)));
-  connect (device, TQT_SIGNAL (essidChanged (TQString)), location, TQT_SLOT (repaint ()));
-  connect (device, TQT_SIGNAL (statusChanged ()), location, TQT_SLOT (repaint ()));
+  connect (device, TQT_SIGNAL (essidChanged (TQString)), location, TQT_SLOT (tqrepaint ()));
+  connect (device, TQT_SIGNAL (statusChanged ()), location, TQT_SLOT (tqrepaint ()));
   connect (device, TQT_SIGNAL (txPowerChanged ()), this, TQT_SLOT (slotTXPowerChanged ()));
   connect (device, TQT_SIGNAL (txPowerChanged ()), this, TQT_SLOT (slotChangeTrayIcon ()));
-  connect (device, TQT_SIGNAL (txPowerChanged ()), pictogram, TQT_SLOT (repaint ()));
-  connect (device, TQT_SIGNAL (txPowerChanged ()), strength, TQT_SLOT (repaint ()));
+  connect (device, TQT_SIGNAL (txPowerChanged ()), pictogram, TQT_SLOT (tqrepaint ()));
+  connect (device, TQT_SIGNAL (txPowerChanged ()), strength, TQT_SLOT (tqrepaint ()));
   connect (scan,  TQT_SIGNAL (clicked()), this, TQT_SLOT (slotNetworkScan()));
 }
 
@@ -427,7 +427,7 @@ KWiFiManagerApp::slotStartStatViewer ()
   delete statistik;
   statistik = new Statistics (device, showStatsNoise);
   statistik->setFixedSize (590, 300);
-  connect(device,TQT_SIGNAL(statsUpdated()),statistik,TQT_SLOT(repaint()));
+  connect(device,TQT_SIGNAL(statsUpdated()),statistik,TQT_SLOT(tqrepaint()));
   statistik->show ();
 }
 
-- 
cgit v1.2.3