Trinity Qt initial conversion

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1157639 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 24 insertions, 24 deletions

diff --git a/kcontrol/locale/localeother.cpp b/kcontrol/locale/localeother.cpp
index 97f97ba2f..1cf6b949b 100644
--- a/kcontrol/locale/localeother.cpp
+++ b/kcontrol/locale/localeother.cpp
@@ -21,10 +21,10 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include <qcombobox.h>
-#include <qlayout.h>
-#include <qlabel.h>
-#include <qprinter.h>
+#include <tqcombobox.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
+#include <tqprinter.h>
 
 #include <kdialog.h>
 #include <klocale.h>
@@ -36,33 +36,33 @@
 
 
 KLocaleConfigOther::KLocaleConfigOther(KLocale *locale,
-                                       QWidget *parent, const char*name)
-  : QWidget(parent, name),
+                                       TQWidget *parent, const char*name)
+  : TQWidget(parent, name),
     m_locale(locale)
 {
   // Other
-  QGridLayout *lay = new QGridLayout(this, 3, 2,
+  TQGridLayout *lay = new TQGridLayout(this, 3, 2,
                                      KDialog::marginHint(),
                                      KDialog::spacingHint());
 
-  m_labPageSize = new QLabel(this, I18N_NOOP("Paper format:"));
+  m_labPageSize = new TQLabel(this, I18N_NOOP("Paper format:"));
   lay->addWidget(m_labPageSize, 0, 0);
-  m_combPageSize = new QComboBox(this);
+  m_combPageSize = new TQComboBox(this);
   lay->addWidget(m_combPageSize, 0, 1);
-  connect( m_combPageSize, SIGNAL( activated(int) ),
-           SLOT( slotPageSizeChanged(int) ) );
+  connect( m_combPageSize, TQT_SIGNAL( activated(int) ),
+           TQT_SLOT( slotPageSizeChanged(int) ) );
 
-  m_labMeasureSystem = new QLabel(this, I18N_NOOP("Measure system:"));
+  m_labMeasureSystem = new TQLabel(this, I18N_NOOP("Measure system:"));
   lay->addWidget(m_labMeasureSystem, 1, 0);
-  m_combMeasureSystem = new QComboBox(this);
+  m_combMeasureSystem = new TQComboBox(this);
   lay->addWidget(m_combMeasureSystem, 1, 1);
-  connect( m_combMeasureSystem, SIGNAL( activated(int) ),
-           SLOT( slotMeasureSystemChanged(int) ) );
+  connect( m_combMeasureSystem, TQT_SIGNAL( activated(int) ),
+           TQT_SLOT( slotMeasureSystemChanged(int) ) );
 
-  m_combPageSize->insertItem(QString::null);
-  m_combPageSize->insertItem(QString::null);
-  m_combMeasureSystem->insertItem(QString::null);
-  m_combMeasureSystem->insertItem(QString::null);
+  m_combPageSize->insertItem(TQString::null);
+  m_combPageSize->insertItem(TQString::null);
+  m_combMeasureSystem->insertItem(TQString::null);
+  m_combMeasureSystem->insertItem(TQString::null);
 
   lay->setColStretch(1, 1);
   lay->addRowSpacing(2, 0);
@@ -80,13 +80,13 @@ void KLocaleConfigOther::save()
   KConfigGroupSaver saver(config, "Locale");
 
   KSimpleConfig ent(locate("locale",
-                           QString::fromLatin1("l10n/%1/entry.desktop")
+                           TQString::fromLatin1("l10n/%1/entry.desktop")
                            .arg(m_locale->country())), true);
   ent.setGroup("KCM Locale");
 
   // ### HPB: Add code here
   int i;
-  i = ent.readNumEntry("PageSize", (int)QPrinter::A4);
+  i = ent.readNumEntry("PageSize", (int)TQPrinter::A4);
   config->deleteEntry("PageSize", false, true);
   if (i != m_locale->pageSize())
     config->writeEntry("PageSize",
@@ -108,7 +108,7 @@ void KLocaleConfigOther::slotLocaleChanged()
   int pageSize = m_locale->pageSize();
 
   int i = 0; // default to A4
-  if ( pageSize == (int)QPrinter::Letter )
+  if ( pageSize == (int)TQPrinter::Letter )
     i = 1;
   m_combPageSize->setCurrentItem(i);
 }
@@ -126,10 +126,10 @@ void KLocaleConfigOther::slotTranslate()
 
 void KLocaleConfigOther::slotPageSizeChanged(int i)
 {
-  QPrinter::PageSize pageSize = QPrinter::A4;
+  TQPrinter::PageSize pageSize = TQPrinter::A4;
 
   if ( i == 1 )
-    pageSize = QPrinter::Letter;
+    pageSize = TQPrinter::Letter;
 
   m_locale->setPageSize((int)pageSize);
   emit localeChanged();