7 files changed, 14 insertions, 14 deletions
diff --git a/kresources/lib/folderconfig.cpp b/kresources/lib/folderconfig.cpp
index c82f39757..20fa6fa1b 100644
--- a/kresources/lib/folderconfig.cpp
+++ b/kresources/lib/folderconfig.cpp
@@ -32,7 +32,7 @@
 #include <kdebug.h>
 #include <kdialog.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqgroupbox.h>
 #include <tqpushbutton.h>
 #include <tqcombobox.h>
diff --git a/kresources/lib/folderlister.cpp b/kresources/lib/folderlister.cpp
index affc6af57..eec969c26 100644
--- a/kresources/lib/folderlister.cpp
+++ b/kresources/lib/folderlister.cpp
@@ -137,7 +137,7 @@ void FolderLister::readConfig( KPIM::GroupwarePrefsBase *newprefs )
 
   for ( int i=0; i<nr; ++i ) {
     TQStringList l( newprefs->folder( i ) );
-//     TQStringList l( cfgg.readListEntry( TQString("Folder%1").arg( i ) ) );
+//     TQStringList l( cfgg.readListEntry( TQString("Folder%1").tqarg( i ) ) );
     Entry e;
     if ( l.count()>0 ) {
       e.id = l.first();
@@ -186,7 +186,7 @@ void FolderLister::writeConfig( GroupwarePrefsBase *newprefs )
     lst << (*it).name;
     lst += contentTypeToStrings( (*it).type );
     newprefs->setFolder( nr, lst );
-//     cfgg.writeEntry( TQString("Folder%1").arg( nr ), lst );
+//     cfgg.writeEntry( TQString("Folder%1").tqarg( nr ), lst );
     if ( (*it).active ) active.append( (*it).id );
     nr++;
   }
diff --git a/kresources/lib/folderlistview.cpp b/kresources/lib/folderlistview.cpp
index b29e61c9d..8cbdffd5e 100644
--- a/kresources/lib/folderlistview.cpp
+++ b/kresources/lib/folderlistview.cpp
@@ -134,7 +134,7 @@ void FolderListView::showPopupMenu( FolderListItem *i, const TQPoint &globalPos
 void FolderListView::showPopupMenu( TQListViewItem *i )
 {
   if ( dynamic_cast<FolderListItem*>(i) )
-    showPopupMenu( (FolderListItem*)i, viewport()->mapToGlobal(itemRect(i).topLeft()) );
+    showPopupMenu( (FolderListItem*)i, viewport()->mapToGlobal(tqitemRect(i).topLeft()) );
 }
 
 void FolderListView::slotPopupHandler( int z )
@@ -152,7 +152,7 @@ void FolderListView::slotMousePressed(int btn, TQListViewItem* i, const TQPoint&
     }
     else if ( btn == Qt::LeftButton && c > 0 ) {
       // map pos to item/column and call FolderListItem::activate(col, pos)
-      ((FolderListItem*)i)->activate( c, viewport()->mapFromGlobal( pos ) - TQPoint( 0, itemRect(i).top() ) );
+      ((FolderListItem*)i)->activate( c, viewport()->mapFromGlobal( pos ) - TQPoint( 0, tqitemRect(i).top() ) );
 //     } else {
 //       KListView::slotMousePressed( btn, i, pos, c );
     }
@@ -242,7 +242,7 @@ void FolderListItem::paintCell( TQPainter *p, const TQColorGroup &cg, int col, i
   if ( !lv ) return;
 
   // use a private color group and set the text/highlighted text colors
-//   TQColorGroup mcg = lv->viewport()->colorGroup();
+//   TQColorGroup mcg = lv->viewport()->tqcolorGroup();
   FolderListView::Property prop( mFolderListView->typeForColumn(col) );
 
   if ( prop == FolderListView::FolderName ) {
diff --git a/kresources/lib/folderselectdialog.cpp b/kresources/lib/folderselectdialog.cpp
index 44fbeb6b9..f05dccf0a 100644
--- a/kresources/lib/folderselectdialog.cpp
+++ b/kresources/lib/folderselectdialog.cpp
@@ -32,7 +32,7 @@
 
 #include "folderselectdialog.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 
 using namespace KPIM;
@@ -42,16 +42,16 @@ FolderSelectDialog::FolderSelectDialog( const TQString& caption, const TQString&
   : KDialogBase(0, 0, true, caption, Ok|Cancel, Ok, true)
 {
   TQFrame* frame = makeMainWidget();
-  TQVBoxLayout* layout = new TQVBoxLayout( frame, 0, spacingHint() );
+  TQVBoxLayout* tqlayout = new TQVBoxLayout( frame, 0, spacingHint() );
 
   TQLabel* labelWidget = new TQLabel( label, frame );
-  layout->addWidget( labelWidget );
+  tqlayout->addWidget( labelWidget );
 
   mListBox = new KListBox( frame );
   mListBox->insertStringList( list );
   mListBox->setSelected( 0, true );
   mListBox->ensureCurrentVisible();
-  layout->addWidget( mListBox, 10 );
+  tqlayout->addWidget( mListBox, 10 );
 
   connect( mListBox, TQT_SIGNAL( doubleClicked( TQListBoxItem * ) ),
            TQT_SLOT( slotOk() ) );
@@ -60,7 +60,7 @@ FolderSelectDialog::FolderSelectDialog( const TQString& caption, const TQString&
 
   mListBox->setFocus();
 
-  layout->addStretch();
+  tqlayout->addStretch();
 
   setMinimumWidth( 320 );
 }
diff --git a/kresources/lib/kabc_resourcegroupwarebaseconfig.cpp b/kresources/lib/kabc_resourcegroupwarebaseconfig.cpp
index 2997ae021..6609a3b28 100644
--- a/kresources/lib/kabc_resourcegroupwarebaseconfig.cpp
+++ b/kresources/lib/kabc_resourcegroupwarebaseconfig.cpp
@@ -33,7 +33,7 @@
 #include <kurlrequester.h>
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 using namespace KABC;
 
diff --git a/kresources/lib/kcal_cachesettingsdlg.cpp b/kresources/lib/kcal_cachesettingsdlg.cpp
index 7eafa5307..20b48ad9e 100644
--- a/kresources/lib/kcal_cachesettingsdlg.cpp
+++ b/kresources/lib/kcal_cachesettingsdlg.cpp
@@ -33,7 +33,7 @@
 #include <kdialog.h>
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 
 using namespace KCal;
diff --git a/kresources/lib/kcal_resourcegroupwarebaseconfig.cpp b/kresources/lib/kcal_resourcegroupwarebaseconfig.cpp
index 8ad00e62b..ed8a63f92 100644
--- a/kresources/lib/kcal_resourcegroupwarebaseconfig.cpp
+++ b/kresources/lib/kcal_resourcegroupwarebaseconfig.cpp
@@ -36,7 +36,7 @@
 #include <kpushbutton.h>
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqhbox.h>