Rename obsolete tq methods to standard names

5 files changed, 22 insertions, 22 deletions

diff --git a/libk9copy/backupdlg.cpp b/libk9copy/backupdlg.cpp
index c111ceb..6d0539f 100644
--- a/libk9copy/backupdlg.cpp
+++ b/libk9copy/backupdlg.cpp
@@ -48,7 +48,7 @@ backupDlg::backupDlg( TQWidget* parent, const char* name, bool modal, WFlags fl
 
     backupDlgLayout->addMultiCellWidget( textLabel1, 0, 0, 0, 3 );
 
-    tqlayout3 = new TQVBoxLayout( 0, 0, 6, "tqlayout3"); 
+    layout3 = new TQVBoxLayout( 0, 0, 6, "layout3"); 
 
     lblStep = new TQLabel( this, "lblStep" );
     lblStep->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, lblStep->sizePolicy().hasHeightForWidth() ) );
@@ -56,20 +56,20 @@ backupDlg::backupDlg( TQWidget* parent, const char* name, bool modal, WFlags fl
     lblStep_font.setItalic( TRUE );
     lblStep->setFont( lblStep_font ); 
     lblStep->setCursor( TQCursor( 3 ) );
-    tqlayout3->addWidget( lblStep );
+    layout3->addWidget( lblStep );
 
     pbStep = new TQProgressBar( this, "pbStep" );
     pbStep->setCursor( TQCursor( 3 ) );
-    tqlayout3->addWidget( pbStep );
+    layout3->addWidget( pbStep );
 
     pbTotal = new TQProgressBar( this, "pbTotal" );
     pbTotal->setCursor( TQCursor( 3 ) );
     pbTotal->setMargin( 0 );
     pbTotal->setTotalSteps( 4400 );
     pbTotal->setPercentageVisible( TRUE );
-    tqlayout3->addWidget( pbTotal );
+    layout3->addWidget( pbTotal );
 
-    backupDlgLayout->addMultiCellLayout( tqlayout3, 3, 3, 0, 3 );
+    backupDlgLayout->addMultiCellLayout( layout3, 3, 3, 0, 3 );
 
     textLabel1_2 = new TQLabel( this, "textLabel1_2" );
     textLabel1_2->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, textLabel1_2->sizePolicy().hasHeightForWidth() ) );
@@ -83,17 +83,17 @@ backupDlg::backupDlg( TQWidget* parent, const char* name, bool modal, WFlags fl
 
     backupDlgLayout->addWidget( lblTime, 2, 1 );
 
-    tqlayout1 = new TQHBoxLayout( 0, 0, 6, "tqlayout1"); 
+    layout1 = new TQHBoxLayout( 0, 0, 6, "layout1"); 
     spacer1 = new TQSpacerItem( 131, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
-    tqlayout1->addItem( spacer1 );
+    layout1->addItem( spacer1 );
 
     bAbort = new KPushButton( this, "bAbort" );
     bAbort->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, bAbort->sizePolicy().hasHeightForWidth() ) );
     bAbort->setCursor( TQCursor( 0 ) );
     bAbort->setProperty( "stdItem", 26 );
-    tqlayout1->addWidget( bAbort );
+    layout1->addWidget( bAbort );
 
-    backupDlgLayout->addMultiCellLayout( tqlayout1, 4, 4, 0, 3 );
+    backupDlgLayout->addMultiCellLayout( layout1, 4, 4, 0, 3 );
 
     lblFactor = new TQLabel( this, "lblFactor" );
     lblFactor->setCursor( TQCursor( 3 ) );
diff --git a/libk9copy/backupdlg.ui b/libk9copy/backupdlg.ui
index e7381a2..65eed10 100644
--- a/libk9copy/backupdlg.ui
+++ b/libk9copy/backupdlg.ui
@@ -84,7 +84,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="4">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -181,7 +181,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="4" column="0" rowspan="1" colspan="4">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <property name="cursor">
                 <cursor>3</cursor>
diff --git a/libk9copy/dvdprogress.cpp b/libk9copy/dvdprogress.cpp
index ff914dc..f211fe3 100644
--- a/libk9copy/dvdprogress.cpp
+++ b/libk9copy/dvdprogress.cpp
@@ -35,25 +35,25 @@ DVDProgress::DVDProgress( TQWidget* parent, const char* name, bool modal, WFlags
     setCursor( TQCursor( 3 ) );
     DVDProgressLayout = new TQGridLayout( this, 1, 1, 11, 6, "DVDProgressLayout"); 
 
-    tqlayout2 = new TQVBoxLayout( 0, 0, 6, "tqlayout2"); 
+    layout2 = new TQVBoxLayout( 0, 0, 6, "layout2"); 
 
     lblTotal = new TQLabel( this, "lblTotal" );
     lblTotal->setCursor( TQCursor( 3 ) );
-    tqlayout2->addWidget( lblTotal );
+    layout2->addWidget( lblTotal );
 
     pbTotal = new TQProgressBar( this, "pbTotal" );
     pbTotal->setCursor( TQCursor( 3 ) );
     pbTotal->setProgress( 100 );
     pbTotal->setPercentageVisible( FALSE );
-    tqlayout2->addWidget( pbTotal );
+    layout2->addWidget( pbTotal );
 
-    DVDProgressLayout->addLayout( tqlayout2, 1, 0 );
+    DVDProgressLayout->addLayout( layout2, 1, 0 );
 
-    tqlayout1 = new TQVBoxLayout( 0, 0, 6, "tqlayout1"); 
+    layout1 = new TQVBoxLayout( 0, 0, 6, "layout1"); 
 
     lblTitle = new TQLabel( this, "lblTitle" );
     lblTitle->setCursor( TQCursor( 3 ) );
-    tqlayout1->addWidget( lblTitle );
+    layout1->addWidget( lblTitle );
 
     pbTitle = new TQProgressBar( this, "pbTitle" );
     pbTitle->setCursor( TQCursor( 3 ) );
@@ -61,9 +61,9 @@ DVDProgress::DVDProgress( TQWidget* parent, const char* name, bool modal, WFlags
     pbTitle->setProgress( 100 );
     pbTitle->setCenterIndicator( TRUE );
     pbTitle->setPercentageVisible( FALSE );
-    tqlayout1->addWidget( pbTitle );
+    layout1->addWidget( pbTitle );
 
-    DVDProgressLayout->addLayout( tqlayout1, 0, 0 );
+    DVDProgressLayout->addLayout( layout1, 0, 0 );
 
     lblStatus = new TQLabel( this, "lblStatus" );
     lblStatus->setCursor( TQCursor( 3 ) );
diff --git a/libk9copy/dvdprogress.ui b/libk9copy/dvdprogress.ui
index ec05e8c..bd81a23 100755
--- a/libk9copy/dvdprogress.ui
+++ b/libk9copy/dvdprogress.ui
@@ -44,7 +44,7 @@
         </property>
         <widget class="TQLayoutWidget" row="1" column="0">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <property name="cursor">
                 <cursor>3</cursor>
@@ -82,7 +82,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <property name="cursor">
                 <cursor>3</cursor>
diff --git a/libk9copy/k9ifo2.cpp b/libk9copy/k9ifo2.cpp
index a4b7fef..f121564 100644
--- a/libk9copy/k9ifo2.cpp
+++ b/libk9copy/k9ifo2.cpp
@@ -903,7 +903,7 @@ void k9Ifo2::navRead_PCI(pci_t *pci, uchar *buffer) {
     for(j = 0; j < 2; j++)
       B2N_32(pci->hli.btn_colit.btn_coli[i][j]);
 
-  /* NOTE: I've had to change the structure from the disk tqlayout to get
+  /* NOTE: I've had to change the structure from the disk layout to get
    * the packing to work with Sun's Forte C compiler. */
   
   /* pci hli btni */