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

This reverts commit 5c194e6e7059ddcc96b0e0166ce6157c35fc183e.
---
 kscreensaver/kdesavers/banner.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'kscreensaver/kdesavers/banner.cpp')

diff --git a/kscreensaver/kdesavers/banner.cpp b/kscreensaver/kdesavers/banner.cpp
index bc950ac7..e49ca556 100644
--- a/kscreensaver/kdesavers/banner.cpp
+++ b/kscreensaver/kdesavers/banner.cpp
@@ -4,7 +4,7 @@
 //
 // Copyright (c)  Martin R. Jones 1996
 //
-// layout management added 1998/04/19 by Mario Weilguni <mweilguni@kde.org>
+// tqlayout management added 1998/04/19 by Mario Weilguni <mweilguni@kde.org>
 // clock function and color cycling added 2000/01/09 by Alexander Neundorf <alexander.neundorf@rz.tu-ilmenau.de>
 // 2001/03/04 Converted to use libkscreensaver by Martin R. Jones
 // 2002/04/07 Added random vertical position of text,
@@ -20,7 +20,7 @@
 #include <tqcheckbox.h>
 #include <tqgroupbox.h>
 #include <tqslider.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqdatetime.h>
 #include <tqfontdatabase.h>
 #include <tqpainter.h>
@@ -75,12 +75,12 @@ KBannerSetup::KBannerSetup( TQWidget *parent, const char *name )
 	tl1->addLayout(tl11);
 
 	TQGroupBox *group = new TQGroupBox( 0,Qt::Vertical, i18n("Font"), main );
-	TQGridLayout *gl = new TQGridLayout(group->layout(), 6, 2, spacingHint() );
+	TQGridLayout *gl = new TQGridLayout(group->tqlayout(), 6, 2, spacingHint() );
 
 	label = new TQLabel( i18n("Family:"), group );
 	gl->addWidget(label, 1, 0);
 
-	KFontCombo* comboFonts = new KFontCombo( TQFontDatabase().families(), group );
+	KFontCombo* comboFonts = new KFontCombo( TQFontDatabase().tqfamilies(), group );
 	comboFonts->setCurrentFont( fontFamily );
 	gl->addWidget(comboFonts, 1, 1);
 	connect( comboFonts, TQT_SIGNAL( activated( const TQString& ) ),
@@ -116,7 +116,7 @@ KBannerSetup::KBannerSetup( TQWidget *parent, const char *name )
 		 TQT_SLOT( slotColor(const TQColor &) ) );
 
    TQCheckBox *cyclingColorCb=new TQCheckBox(i18n("Cycling color"),group);
-   cyclingColorCb->setMinimumSize(cyclingColorCb->sizeHint());
+   cyclingColorCb->setMinimumSize(cyclingColorCb->tqsizeHint());
    gl->addMultiCellWidget(cyclingColorCb,5,5,0,1);
    connect(cyclingColorCb,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotCyclingColor(bool)));
    cyclingColorCb->setChecked(cyclingColor);
@@ -155,7 +155,7 @@ KBannerSetup::KBannerSetup( TQWidget *parent, const char *name )
 			TQT_SLOT( slotMessage( const TQString &  ) ) );
 
    TQCheckBox *timeCb=new TQCheckBox( i18n("Show current time"), main);
-   timeCb->setFixedSize(timeCb->sizeHint());
+   timeCb->setFixedSize(timeCb->tqsizeHint());
    tl->addWidget(timeCb,0,TQt::AlignLeft);
    connect(timeCb,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotTimeToggled(bool)));
    timeCb->setChecked(showTime);
@@ -191,7 +191,7 @@ void KBannerSetup::fillFontSizes()
     comboSizes->blockSignals( true );
     comboSizes->clear();
     int i = 0;
-    sizes = TQFontDatabase().pointSizes( fontFamily );
+    sizes = TQFontDatabase().tqpointSizes( fontFamily );
     sizes << 96 << 128 << 156 << 0;
     int current = 0;
     while ( sizes[i] )
-- 
cgit v1.2.1