1 files changed, 24 insertions, 24 deletions

diff --git a/libtdepim/designerfields.cpp b/libtdepim/designerfields.cpp
index 71089c91..33288549 100644
--- a/libtdepim/designerfields.cpp
+++ b/libtdepim/designerfields.cpp
@@ -34,7 +34,7 @@
 #include <kdatetimewidget.h>
 #include <kdialog.h>
 #include <klineedit.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kdebug.h>
 
 #include "designerfields.h"
@@ -83,34 +83,34 @@ void DesignerFields::initGUI( const TQString &uiFile )
       if ( name.startsWith( "X_" ) ) {
         name = name.mid( 2 );
 
-        TQWidget *widget = TQT_TQWIDGET( it.current() );
+        TQWidget *widget = static_cast<TQWidget*>( it.current() );
         if ( !name.isEmpty() )
           mWidgets.insert( name, widget );
 
         if ( it.current()->inherits( "TQLineEdit" ) )
-          connect( it.current(), TQT_SIGNAL( textChanged( const TQString& ) ),
-                   TQT_SIGNAL( modified() ) );
+          connect( it.current(), TQ_SIGNAL( textChanged( const TQString& ) ),
+                   TQ_SIGNAL( modified() ) );
         else if ( it.current()->inherits( "TQSpinBox" ) )
-          connect( it.current(), TQT_SIGNAL( valueChanged( int ) ),
-                   TQT_SIGNAL( modified() ) );
+          connect( it.current(), TQ_SIGNAL( valueChanged( int ) ),
+                   TQ_SIGNAL( modified() ) );
         else if ( it.current()->inherits( "TQCheckBox" ) )
-          connect( it.current(), TQT_SIGNAL( toggled( bool ) ),
-                   TQT_SIGNAL( modified() ) );
+          connect( it.current(), TQ_SIGNAL( toggled( bool ) ),
+                   TQ_SIGNAL( modified() ) );
         else if ( it.current()->inherits( "TQComboBox" ) )
-          connect( it.current(), TQT_SIGNAL( activated( const TQString& ) ),
-                   TQT_SIGNAL( modified() ) );
+          connect( it.current(), TQ_SIGNAL( activated( const TQString& ) ),
+                   TQ_SIGNAL( modified() ) );
         else if ( it.current()->inherits( "TQDateTimeEdit" ) )
-          connect( it.current(), TQT_SIGNAL( valueChanged( const TQDateTime& ) ),
-                   TQT_SIGNAL( modified() ) );
+          connect( it.current(), TQ_SIGNAL( valueChanged( const TQDateTime& ) ),
+                   TQ_SIGNAL( modified() ) );
         else if ( it.current()->inherits( "KDateTimeWidget" ) )
-          connect( it.current(), TQT_SIGNAL( valueChanged( const TQDateTime& ) ),
-                   TQT_SIGNAL( modified() ) );
+          connect( it.current(), TQ_SIGNAL( valueChanged( const TQDateTime& ) ),
+                   TQ_SIGNAL( modified() ) );
         else if ( it.current()->inherits( "KDatePicker" ) )
-          connect( it.current(), TQT_SIGNAL( dateChanged( TQDate ) ),
-                   TQT_SIGNAL( modified() ) );
+          connect( it.current(), TQ_SIGNAL( dateChanged( TQDate ) ),
+                   TQ_SIGNAL( modified() ) );
         else if ( it.current()->inherits( "TQTextEdit" ) )
-          connect( it.current(), TQT_SIGNAL( textChanged() ),
-                   TQT_SIGNAL( modified() ) );
+          connect( it.current(), TQ_SIGNAL( textChanged() ),
+                   TQ_SIGNAL( modified() ) );
 
         if ( !widget->isEnabled() )
           mDisabledWidgets.append( widget );
@@ -187,13 +187,13 @@ void DesignerFields::load( DesignerFields::Storage *storage )
         wdg->setChecked( value == "true" || value == "1" );
       } else if ( it.data()->inherits( "TQDateTimeEdit" ) ) {
         TQDateTimeEdit *wdg = static_cast<TQDateTimeEdit*>( it.data() );
-        wdg->setDateTime( TQDateTime::fromString( value, Qt::ISODate ) );
+        wdg->setDateTime( TQDateTime::fromString( value, TQt::ISODate ) );
       } else if ( it.data()->inherits( "KDateTimeWidget" ) ) {
         KDateTimeWidget *wdg = static_cast<KDateTimeWidget*>( it.data() );
-        wdg->setDateTime( TQDateTime::fromString( value, Qt::ISODate ) );
+        wdg->setDateTime( TQDateTime::fromString( value, TQt::ISODate ) );
       } else if ( it.data()->inherits( "KDatePicker" ) ) {
         KDatePicker *wdg = static_cast<KDatePicker*>( it.data() );
-        wdg->setDate( TQDate::fromString( value, Qt::ISODate ) );
+        wdg->setDate( TQDate::fromString( value, TQt::ISODate ) );
       } else if ( it.data()->inherits( "TQComboBox" ) ) {
         TQComboBox *wdg = static_cast<TQComboBox*>( it.data() );
         wdg->setCurrentText( value );
@@ -221,13 +221,13 @@ void DesignerFields::save( DesignerFields::Storage *storage )
       value = ( wdg->isChecked() ? "true" : "false" );
     } else if ( it.data()->inherits( "TQDateTimeEdit" ) ) {
       TQDateTimeEdit *wdg = static_cast<TQDateTimeEdit*>( it.data() );
-      value = wdg->dateTime().toString( Qt::ISODate );
+      value = wdg->dateTime().toString( TQt::ISODate );
     } else if ( it.data()->inherits( "KDateTimeWidget" ) ) {
       KDateTimeWidget *wdg = static_cast<KDateTimeWidget*>( it.data() );
-      value = wdg->dateTime().toString( Qt::ISODate );
+      value = wdg->dateTime().toString( TQt::ISODate );
     } else if ( it.data()->inherits( "KDatePicker" ) ) {
       KDatePicker *wdg = static_cast<KDatePicker*>( it.data() );
-      value = wdg->date().toString( Qt::ISODate );
+      value = wdg->date().toString( TQt::ISODate );
     } else if ( it.data()->inherits( "TQComboBox" ) ) {
       TQComboBox *wdg = static_cast<TQComboBox*>( it.data() );
       value = wdg->currentText();