1 files changed, 12 insertions, 12 deletions

diff --git a/lib/kotext/KFontDialog_local.cpp b/lib/kotext/KFontDialog_local.cpp
index 7afeb354..beaeb9f9 100644
--- a/lib/kotext/KFontDialog_local.cpp
+++ b/lib/kotext/KFontDialog_local.cpp
@@ -34,7 +34,7 @@
 #include <tqfont.h>
 #include <tqgroupbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqscrollbar.h>
 #include <tqstringlist.h>
 #include <tqfontdatabase.h>
@@ -69,7 +69,7 @@ static int minimumListWidth( const TQListBox *list )
   }
   if( w == 0 ) { w = 40; }
   w += list->frameWidth() * 2;
-  w += list->verticalScrollBar()->sizeHint().width();
+  w += list->verticalScrollBar()->tqsizeHint().width();
   return w;
 }
 
@@ -297,7 +297,7 @@ KFontChooser_local::KFontChooser_local(TQWidget *parent, const char *name,
   sampleEdit->setFont(tmpFont);
   sampleEdit->setText(i18n("The Quick Brown Fox Jumps Over The Lazy Dog"));
   sampleEdit->setMinimumHeight( sampleEdit->fontMetrics().lineSpacing() );
-  sampleEdit->setAlignment(TQt::AlignCenter);
+  sampleEdit->tqsetAlignment(TQt::AlignCenter);
   gridLayout->addMultiCellWidget(sampleEdit, 4, 4, 0, 2);
   TQString sampleEditWhatsThisText =
     i18n("This sample text illustrates the current settings. "
@@ -333,8 +333,8 @@ KFontChooser_local::KFontChooser_local(TQWidget *parent, const char *name,
     setSizeIsRelative( *sizeIsRelativeState );
 
   KConfig *config = KGlobal::config();
-  KConfigGroupSaver saver(config, TQString::fromLatin1("General"));
-  showXLFDArea(config->readBoolEntry(TQString::fromLatin1("fontSelectorShowXLFD"), false));
+  KConfigGroupSaver saver(config, TQString::tqfromLatin1("General"));
+  showXLFDArea(config->readBoolEntry(TQString::tqfromLatin1("fontSelectorShowXLFD"), false));
 }
 
 KFontChooser_local::~KFontChooser_local()
@@ -405,9 +405,9 @@ TQButton::ToggleState KFontChooser_local::sizeIsRelative() const
        : TQButton::NoChange;
 }
 
-TQSize KFontChooser_local::sizeHint( void ) const
+TQSize KFontChooser_local::tqsizeHint( void ) const
 {
-  return minimumSizeHint();
+  return tqminimumSizeHint();
 }
 
 
@@ -473,7 +473,7 @@ void KFontChooser_local::family_chosen_slot(const TQString& family)
 
 
     TQFontDatabase dbase;
-    TQStringList styles = TQStringList(dbase.styles(currentFamily));
+    TQStringList styles = TQStringList(dbase.tqstyles(currentFamily));
     styleListBox->clear();
     currentStyles.clear();
     for ( TQStringList::Iterator it = styles.begin(); it != styles.end(); ++it ) {
@@ -539,7 +539,7 @@ void KFontChooser_local::style_chosen_slot(const TQString& style)
         fillSizeList();
     } else {                                // is bitmap font.
         //sampleEdit->setPaletteBackgroundPixmap( BitmapPixmap ); // TODO
-        TQValueList<int> sizes = dbase.smoothSizes(familyListBox->currentText(), currentStyles[currentStyle]);
+        TQValueList<int> sizes = dbase.tqsmoothSizes(familyListBox->currentText(), currentStyles[currentStyle]);
         if(sizes.count() > 0) {
             TQValueList<int>::iterator it;
             diff=1000;
@@ -654,7 +654,7 @@ void KFontChooser_local::setupDisplay()
 void KFontChooser_local::getFontList( TQStringList &list, uint fontListCriteria)
 {
   TQFontDatabase dbase;
-  TQStringList lstSys(dbase.families());
+  TQStringList lstSys(dbase.tqfamilies());
 
   // if we have criteria; then check fonts before adding
   if (fontListCriteria)
@@ -694,13 +694,13 @@ void KFontChooser_local::addFont( TQStringList &list, const char *xfont )
   if ( !ptr )
     return;
 
-  TQString font = TQString::fromLatin1(ptr + 1);
+  TQString font = TQString::tqfromLatin1(ptr + 1);
 
   int pos;
   if ( ( pos = font.find( '-' ) ) > 0 ) {
     font.truncate( pos );
 
-    if ( font.find( TQString::fromLatin1("open look"), 0, false ) >= 0 )
+    if ( font.find( TQString::tqfromLatin1("open look"), 0, false ) >= 0 )
       return;
 
     TQStringList::Iterator it = list.begin();