Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.

1 files changed, 9 insertions, 9 deletions

diff --git a/libtdepim/kprefsdialog.cpp b/libtdepim/kprefsdialog.cpp
index 9eadffeb2..466691083 100644
--- a/libtdepim/kprefsdialog.cpp
+++ b/libtdepim/kprefsdialog.cpp
@@ -21,7 +21,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqbuttongroup.h>
 #include <tqlineedit.h>
@@ -376,7 +376,7 @@ KPrefsWidDate::KPrefsWidDate( KConfigSkeleton::ItemDateTime *item,
 
 void KPrefsWidDate::readConfig()
 {
-  mDateEdit->setDate( mItem->value().date().isValid() ? mItem->value().date() : TQDate::currentDate()  );
+  mDateEdit->setDate( mItem->value().date().isValid() ? mItem->value().date() : TQDate::tqcurrentDate()  );
 }
 
 void KPrefsWidDate::writeConfig()
@@ -766,18 +766,18 @@ void KPrefsDialog::autoCreate()
     kdDebug() << "ITEMS: " << (*it)->name() << endl;
 
     TQWidget *page;
-    TQGridLayout *layout;
+    TQGridLayout *tqlayout;
     int currentRow;
     if ( !mGroupPages.contains( group ) ) {
       page = addPage( group );
-      layout = new TQGridLayout( page );
+      tqlayout = new TQGridLayout( page );
       mGroupPages.insert( group, page );
-      mGroupLayouts.insert( group, layout );
+      mGroupLayouts.insert( group, tqlayout );
       currentRow = 0;
       mCurrentRows.insert( group, currentRow );
     } else {
       page = mGroupPages[ group ];
-      layout = mGroupLayouts[ group ];
+      tqlayout = mGroupLayouts[ group ];
       currentRow = mCurrentRows[ group ];
     }
 
@@ -786,11 +786,11 @@ void KPrefsDialog::autoCreate()
     if ( wid ) {
       TQValueList<TQWidget *> widgets = wid->widgets();
       if ( widgets.count() == 1 ) {
-        layout->addMultiCellWidget( widgets[ 0 ],
+        tqlayout->addMultiCellWidget( widgets[ 0 ],
                                     currentRow, currentRow, 0, 1 );
       } else if ( widgets.count() == 2 ) {
-        layout->addWidget( widgets[ 0 ], currentRow, 0 );
-        layout->addWidget( widgets[ 1 ], currentRow, 1 );
+        tqlayout->addWidget( widgets[ 0 ], currentRow, 0 );
+        tqlayout->addWidget( widgets[ 1 ], currentRow, 1 );
       } else {
         kdError() << "More widgets than expected: " << widgets.count() << endl;
       }