Rename obsolete tq methods to standard names

11 files changed, 43 insertions, 43 deletions

diff --git a/ksim/monitors/cpu/ksimcpu.cpp b/ksim/monitors/cpu/ksimcpu.cpp
index 9be4b15..fc7ccca 100644
--- a/ksim/monitors/cpu/ksimcpu.cpp
+++ b/ksim/monitors/cpu/ksimcpu.cpp
@@ -377,26 +377,26 @@ CpuConfig::CpuConfig(KSim::PluginObject *parent, const char *name)
 
   mainLayout->addWidget( m_listView );
 
-  TQHBoxLayout * tqlayout = new TQHBoxLayout;
-  tqlayout->setSpacing( 6 );
+  TQHBoxLayout * layout = new TQHBoxLayout;
+  layout->setSpacing( 6 );
 
   TQSpacerItem * spacer = new TQSpacerItem( 20, 20,
      TQSizePolicy::Expanding, TQSizePolicy::Minimum );
-  tqlayout->addItem(spacer);
+  layout->addItem(spacer);
 
   m_modify = new TQPushButton( this );
   m_modify->setText( i18n( "Modify..." ) );
   connect( m_modify, TQT_SIGNAL( clicked() ), TQT_SLOT( modify() ) );
-  tqlayout->addWidget( m_modify );
-  mainLayout->addLayout( tqlayout );
+  layout->addWidget( m_modify );
+  mainLayout->addLayout( layout );
 
   m_legendBox = new TQGroupBox(this);
   m_legendBox->setColumnLayout(0, Qt::Vertical);
   m_legendBox->setTitle(i18n("Chart Legend"));
-  m_legendBox->tqlayout()->setSpacing(0);
-  m_legendBox->tqlayout()->setMargin(0);
+  m_legendBox->layout()->setSpacing(0);
+  m_legendBox->layout()->setMargin(0);
 
-  m_legendLayout = new TQVBoxLayout(m_legendBox->tqlayout());
+  m_legendLayout = new TQVBoxLayout(m_legendBox->layout());
   m_legendLayout->setAlignment(TQt::AlignTop);
   m_legendLayout->setSpacing(6);
   m_legendLayout->setMargin(11);
diff --git a/ksim/monitors/disk/ksimdisk.cpp b/ksim/monitors/disk/ksimdisk.cpp
index c0123d4..7a778fd 100644
--- a/ksim/monitors/disk/ksimdisk.cpp
+++ b/ksim/monitors/disk/ksimdisk.cpp
@@ -482,23 +482,23 @@ DiskConfig::DiskConfig(KSim::PluginObject *parent, const char *name)
   m_listview->addColumn(i18n("Disks"));
   m_layout->addWidget(m_listview);
 
-  TQHBoxLayout *tqlayout = new TQHBoxLayout;
-  tqlayout->setSpacing(6);
+  TQHBoxLayout *layout = new TQHBoxLayout;
+  layout->setSpacing(6);
 
   TQSpacerItem *spacer = new TQSpacerItem(20, 20,
      TQSizePolicy::Expanding, TQSizePolicy::Minimum);
-  tqlayout->addItem(spacer);
+  layout->addItem(spacer);
 
   m_add = new TQPushButton(this);
   m_add->setText(i18n("Add..."));
   connect(m_add, TQT_SIGNAL(clicked()), TQT_SLOT(addItem()));
-  tqlayout->addWidget(m_add);
+  layout->addWidget(m_add);
 
   m_remove = new TQPushButton(this);
   m_remove->setText(i18n("Remove"));
   connect(m_remove, TQT_SIGNAL(clicked()), TQT_SLOT(removeItem()));
-  tqlayout->addWidget(m_remove);
-  m_layout->addLayout(tqlayout);
+  layout->addWidget(m_remove);
+  m_layout->addLayout(layout);
 
   m_buttonBox = new TQVButtonGroup(i18n("Disk Styles"), this);
   m_layout->addWidget(m_buttonBox);
diff --git a/ksim/monitors/i8k/ksimi8k.cpp b/ksim/monitors/i8k/ksimi8k.cpp
index 66eadf2..46a96e0 100644
--- a/ksim/monitors/i8k/ksimi8k.cpp
+++ b/ksim/monitors/i8k/ksimi8k.cpp
@@ -151,15 +151,15 @@ void I8KView::closeStream()
 
 void I8KView::initGUI()
 {
-  TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
+  TQVBoxLayout *layout = new TQVBoxLayout( this );
 
   m_fan1Label = new KSim::Label( this );
   m_fan2Label = new KSim::Label( this );
   m_tempLabel = new KSim::Label( this );
 
-  tqlayout->addWidget( m_fan1Label );
-  tqlayout->addWidget( m_fan2Label );
-  tqlayout->addWidget( m_tempLabel );
+  layout->addWidget( m_fan1Label );
+  layout->addWidget( m_fan2Label );
+  layout->addWidget( m_tempLabel );
 }
 
 void I8KView::updateView()
@@ -218,14 +218,14 @@ I8KConfig::I8KConfig(KSim::PluginObject *parent, const char *name)
   m_interval->setRange( 2, 60, 1, true );
   m_interval->setSuffix( i18n( " sec" ) );
 
-  TQGridLayout *tqlayout = new TQGridLayout( this, 3, 2, 0, 
+  TQGridLayout *layout = new TQGridLayout( this, 3, 2, 0, 
       KDialog::spacingHint() );
 
-  tqlayout->addMultiCellWidget( m_unit, 0, 0, 0, 1 );
-  tqlayout->addWidget( label, 1, 0 );
-  tqlayout->addWidget( m_interval, 1, 1 );
-  tqlayout->setColStretch( 1, 1 );
-  tqlayout->setRowStretch( 2, 1 );
+  layout->addMultiCellWidget( m_unit, 0, 0, 0, 1 );
+  layout->addWidget( label, 1, 0 );
+  layout->addWidget( m_interval, 1, 1 );
+  layout->setColStretch( 1, 1 );
+  layout->setRowStretch( 2, 1 );
 }
 
 I8KConfig::~I8KConfig()
diff --git a/ksim/monitors/mail/ksimmail.cpp b/ksim/monitors/mail/ksimmail.cpp
index 1f35224..fdda6bd 100644
--- a/ksim/monitors/mail/ksimmail.cpp
+++ b/ksim/monitors/mail/ksimmail.cpp
@@ -69,10 +69,10 @@ void MailPlugin::showAbout()
 MailView::MailView( KSim::PluginObject* parent, const char* name )
 	: KSim::PluginView( parent, name )
 {
-	TQVBoxLayout* tqlayout = new TQVBoxLayout( this );
+	TQVBoxLayout* layout = new TQVBoxLayout( this );
 
 	MailLabel* label = new MailLabel( this );
-	tqlayout->addWidget( label, 0, AlignHCenter );
+	layout->addWidget( label, 0, AlignHCenter );
 }
 
 MailView::~MailView()
diff --git a/ksim/monitors/net/netconfig.cpp b/ksim/monitors/net/netconfig.cpp
index b376c24..4444d4c 100644
--- a/ksim/monitors/net/netconfig.cpp
+++ b/ksim/monitors/net/netconfig.cpp
@@ -56,29 +56,29 @@ NetConfig::NetConfig(KSim::PluginObject *parent, const char *name)
      TQT_SLOT(modifyItem(TQListViewItem *)));
   mainLayout->addWidget(usingBox);
 
-  tqlayout = new TQHBoxLayout;
-  tqlayout->setSpacing(6);
+  layout = new TQHBoxLayout;
+  layout->setSpacing(6);
 
   TQSpacerItem *spacer = new TQSpacerItem(20, 20,
      TQSizePolicy::Expanding, TQSizePolicy::Minimum);
-  tqlayout->addItem(spacer);
+  layout->addItem(spacer);
 
   insertButton = new TQPushButton(this);
   insertButton->setText(i18n("Add..."));
   connect(insertButton, TQT_SIGNAL(clicked()), TQT_SLOT(showNetDialog()));
-  tqlayout->addWidget(insertButton);
+  layout->addWidget(insertButton);
 
   modifyButton = new TQPushButton(this);
   modifyButton->setText(i18n("Modify..."));
   connect(modifyButton, TQT_SIGNAL(clicked()), TQT_SLOT(modifyCurrent()));
-  tqlayout->addWidget(modifyButton);
+  layout->addWidget(modifyButton);
 
   removeButton = new TQPushButton(this);
   removeButton->setText(i18n("Remove"));
   connect(removeButton, TQT_SIGNAL(clicked()), TQT_SLOT(removeCurrent()));
-  tqlayout->addWidget(removeButton);
+  layout->addWidget(removeButton);
 
-  mainLayout->addLayout(tqlayout);
+  mainLayout->addLayout(layout);
 }
 
 NetConfig::~NetConfig()
diff --git a/ksim/monitors/net/netconfig.h b/ksim/monitors/net/netconfig.h
index 4d6de56..c2b5387 100644
--- a/ksim/monitors/net/netconfig.h
+++ b/ksim/monitors/net/netconfig.h
@@ -54,7 +54,7 @@ class NetConfig : public KSim::PluginPage
     // Couldnt think of a better name for this :)
     const TQString &boolToString(bool) const;
 
-    TQHBoxLayout *tqlayout;
+    TQHBoxLayout *layout;
     TQPushButton *insertButton;
     TQPushButton *removeButton;
     TQPushButton *modifyButton;
diff --git a/ksim/monitors/net/netdialog.cpp b/ksim/monitors/net/netdialog.cpp
index 997f9b2..735e3ce 100644
--- a/ksim/monitors/net/netdialog.cpp
+++ b/ksim/monitors/net/netdialog.cpp
@@ -86,9 +86,9 @@ NetDialog::NetDialog(TQWidget *parent, const char *name)
   m_timerBox = new TQGroupBox(m_generalTab);
   m_timerBox->setTitle(i18n("Timer"));
   m_timerBox->setColumnLayout(0, Qt::Vertical);
-  m_timerBox->tqlayout()->setSpacing(0);
-  m_timerBox->tqlayout()->setMargin(0);
-  m_timerBoxLayout = new TQVBoxLayout(m_timerBox->tqlayout());
+  m_timerBox->layout()->setSpacing(0);
+  m_timerBox->layout()->setMargin(0);
+  m_timerBoxLayout = new TQVBoxLayout(m_timerBox->layout());
   m_timerBoxLayout->setAlignment(TQt::AlignTop);
   m_timerBoxLayout->setSpacing(6);
   m_timerBoxLayout->setMargin(11);
diff --git a/ksim/monitors/snmp/browsedialogbase.ui b/ksim/monitors/snmp/browsedialogbase.ui
index 9bfae99..3dfc236 100644
--- a/ksim/monitors/snmp/browsedialogbase.ui
+++ b/ksim/monitors/snmp/browsedialogbase.ui
@@ -24,7 +24,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -157,7 +157,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="2" column="0">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/ksim/monitors/snmp/hostdialogbase.ui b/ksim/monitors/snmp/hostdialogbase.ui
index 12fe8ab..f25aa12 100644
--- a/ksim/monitors/snmp/hostdialogbase.ui
+++ b/ksim/monitors/snmp/hostdialogbase.ui
@@ -384,7 +384,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="5">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/ksim/monitors/snmp/monitordialogbase.ui b/ksim/monitors/snmp/monitordialogbase.ui
index 628c5dd..bb7f7cc 100644
--- a/ksim/monitors/snmp/monitordialogbase.ui
+++ b/ksim/monitors/snmp/monitordialogbase.ui
@@ -112,7 +112,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="3" column="1" rowspan="1" colspan="3">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -174,7 +174,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="4" column="1" rowspan="1" colspan="3">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/ksim/monitors/snmp/session.cpp b/ksim/monitors/snmp/session.cpp
index 2f16adc..6d63fab 100644
--- a/ksim/monitors/snmp/session.cpp
+++ b/ksim/monitors/snmp/session.cpp
@@ -54,7 +54,7 @@ Session::Session( const HostConfig &source )
 
     d->source = source;
 
-    // tqunicode madness
+    // unicode madness
     d->host = source.name.ascii();
     d->community = source.community.ascii();
     d->securityName = source.securityName.ascii();