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

This reverts commit 73c08b592db45af554b9f21029bc549d70f683ab.
---
 kcontrol/samba/kcmsambaimports.cpp    |  2 +-
 kcontrol/samba/kcmsambalog.cpp        | 16 ++++++++--------
 kcontrol/samba/kcmsambastatistics.cpp | 26 +++++++++++++-------------
 kcontrol/samba/ksmbstatus.cpp         |  2 +-
 kcontrol/samba/main.cpp               |  2 +-
 5 files changed, 24 insertions(+), 24 deletions(-)

(limited to 'kcontrol/samba')

diff --git a/kcontrol/samba/kcmsambaimports.cpp b/kcontrol/samba/kcmsambaimports.cpp
index 6f9e523d2..fd31f7800 100644
--- a/kcontrol/samba/kcmsambaimports.cpp
+++ b/kcontrol/samba/kcmsambaimports.cpp
@@ -23,7 +23,7 @@
 #include "kcmsambaimports.h"
 #include "kcmsambaimports.moc"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqwhatsthis.h>
 
 #include <klocale.h>
diff --git a/kcontrol/samba/kcmsambalog.cpp b/kcontrol/samba/kcmsambalog.cpp
index eb69f81e2..8b56a9fe0 100644
--- a/kcontrol/samba/kcmsambalog.cpp
+++ b/kcontrol/samba/kcmsambalog.cpp
@@ -22,7 +22,7 @@
  */
 
 #include <tqfile.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqwhatsthis.h>
 
 #include <kmessagebox.h>
@@ -116,14 +116,14 @@ LogView::LogView(TQWidget *parent,KConfig *config, const char *name)
    connect(&updateButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(updateList()));
    emit contentsChanged(&viewHistory,0,0);
 
-   label.setMinimumSize(label.sizeHint());
-   logFileName.setMinimumSize(250,logFileName.sizeHint().height());
+   label.setMinimumSize(label.tqsizeHint());
+   logFileName.setMinimumSize(250,logFileName.tqsizeHint().height());
    viewHistory.setMinimumSize(425,200);
-   showConnOpen.setMinimumSize(showConnOpen.sizeHint());
-   showConnClose.setMinimumSize(showConnClose.sizeHint());
-   showFileOpen.setMinimumSize(showFileOpen.sizeHint());
-   showFileClose.setMinimumSize(showFileClose.sizeHint());
-   updateButton.setFixedSize(updateButton.sizeHint());
+   showConnOpen.setMinimumSize(showConnOpen.tqsizeHint());
+   showConnClose.setMinimumSize(showConnClose.tqsizeHint());
+   showFileOpen.setMinimumSize(showFileOpen.tqsizeHint());
+   showFileClose.setMinimumSize(showFileClose.tqsizeHint());
+   updateButton.setFixedSize(updateButton.tqsizeHint());
 }
 
 void LogView::loadSettings()
diff --git a/kcontrol/samba/kcmsambastatistics.cpp b/kcontrol/samba/kcmsambastatistics.cpp
index 8032e91fb..ee9a8ab20 100644
--- a/kcontrol/samba/kcmsambastatistics.cpp
+++ b/kcontrol/samba/kcmsambastatistics.cpp
@@ -23,7 +23,7 @@
 #include "kcmsambastatistics.h"
 #include "kcmsambastatistics.moc"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlistview.h>
 #include <tqlabel.h>
 #include <tqlineedit.h>
@@ -80,18 +80,18 @@ StatisticsView::StatisticsView(TQWidget *parent,KConfig *config, const char *nam
    hostLe->setText("*");
    
    viewStatistics->setMinimumSize(375,200);
-   connectionsL->setMinimumSize(connectionsL->sizeHint());
-   filesL->setMinimumSize(filesL->sizeHint());
-   eventL->setMinimumSize(eventL->sizeHint());
-   eventCb->setMinimumSize(eventCb->sizeHint());
-   hostL->setMinimumSize(hostL->sizeHint());
-   hostLe->setMinimumSize(120,hostLe->sizeHint().height());
-   serviceL->setMinimumSize(serviceL->sizeHint());
-   serviceLe->setMinimumSize(120,serviceLe->sizeHint().height());
-   calcButton->setMinimumSize(calcButton->sizeHint());
-   clearButton->setMinimumSize(clearButton->sizeHint());
-   expandedInfoCb->setMinimumSize(expandedInfoCb->sizeHint());
-   expandedUserCb->setMinimumSize(expandedUserCb->sizeHint());
+   connectionsL->setMinimumSize(connectionsL->tqsizeHint());
+   filesL->setMinimumSize(filesL->tqsizeHint());
+   eventL->setMinimumSize(eventL->tqsizeHint());
+   eventCb->setMinimumSize(eventCb->tqsizeHint());
+   hostL->setMinimumSize(hostL->tqsizeHint());
+   hostLe->setMinimumSize(120,hostLe->tqsizeHint().height());
+   serviceL->setMinimumSize(serviceL->tqsizeHint());
+   serviceLe->setMinimumSize(120,serviceLe->tqsizeHint().height());
+   calcButton->setMinimumSize(calcButton->tqsizeHint());
+   clearButton->setMinimumSize(clearButton->tqsizeHint());
+   expandedInfoCb->setMinimumSize(expandedInfoCb->tqsizeHint());
+   expandedUserCb->setMinimumSize(expandedUserCb->tqsizeHint());
    
    TQVBoxLayout *topLayout=new TQVBoxLayout(this, KDialog::marginHint(),
       KDialog::spacingHint());
diff --git a/kcontrol/samba/ksmbstatus.cpp b/kcontrol/samba/ksmbstatus.cpp
index 6bc3db83d..bf775deab 100644
--- a/kcontrol/samba/ksmbstatus.cpp
+++ b/kcontrol/samba/ksmbstatus.cpp
@@ -22,7 +22,7 @@
 #include <string.h>
 #include <time.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <klocale.h>
 #include <kdialog.h>
diff --git a/kcontrol/samba/main.cpp b/kcontrol/samba/main.cpp
index 89db68747..88d95680a 100644
--- a/kcontrol/samba/main.cpp
+++ b/kcontrol/samba/main.cpp
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtabwidget.h>
 
 #include <kaboutdata.h>
-- 
cgit v1.2.1