14 files changed, 23 insertions, 23 deletions
diff --git a/kaddressbook/printing/detailledstyle.cpp b/kaddressbook/printing/detailledstyle.cpp
index 55ac89ca..ee702058 100644
--- a/kaddressbook/printing/detailledstyle.cpp
+++ b/kaddressbook/printing/detailledstyle.cpp
@@ -35,7 +35,7 @@
 #include <tqpaintdevicemetrics.h>
 #include <tqpainter.h>
 #include <kprinter.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "ds_appearance.h"
 #include "printingwizard.h"
@@ -79,7 +79,7 @@ DetailledPrintStyle::DetailledPrintStyle( PrintingWizard *parent, const char *na
 
   addPage( mPageAppearance, i18n( "Detailed Print Style - Appearance" ) );
 
-  config = kapp->config();
+  config = tdeApp->config();
   config->setGroup( ConfigSectionName );
 
   kdeFonts = config->readBoolEntry( UseKDEFonts, true );
@@ -145,7 +145,7 @@ void DetailledPrintStyle::print( const TDEABC::Addressee::List &contacts, PrintP
   TQFont comment = TQFont("Helvetica", 10, TQFont::Normal);
 
   // store the configuration settings:
-  TDEConfig *config = kapp->config();
+  TDEConfig *config = tdeApp->config();
   config->setGroup( ConfigSectionName );
   useKDEFonts = mPageAppearance->cbStandardFonts->isChecked();
   config->writeEntry( UseKDEFonts, useKDEFonts );
diff --git a/kaddressbook/printing/detailledstyle.h b/kaddressbook/printing/detailledstyle.h
index 05f30bae..4197755e 100644
--- a/kaddressbook/printing/detailledstyle.h
+++ b/kaddressbook/printing/detailledstyle.h
@@ -35,7 +35,7 @@ namespace KABPrinting {
 
 class DetailledPrintStyle : public PrintStyle
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public:
diff --git a/kaddressbook/printing/mikesstyle.cpp b/kaddressbook/printing/mikesstyle.cpp
index 25b2e02e..e9ac5979 100644
--- a/kaddressbook/printing/mikesstyle.cpp
+++ b/kaddressbook/printing/mikesstyle.cpp
@@ -78,7 +78,7 @@ void MikesStyle::print( const TDEABC::Addressee::List &contacts, PrintProgress *
 
   for ( it = contacts.begin(); it != contacts.end(); ++it ) {
     progress->setProgress( (count++ * 100) / contacts.count() );
-    kapp->processEvents();
+    tdeApp->processEvents();
 
     // Get the total height so we know if it will fit on the current page
     height = calcHeight( *it, mFont, mBoldFont );
diff --git a/kaddressbook/printing/mikesstyle.h b/kaddressbook/printing/mikesstyle.h
index fe1be422..ccaf4a66 100644
--- a/kaddressbook/printing/mikesstyle.h
+++ b/kaddressbook/printing/mikesstyle.h
@@ -35,7 +35,7 @@ class PrintProgress;
 
 class MikesStyle : public PrintStyle
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public:
diff --git a/kaddressbook/printing/printingwizard.cpp b/kaddressbook/printing/printingwizard.cpp
index eecf434c..85bbb6d0 100644
--- a/kaddressbook/printing/printingwizard.cpp
+++ b/kaddressbook/printing/printingwizard.cpp
@@ -62,7 +62,7 @@ PrintingWizard::PrintingWizard( KPrinter *printer, TDEABC::AddressBook* ab,
   mSelectionPage->setUseSelection( !selection.isEmpty() );
   insertPage( mSelectionPage, i18n("Choose Contacts to Print"), -1 );
 
-  mFilters = Filter::restore( kapp->config(), "Filter" );
+  mFilters = Filter::restore( tdeApp->config(), "Filter" );
   TQStringList filters;
   for ( Filter::List::ConstIterator it = mFilters.begin(); it != mFilters.end(); ++it )
     filters.append( (*it).name() );
@@ -75,7 +75,7 @@ PrintingWizard::PrintingWizard( KPrinter *printer, TDEABC::AddressBook* ab,
 
 
   mStylePage = new StylePage( mAddressBook, this );
-  connect( mStylePage, TQT_SIGNAL( styleChanged(int) ), TQT_SLOT( slotStyleSelected(int) ) );
+  connect( mStylePage, TQ_SIGNAL( styleChanged(int) ), TQ_SLOT( slotStyleSelected(int) ) );
   insertPage( mStylePage, i18n("Choose Printing Style"), -1 );
 
   registerStyles();
@@ -153,7 +153,7 @@ void PrintingWizard::print()
   PrintProgress *progress = new PrintProgress( this );
   insertPage( progress, i18n( "Print Progress" ), -1 );
   showPage( progress );
-  kapp->processEvents();
+  tdeApp->processEvents();
 
   // prepare list of contacts to print:
 
diff --git a/kaddressbook/printing/printingwizard.h b/kaddressbook/printing/printingwizard.h
index 3d2d0b27..bd26b2c1 100644
--- a/kaddressbook/printing/printingwizard.h
+++ b/kaddressbook/printing/printingwizard.h
@@ -49,7 +49,7 @@ namespace KABPrinting {
 */
 class PrintingWizard : public KWizard
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public:
diff --git a/kaddressbook/printing/printprogress.cpp b/kaddressbook/printing/printprogress.cpp
index 459cfbee..edc9b479 100644
--- a/kaddressbook/printing/printprogress.cpp
+++ b/kaddressbook/printing/printprogress.cpp
@@ -71,13 +71,13 @@ void PrintProgress::addMessage( const TQString &msg )
     body.append( TQString( "<li>" ) + (*it) + TQString( "</li>" ) );
 
   mLogBrowser->setText( head + body + foot );
-  kapp->processEvents();
+  tdeApp->processEvents();
 }
 
 void PrintProgress::setProgress( int step )
 {
   mProgressBar->setProgress( step );
-  kapp->processEvents();
+  tdeApp->processEvents();
 }
 
 #include "printprogress.moc"
diff --git a/kaddressbook/printing/printprogress.h b/kaddressbook/printing/printprogress.h
index 481543a2..b23f069a 100644
--- a/kaddressbook/printing/printprogress.h
+++ b/kaddressbook/printing/printprogress.h
@@ -39,7 +39,7 @@ namespace KABPrinting {
  */
 class PrintProgress : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public:
diff --git a/kaddressbook/printing/printstyle.cpp b/kaddressbook/printing/printstyle.cpp
index 33ef9ab5..ca3fafb9 100644
--- a/kaddressbook/printing/printstyle.cpp
+++ b/kaddressbook/printing/printstyle.cpp
@@ -21,7 +21,7 @@
     without including the source code for TQt in the source distribution.
 */
 
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kdebug.h>
 
 #include <tqwidget.h>
diff --git a/kaddressbook/printing/printstyle.h b/kaddressbook/printing/printstyle.h
index 9eeca876..6984a7f5 100644
--- a/kaddressbook/printing/printstyle.h
+++ b/kaddressbook/printing/printstyle.h
@@ -59,7 +59,7 @@ class PrintProgress;
 
 class PrintStyle : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public:
diff --git a/kaddressbook/printing/selectionpage.cpp b/kaddressbook/printing/selectionpage.cpp
index 39b1c4a8..5a42444b 100644
--- a/kaddressbook/printing/selectionpage.cpp
+++ b/kaddressbook/printing/selectionpage.cpp
@@ -51,7 +51,7 @@ SelectionPage::SelectionPage( TQWidget* parent, const char* name )
 
   mButtonGroup = new TQButtonGroup( this );
   mButtonGroup->setFrameShape( TQButtonGroup::NoFrame );
-  mButtonGroup->setColumnLayout( 0, Qt::Vertical );
+  mButtonGroup->setColumnLayout( 0, TQt::Vertical );
   mButtonGroup->layout()->setSpacing( KDialog::spacingHint() );
   mButtonGroup->layout()->setMargin( KDialog::marginHint() );
 
@@ -90,8 +90,8 @@ SelectionPage::SelectionPage( TQWidget* parent, const char* name )
 
   topLayout->addWidget( mButtonGroup );
 
-  connect( mFiltersCombo, TQT_SIGNAL( activated(int) ), TQT_SLOT( filterChanged(int) ) );
-  connect( mCategoriesView, TQT_SIGNAL( clicked(TQListViewItem*) ), TQT_SLOT( categoryClicked(TQListViewItem*) ) );
+  connect( mFiltersCombo, TQ_SIGNAL( activated(int) ), TQ_SLOT( filterChanged(int) ) );
+  connect( mCategoriesView, TQ_SIGNAL( clicked(TQListViewItem*) ), TQ_SLOT( categoryClicked(TQListViewItem*) ) );
 }
 
 SelectionPage::~SelectionPage()
diff --git a/kaddressbook/printing/selectionpage.h b/kaddressbook/printing/selectionpage.h
index a7b10d26..06a6f3a5 100644
--- a/kaddressbook/printing/selectionpage.h
+++ b/kaddressbook/printing/selectionpage.h
@@ -34,7 +34,7 @@ class TQRadioButton;
 
 class SelectionPage : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public:
diff --git a/kaddressbook/printing/stylepage.cpp b/kaddressbook/printing/stylepage.cpp
index 0df14931..2278b6b4 100644
--- a/kaddressbook/printing/stylepage.cpp
+++ b/kaddressbook/printing/stylepage.cpp
@@ -44,7 +44,7 @@ StylePage::StylePage( TDEABC::AddressBook *ab, TQWidget* parent,  const char* na
   mSortTypeCombo->insertItem( i18n( "Ascending" ) );
   mSortTypeCombo->insertItem( i18n( "Descending" ) );
 
-  connect( mStyleCombo, TQT_SIGNAL( activated( int ) ), TQT_SIGNAL( styleChanged( int ) ) );
+  connect( mStyleCombo, TQ_SIGNAL( activated( int ) ), TQ_SIGNAL( styleChanged( int ) ) );
 }
 
 StylePage::~StylePage()
@@ -121,7 +121,7 @@ void StylePage::initGUI()
   topLayout->addMultiCellWidget( label, 0, 0, 0, 1 );
 
   TQButtonGroup *group = new TQButtonGroup( i18n( "Sorting" ), this );
-  group->setColumnLayout( 0, Qt::Vertical );
+  group->setColumnLayout( 0, TQt::Vertical );
   TQGridLayout *sortLayout = new TQGridLayout( group->layout(), 2, 2,
                                              KDialog::spacingHint() );
   sortLayout->setAlignment( TQt::AlignTop );
@@ -141,7 +141,7 @@ void StylePage::initGUI()
   topLayout->addWidget( group, 1, 0 );
 
   group = new TQButtonGroup( i18n( "Print Style" ), this );
-  group->setColumnLayout( 0, Qt::Vertical );
+  group->setColumnLayout( 0, TQt::Vertical );
   TQVBoxLayout *styleLayout = new TQVBoxLayout( group->layout(),
                                               KDialog::spacingHint() );
 
diff --git a/kaddressbook/printing/stylepage.h b/kaddressbook/printing/stylepage.h
index 9b6958f7..6bccdda0 100644
--- a/kaddressbook/printing/stylepage.h
+++ b/kaddressbook/printing/stylepage.h
@@ -37,7 +37,7 @@ class KComboBox;
 
 class StylePage : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public: