Replace _OBJECT_NAME_STRING defines with actual strings. This relates to the merging of tqtinterface with tqt3.

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit f23736d2f965975c384b9e7d9a6d15023ae35082)

11 files changed, 82 insertions, 82 deletions

diff --git a/smb4k/browser/smb4knetworkbrowsertooltip.cpp b/smb4k/browser/smb4knetworkbrowsertooltip.cpp
index c4c359c..30fea3c 100644
--- a/smb4k/browser/smb4knetworkbrowsertooltip.cpp
+++ b/smb4k/browser/smb4knetworkbrowsertooltip.cpp
@@ -267,7 +267,7 @@ void Smb4KNetworkBrowserToolTip::update()
   {
     case Smb4KNetworkBrowserItem::Workgroup:
     {
-      TQLabel *master_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "MasterBrowser", TQLABEL_OBJECT_NAME_STRING, true )) );
+      TQLabel *master_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "MasterBrowser", "TQLabel", true )) );
 
       if ( master_label )
       {
@@ -282,9 +282,9 @@ void Smb4KNetworkBrowserToolTip::update()
     }
     case Smb4KNetworkBrowserItem::Host:
     {
-      TQLabel *os_label =     static_cast<TQLabel *>( TQT_TQWIDGET(child( "OSString", TQLABEL_OBJECT_NAME_STRING, true )) );
-      TQLabel *server_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "ServerString", TQLABEL_OBJECT_NAME_STRING, true )) );
-      TQLabel *ip_label =     static_cast<TQLabel *>( TQT_TQWIDGET(child( "IPAddress", TQLABEL_OBJECT_NAME_STRING, true )) );
+      TQLabel *os_label =     static_cast<TQLabel *>( TQT_TQWIDGET(child( "OSString", "TQLabel", true )) );
+      TQLabel *server_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "ServerString", "TQLabel", true )) );
+      TQLabel *ip_label =     static_cast<TQLabel *>( TQT_TQWIDGET(child( "IPAddress", "TQLabel", true )) );
 
       if ( os_label )
       {
@@ -317,7 +317,7 @@ void Smb4KNetworkBrowserToolTip::update()
     }
     case Smb4KNetworkBrowserItem::Share:
     {
-      TQLabel *ip_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "IPAddress", TQLABEL_OBJECT_NAME_STRING, true )) );
+      TQLabel *ip_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "IPAddress", "TQLabel", true )) );
 
       if ( ip_label )
       {
diff --git a/smb4k/configdlg/smb4kauthoptions.cpp b/smb4k/configdlg/smb4kauthoptions.cpp
index 68fea55..d62420b 100644
--- a/smb4k/configdlg/smb4kauthoptions.cpp
+++ b/smb4k/configdlg/smb4kauthoptions.cpp
@@ -109,11 +109,11 @@ void Smb4KAuthOptions::slotTDEWalletButtonState( int state )
 {
   if ( state == TQCheckBox::On )
   {
-    static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "DefaultLoginBox", TQGROUPBOX_OBJECT_NAME_STRING, true )) )->setEnabled( true );
+    static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "DefaultLoginBox", "TQGroupBox", true )) )->setEnabled( true );
   }
   else if ( state == TQCheckBox::Off )
   {
-    static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "DefaultLoginBox", TQGROUPBOX_OBJECT_NAME_STRING, true )) )->setEnabled( false );
+    static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "DefaultLoginBox", "TQGroupBox", true )) )->setEnabled( false );
   }
 }
 
@@ -122,11 +122,11 @@ void Smb4KAuthOptions::slotDefaultAuthButtonState( int state )
 {
   if ( state == TQCheckBox::On )
   {
-    static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "DefaultAuthWidget", TQWIDGET_OBJECT_NAME_STRING, true )) )->setEnabled( true );
+    static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "DefaultAuthWidget", "TQWidget", true )) )->setEnabled( true );
   }
   else if ( state == TQCheckBox::Off )
   {
-    static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "DefaultAuthWidget", TQWIDGET_OBJECT_NAME_STRING, true )) )->setEnabled( false );
+    static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "DefaultAuthWidget", "TQWidget", true )) )->setEnabled( false );
   }
 }
 
diff --git a/smb4k/configdlg/smb4ksambaoptions.cpp b/smb4k/configdlg/smb4ksambaoptions.cpp
index a1503e2..6bf02d3 100644
--- a/smb4k/configdlg/smb4ksambaoptions.cpp
+++ b/smb4k/configdlg/smb4ksambaoptions.cpp
@@ -564,21 +564,21 @@ void Smb4KSambaOptions::slotSambaFileSystem( int item_index )
   {
     case Smb4KSettings::EnumFilesystem::CIFS:
     {
-      TQGroupBox *adv_cifs = static_cast<TQGroupBox *>( TQT_TQWIDGET(child( "AdvancedCIFSOptions", TQGROUPBOX_OBJECT_NAME_STRING, true )) );
+      TQGroupBox *adv_cifs = static_cast<TQGroupBox *>( TQT_TQWIDGET(child( "AdvancedCIFSOptions", "TQGroupBox", true )) );
 
       if ( adv_cifs )
       {
         adv_cifs->setEnabled( true );
       }
 
-      TQGroupBox *adv_smbfs = static_cast<TQGroupBox *>( TQT_TQWIDGET(child( "AdvancedSMBFSOptions", TQGROUPBOX_OBJECT_NAME_STRING, true )) );
+      TQGroupBox *adv_smbfs = static_cast<TQGroupBox *>( TQT_TQWIDGET(child( "AdvancedSMBFSOptions", "TQGroupBox", true )) );
 
       if ( adv_smbfs )
       {
         adv_smbfs->setEnabled( false );
       }
 
-      TQLabel *codepage = static_cast<TQLabel *>( TQT_TQWIDGET(child( "CodepageLabel", TQLABEL_OBJECT_NAME_STRING, true )) );
+      TQLabel *codepage = static_cast<TQLabel *>( TQT_TQWIDGET(child( "CodepageLabel", "TQLabel", true )) );
 
       if ( codepage )
       {
@@ -596,21 +596,21 @@ void Smb4KSambaOptions::slotSambaFileSystem( int item_index )
     }
     case Smb4KSettings::EnumFilesystem::SMBFS:
     {
-      TQGroupBox *adv_cifs = static_cast<TQGroupBox *>( TQT_TQWIDGET(child( "AdvancedCIFSOptions", TQGROUPBOX_OBJECT_NAME_STRING, true )) );
+      TQGroupBox *adv_cifs = static_cast<TQGroupBox *>( TQT_TQWIDGET(child( "AdvancedCIFSOptions", "TQGroupBox", true )) );
 
       if ( adv_cifs )
       {
         adv_cifs->setEnabled( false );
       }
 
-      TQGroupBox *adv_smbfs = static_cast<TQGroupBox *>( TQT_TQWIDGET(child( "AdvancedSMBFSOptions", TQGROUPBOX_OBJECT_NAME_STRING, true )) );
+      TQGroupBox *adv_smbfs = static_cast<TQGroupBox *>( TQT_TQWIDGET(child( "AdvancedSMBFSOptions", "TQGroupBox", true )) );
 
       if ( adv_smbfs )
       {
         adv_smbfs->setEnabled( true );
       }
 
-      TQLabel *codepage = static_cast<TQLabel *>( TQT_TQWIDGET(child( "CodepageLabel", TQLABEL_OBJECT_NAME_STRING, true )) );
+      TQLabel *codepage = static_cast<TQLabel *>( TQT_TQWIDGET(child( "CodepageLabel", "TQLabel", true )) );
 
       if ( codepage )
       {
@@ -643,7 +643,7 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item )
   if ( item )
   {
     // Enable the input widget:
-    TQWidget *input = static_cast<TQGroupBox *>( TQT_TQWIDGET(child( "CustomInputWidget", TQGROUPBOX_OBJECT_NAME_STRING, true )) );
+    TQWidget *input = static_cast<TQGroupBox *>( TQT_TQWIDGET(child( "CustomInputWidget", "TQGroupBox", true )) );
 
     if ( input )
     {
@@ -651,7 +651,7 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item )
     }
 
     // Enable/disable the labels, combo boxes, buttons, etc:
-    TQLabel *protocol_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "CustomProtocolLabel", TQLABEL_OBJECT_NAME_STRING, true )) );
+    TQLabel *protocol_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "CustomProtocolLabel", "TQLabel", true )) );
 
     if ( protocol_label )
     {
@@ -683,7 +683,7 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item )
 
 #ifndef __FreeBSD__
 
-    TQLabel *fs_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "CustomFileSystemLabel", TQLABEL_OBJECT_NAME_STRING, true )) );
+    TQLabel *fs_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "CustomFileSystemLabel", "TQLabel", true )) );
 
     if ( fs_label )
     {
@@ -713,7 +713,7 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item )
       filesystem->setCurrentText( item->text( FileSystem ) );
     }
 
-    TQLabel *write_access_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "CustomWriteAccessLabel", TQLABEL_OBJECT_NAME_STRING, true )) );
+    TQLabel *write_access_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "CustomWriteAccessLabel", "TQLabel", true )) );
 
     if ( write_access_label )
     {
@@ -745,7 +745,7 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item )
 
 #endif
 
-    TQLabel *krb_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "CustomKerberosLabel", TQLABEL_OBJECT_NAME_STRING, true )) );
+    TQLabel *krb_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "CustomKerberosLabel", "TQLabel", true )) );
 
     if ( krb_label )
     {
@@ -775,7 +775,7 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item )
       kerberos->setCurrentText( item->text( Kerberos ) );
     }
 
-    TQLabel *uid_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "CustomUIDLabel", TQLABEL_OBJECT_NAME_STRING, true )) );
+    TQLabel *uid_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "CustomUIDLabel", "TQLabel", true )) );
 
     if ( uid_label )
     {
@@ -805,7 +805,7 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item )
       uid->setText( item->text( UID ) );
     }
 
-    TQLabel *gid_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "CustomGIDLabel", TQLABEL_OBJECT_NAME_STRING, true )) );
+    TQLabel *gid_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "CustomGIDLabel", "TQLabel", true )) );
 
     if ( gid_label )
     {
@@ -835,7 +835,7 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item )
       gid->setText( item->text( GID ) );
     }
 
-    TQLabel *port_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "CustomPortLabel", TQLABEL_OBJECT_NAME_STRING, true )) );
+    TQLabel *port_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "CustomPortLabel", "TQLabel", true )) );
 
     if ( port_label )
     {
@@ -886,7 +886,7 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item )
 
     if ( view )
     {
-      TQLabel *protocol_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "CustomProtocolLabel", TQLABEL_OBJECT_NAME_STRING, true )) );
+      TQLabel *protocol_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "CustomProtocolLabel", "TQLabel", true )) );
 
       if ( protocol_label )
       {
@@ -903,7 +903,7 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item )
 
 #ifndef __FreeBSD__
 
-      TQLabel *fs_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "CustomFileSystemLabel", TQLABEL_OBJECT_NAME_STRING, true )) );
+      TQLabel *fs_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "CustomFileSystemLabel", "TQLabel", true )) );
 
       if ( fs_label )
       {
@@ -918,7 +918,7 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item )
         filesystem->setEnabled( false );
       }
 
-      TQLabel *write_access_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "CustomWriteAccessLabel", TQLABEL_OBJECT_NAME_STRING, true )) );
+      TQLabel *write_access_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "CustomWriteAccessLabel", "TQLabel", true )) );
 
       if ( write_access_label )
       {
@@ -935,7 +935,7 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item )
 
 #endif
 
-      TQLabel *krb_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "CustomKerberosLabel", TQLABEL_OBJECT_NAME_STRING, true )) );
+      TQLabel *krb_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "CustomKerberosLabel", "TQLabel", true )) );
 
       if ( krb_label )
       {
@@ -950,7 +950,7 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item )
         kerberos->setEnabled( false );
       }
 
-      TQLabel *uid_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "CustomUIDLabel", TQLABEL_OBJECT_NAME_STRING, true )) );
+      TQLabel *uid_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "CustomUIDLabel", "TQLabel", true )) );
 
       if ( uid_label )
       {
@@ -965,7 +965,7 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item )
         uid->setEnabled( false );
       }
 
-      TQLabel *gid_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "CustomGIDLabel", TQLABEL_OBJECT_NAME_STRING, true )) );
+      TQLabel *gid_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "CustomGIDLabel", "TQLabel", true )) );
 
       if ( gid_label )
       {
@@ -980,7 +980,7 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item )
         gid->setEnabled( false );
       }
 
-      TQLabel *port_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "CustomPortLabel", TQLABEL_OBJECT_NAME_STRING, true )) );
+      TQLabel *port_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "CustomPortLabel", "TQLabel", true )) );
 
       if ( port_label )
       {
diff --git a/smb4k/configdlg/smb4kuserinterfaceoptions.cpp b/smb4k/configdlg/smb4kuserinterfaceoptions.cpp
index 11226a1..199a3a0 100644
--- a/smb4k/configdlg/smb4kuserinterfaceoptions.cpp
+++ b/smb4k/configdlg/smb4kuserinterfaceoptions.cpp
@@ -194,13 +194,13 @@ void Smb4KUserInterfaceOptions::slotShowHiddenShares( int state )
 {
   if ( state == TQCheckBox::On )
   {
-    static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_ShowHiddenIPCShares", TQCHECKBOX_OBJECT_NAME_STRING )) )->setEnabled( true );
-    static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_ShowHiddenADMINShares", TQCHECKBOX_OBJECT_NAME_STRING )) )->setEnabled( true );
+    static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_ShowHiddenIPCShares", "TQCheckBox" )) )->setEnabled( true );
+    static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_ShowHiddenADMINShares", "TQCheckBox" )) )->setEnabled( true );
   }
   else if ( state == TQCheckBox::Off )
   {
-    static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_ShowHiddenIPCShares", TQCHECKBOX_OBJECT_NAME_STRING )) )->setEnabled( false );
-    static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_ShowHiddenADMINShares", TQCHECKBOX_OBJECT_NAME_STRING )) )->setEnabled( false );
+    static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_ShowHiddenIPCShares", "TQCheckBox" )) )->setEnabled( false );
+    static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_ShowHiddenADMINShares", "TQCheckBox" )) )->setEnabled( false );
   }
 }
 
diff --git a/smb4k/configdlg/smb4tdeconfigdialog.cpp b/smb4k/configdlg/smb4tdeconfigdialog.cpp
index 9dbd436..eb2a694 100644
--- a/smb4k/configdlg/smb4tdeconfigdialog.cpp
+++ b/smb4k/configdlg/smb4tdeconfigdialog.cpp
@@ -108,7 +108,7 @@ Smb4TDEConfigDialog::Smb4TDEConfigDialog( Smb4KSettings *settings, TQWidget *par
     // done by the core. We only need to disable widgets here.
     if ( Smb4KSettings::sudo().isEmpty() )
     {
-      TQRadioButton *sudo = static_cast<TQRadioButton *>( TQT_TQWIDGET(super_user_options->child( "SudoButton", TQRADIOBUTTON_OBJECT_NAME_STRING, true )) );
+      TQRadioButton *sudo = static_cast<TQRadioButton *>( TQT_TQWIDGET(super_user_options->child( "SudoButton", "TQRadioButton", true )) );
 
       if ( sudo )
       {
@@ -117,7 +117,7 @@ Smb4TDEConfigDialog::Smb4TDEConfigDialog( Smb4KSettings *settings, TQWidget *par
     }
     else if ( Smb4KSettings::super().isEmpty() )
     {
-      TQRadioButton *super = static_cast<TQRadioButton *>( TQT_TQWIDGET(super_user_options->child( "SuperButton", TQRADIOBUTTON_OBJECT_NAME_STRING, true )) );
+      TQRadioButton *super = static_cast<TQRadioButton *>( TQT_TQWIDGET(super_user_options->child( "SuperButton", "TQRadioButton", true )) );
 
       if ( super )
       {
@@ -568,12 +568,12 @@ void Smb4TDEConfigDialog::saveAuthenticationData()
 
 bool Smb4TDEConfigDialog::writeSuperUserEntries()
 {
-  TQRadioButton *sudo =  static_cast<TQRadioButton *>( TQT_TQWIDGET(child( "SudoButton", TQRADIOBUTTON_OBJECT_NAME_STRING, true )) );
-  TQRadioButton *super = static_cast<TQRadioButton *>( TQT_TQWIDGET(child( "SuperButton", TQRADIOBUTTON_OBJECT_NAME_STRING, true )) );
+  TQRadioButton *sudo =  static_cast<TQRadioButton *>( TQT_TQWIDGET(child( "SudoButton", "TQRadioButton", true )) );
+  TQRadioButton *super = static_cast<TQRadioButton *>( TQT_TQWIDGET(child( "SuperButton", "TQRadioButton", true )) );
 #ifdef __linux__
-  TQCheckBox *force =    static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_UseForceUnmount", TQCHECKBOX_OBJECT_NAME_STRING, true )) );
+  TQCheckBox *force =    static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_UseForceUnmount", "TQCheckBox", true )) );
 #endif
-  TQCheckBox *full_use = static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_AlwaysUseSuperUser", TQCHECKBOX_OBJECT_NAME_STRING, true )) );
+  TQCheckBox *full_use = static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_AlwaysUseSuperUser", "TQCheckBox", true )) );
 
   // Check if we need to write anything at all:
   Smb4KFileIO::Operation op = Smb4KFileIO::NoOperation;
@@ -640,12 +640,12 @@ bool Smb4TDEConfigDialog::writeSuperUserEntries()
 
 void Smb4TDEConfigDialog::removeSuperUserEntries()
 {
-  TQRadioButton *sudo =  static_cast<TQRadioButton *>( TQT_TQWIDGET(child( "SudoButton", TQRADIOBUTTON_OBJECT_NAME_STRING, true )) );
-  TQRadioButton *super = static_cast<TQRadioButton *>( TQT_TQWIDGET(child( "SuperButton", TQRADIOBUTTON_OBJECT_NAME_STRING, true )) );
+  TQRadioButton *sudo =  static_cast<TQRadioButton *>( TQT_TQWIDGET(child( "SudoButton", "TQRadioButton", true )) );
+  TQRadioButton *super = static_cast<TQRadioButton *>( TQT_TQWIDGET(child( "SuperButton", "TQRadioButton", true )) );
 #ifdef __linux__
-  TQCheckBox *force =    static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_UseForceUnmount", TQCHECKBOX_OBJECT_NAME_STRING, true )) );
+  TQCheckBox *force =    static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_UseForceUnmount", "TQCheckBox", true )) );
 #endif
-  TQCheckBox *full_use = static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_AlwaysUseSuperUser", TQCHECKBOX_OBJECT_NAME_STRING, true )) );
+  TQCheckBox *full_use = static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_AlwaysUseSuperUser", "TQCheckBox", true )) );
 
 #ifdef __linux__
   if ( sudo && super && force && full_use )
@@ -694,7 +694,7 @@ bool Smb4TDEConfigDialog::checkSettings()
 
   // If the user chose "Query custom master browser" in the
   // "Network" tab, there must be a master browser present:
-  TQRadioButton *query_custom_master = static_cast<TQRadioButton *>( TQT_TQWIDGET(child( "CustomMasterBrowserLabel", TQRADIOBUTTON_OBJECT_NAME_STRING, true )) );
+  TQRadioButton *query_custom_master = static_cast<TQRadioButton *>( TQT_TQWIDGET(child( "CustomMasterBrowserLabel", "TQRadioButton", true )) );
   KLineEdit *custom_master_input    = static_cast<KLineEdit *>( TQT_TQWIDGET(child( "kcfg_CustomMasterBrowser", "KLineEdit", true )) );
 
   if ( query_custom_master && custom_master_input &&
@@ -709,7 +709,7 @@ bool Smb4TDEConfigDialog::checkSettings()
 
   // If the user chose "Scan broadcast areas" in the
   // "Network" tab, there must broadcast areas present:
-  TQRadioButton *scan_bcast_areas    = static_cast<TQRadioButton *>( TQT_TQWIDGET(child( "BroadcastAreasLabel", TQRADIOBUTTON_OBJECT_NAME_STRING, true )) );
+  TQRadioButton *scan_bcast_areas    = static_cast<TQRadioButton *>( TQT_TQWIDGET(child( "BroadcastAreasLabel", "TQRadioButton", true )) );
   KLineEdit *bcast_areas_input      = static_cast<KLineEdit *>( TQT_TQWIDGET(child( "kcfg_BroadcastAreas", "KLineEdit", true )) );
 
   if ( scan_bcast_areas && bcast_areas_input &&
@@ -735,7 +735,7 @@ bool Smb4TDEConfigDialog::checkSettings()
 
   // If the user wants to use a default login, the user
   // name must not be empty.
-  TQCheckBox *use_default_login      = static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_UseDefaultLogin", TQCHECKBOX_OBJECT_NAME_STRING, true )) );
+  TQCheckBox *use_default_login      = static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_UseDefaultLogin", "TQCheckBox", true )) );
   KLineEdit *default_user_name      = static_cast<KLineEdit *>( TQT_TQWIDGET(child( "kcfg_DefaultUserName", "KLineEdit", true )) );
 
   if ( use_default_login && default_user_name &&
@@ -804,7 +804,7 @@ bool Smb4TDEConfigDialog::checkSettings()
   }
 
   // The path where to store partial files must not be empty.
-  TQCheckBox *use_partical_directory = static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_UsePartialDirectory", TQCHECKBOX_OBJECT_NAME_STRING, true )) );
+  TQCheckBox *use_partical_directory = static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_UsePartialDirectory", "TQCheckBox", true )) );
   KURLRequester *partial_directory  = static_cast<KURLRequester *>( TQT_TQWIDGET(child( "kcfg_PartialDirectory", "KURLRequester", true )) );
 
   if ( use_partical_directory && use_partical_directory->isChecked() &&
@@ -817,7 +817,7 @@ bool Smb4TDEConfigDialog::checkSettings()
   }
 
   // The the exclude patterns must not be empty.
-  TQCheckBox *use_exclude_pattern    = static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_UseExcludePattern", TQCHECKBOX_OBJECT_NAME_STRING, true )) );
+  TQCheckBox *use_exclude_pattern    = static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_UseExcludePattern", "TQCheckBox", true )) );
   KLineEdit *exclude_pattern        = static_cast<KLineEdit *>( TQT_TQWIDGET(child( "kcfg_ExcludePattern", "KLineEdit", true )) );
 
   if ( use_exclude_pattern && use_exclude_pattern->isChecked() &&
@@ -830,7 +830,7 @@ bool Smb4TDEConfigDialog::checkSettings()
   }
 
   // The the path of the exclude file must not be empty.
-  TQCheckBox *use_exclude_file       = static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_UseExcludeFrom", TQCHECKBOX_OBJECT_NAME_STRING, true )) );
+  TQCheckBox *use_exclude_file       = static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_UseExcludeFrom", "TQCheckBox", true )) );
   KURLRequester *exclude_file       = static_cast<KURLRequester *>( TQT_TQWIDGET(child( "kcfg_ExcludeFrom", "KURLRequester", true )) );
 
   if ( use_exclude_file && use_exclude_file->isChecked() &&
@@ -843,7 +843,7 @@ bool Smb4TDEConfigDialog::checkSettings()
   }
 
   // The the include patterns must not be empty.
-  TQCheckBox *use_include_pattern    = static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_UseIncludePattern", TQCHECKBOX_OBJECT_NAME_STRING, true )) );
+  TQCheckBox *use_include_pattern    = static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_UseIncludePattern", "TQCheckBox", true )) );
   KLineEdit *include_pattern        = static_cast<KLineEdit *>( TQT_TQWIDGET(child( "kcfg_IncludePattern", "KLineEdit", true )) );
 
   if ( use_include_pattern && use_include_pattern->isChecked() &&
@@ -856,7 +856,7 @@ bool Smb4TDEConfigDialog::checkSettings()
   }
 
   // The the path of the exclude file must not be empty.
-  TQCheckBox *use_include_file       = static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_UseIncludeFrom", TQCHECKBOX_OBJECT_NAME_STRING, true )) );
+  TQCheckBox *use_include_file       = static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_UseIncludeFrom", "TQCheckBox", true )) );
   KURLRequester *include_file       = static_cast<KURLRequester *>( TQT_TQWIDGET(child( "kcfg_IncludeFrom", "KURLRequester", true )) );
 
   if ( use_include_file && use_include_file->isChecked() &&
@@ -870,12 +870,12 @@ bool Smb4TDEConfigDialog::checkSettings()
 
   // If you make backups, check that the suffix and that the
   // backup directory is not empty.
-  TQCheckBox *make_backups           = static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_MakeBackups", TQCHECKBOX_OBJECT_NAME_STRING, true )) );
+  TQCheckBox *make_backups           = static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_MakeBackups", "TQCheckBox", true )) );
 
   if ( make_backups && make_backups->isChecked() )
   {
     // The backup suffix must not be empty.
-    TQCheckBox *use_backup_suffix    = static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_UseBackupSuffix", TQCHECKBOX_OBJECT_NAME_STRING, true )) );
+    TQCheckBox *use_backup_suffix    = static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_UseBackupSuffix", "TQCheckBox", true )) );
     KLineEdit *backup_suffix        = static_cast<KLineEdit *>( TQT_TQWIDGET(child( "kcfg_BackupSuffix", "KLineEdit", true )) );
 
     if ( use_backup_suffix && use_backup_suffix->isChecked() &&
@@ -888,7 +888,7 @@ bool Smb4TDEConfigDialog::checkSettings()
     }
 
     // The the path for backups must not be empty.
-    TQCheckBox *use_backup_dir       = static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_UseBackupDirectory", TQCHECKBOX_OBJECT_NAME_STRING, true )) );
+    TQCheckBox *use_backup_dir       = static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_UseBackupDirectory", "TQCheckBox", true )) );
     KURLRequester *backup_dir       = static_cast<KURLRequester *>( TQT_TQWIDGET(child( "kcfg_BackupDirectory", "KURLRequester", true )) );
 
     if ( use_backup_dir && use_backup_dir->isChecked() &&
@@ -1136,9 +1136,9 @@ void Smb4TDEConfigDialog::slotRemoveSuperUserEntries()
 void Smb4TDEConfigDialog::slotReceivedFileIOFailed()
 {
 #ifdef __linux__
-  TQCheckBox *force =    static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_UseForceUnmount", TQCHECKBOX_OBJECT_NAME_STRING, true )) );
+  TQCheckBox *force =    static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_UseForceUnmount", "TQCheckBox", true )) );
 #endif
-  TQCheckBox *full_use = static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_AlwaysUseSuperUser", TQCHECKBOX_OBJECT_NAME_STRING, true )) );
+  TQCheckBox *full_use = static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_AlwaysUseSuperUser", "TQCheckBox", true )) );
 
 #ifdef __linux__
   if ( force && full_use )
diff --git a/smb4k/configdlg/smb4tdeconfigdialog.h b/smb4k/configdlg/smb4tdeconfigdialog.h
index 3a95405..703aa31 100644
--- a/smb4k/configdlg/smb4tdeconfigdialog.h
+++ b/smb4k/configdlg/smb4tdeconfigdialog.h
@@ -192,7 +192,7 @@ class Smb4TDEConfigDialogFactory : KLibFactory
 
   protected:
     TQObject *createObject( TQObject *parent = 0, const char *name = 0,
-                           const char *classname = TQOBJECT_OBJECT_NAME_STRING,
+                           const char *classname = "TQObject",
                            const TQStringList &args = TQStringList() );
 
   private:
diff --git a/smb4k/configdlg/smb4tdersyncoptions.cpp b/smb4k/configdlg/smb4tdersyncoptions.cpp
index a34bf8b..92b75bd 100644
--- a/smb4k/configdlg/smb4tdersyncoptions.cpp
+++ b/smb4k/configdlg/smb4tdersyncoptions.cpp
@@ -298,13 +298,13 @@ void Smb4KRsyncOptions::slotArchiveToggled( bool on )
 {
   if ( on )
   {
-    static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_RecurseIntoDirectories", TQCHECKBOX_OBJECT_NAME_STRING, true )) )->setChecked( on );
-    static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_PreserveSymlinks", TQCHECKBOX_OBJECT_NAME_STRING, true )) )->setChecked( on );
-    static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_PreservePermissions", TQCHECKBOX_OBJECT_NAME_STRING, true )) )->setChecked( on );
-    static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_PreserveTimes", TQCHECKBOX_OBJECT_NAME_STRING, true )) )->setChecked( on );
-    static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_PreserveGroup", TQCHECKBOX_OBJECT_NAME_STRING, true )) )->setChecked( on );
-    static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_PreserveOwner", TQCHECKBOX_OBJECT_NAME_STRING, true )) )->setChecked( on );
-    static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_PreserveDevicesAndSpecials", TQCHECKBOX_OBJECT_NAME_STRING, true )) )->setChecked( on );
+    static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_RecurseIntoDirectories", "TQCheckBox", true )) )->setChecked( on );
+    static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_PreserveSymlinks", "TQCheckBox", true )) )->setChecked( on );
+    static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_PreservePermissions", "TQCheckBox", true )) )->setChecked( on );
+    static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_PreserveTimes", "TQCheckBox", true )) )->setChecked( on );
+    static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_PreserveGroup", "TQCheckBox", true )) )->setChecked( on );
+    static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_PreserveOwner", "TQCheckBox", true )) )->setChecked( on );
+    static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_PreserveDevicesAndSpecials", "TQCheckBox", true )) )->setChecked( on );
   }
 }
 
@@ -313,23 +313,23 @@ void Smb4KRsyncOptions::slotUncheckArchive( bool on )
 {
   if ( !on )
   {
-    static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_ArchiveMode", TQCHECKBOX_OBJECT_NAME_STRING, true )) )->setChecked( on );
+    static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_ArchiveMode", "TQCheckBox", true )) )->setChecked( on );
   }
 }
 
 
 void Smb4KRsyncOptions::slotBackupToggled( bool on )
 {
-  static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_UseBackupDirectory", TQCHECKBOX_OBJECT_NAME_STRING, true )) )->setEnabled( on );
+  static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_UseBackupDirectory", "TQCheckBox", true )) )->setEnabled( on );
   static_cast<KURLRequester *>( TQT_TQWIDGET(child( "kcfg_BackupDirectory", "KURLRequester", true )) )->setEnabled( on );
-  static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_UseBackupSuffix", TQCHECKBOX_OBJECT_NAME_STRING, true )) )->setEnabled( on );
+  static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_UseBackupSuffix", "TQCheckBox", true )) )->setEnabled( on );
   static_cast<KLineEdit *>( TQT_TQWIDGET(child( "kcfg_BackupSuffix", "KLineEdit", true )) )->setEnabled( on );
 }
 
 
 void Smb4KRsyncOptions::slotFShortcutToggled( bool on )
 {
-  TQCheckBox *ff_filter = static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_UseFFFilterRule", TQCHECKBOX_OBJECT_NAME_STRING, true )) );
+  TQCheckBox *ff_filter = static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_UseFFFilterRule", "TQCheckBox", true )) );
 
   if ( on && ff_filter->isChecked() )
   {
@@ -340,7 +340,7 @@ void Smb4KRsyncOptions::slotFShortcutToggled( bool on )
 
 void Smb4KRsyncOptions::slotFFShortcutToggled( bool on )
 {
-  TQCheckBox *f_filter = static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_UseFFilterRule", TQCHECKBOX_OBJECT_NAME_STRING, true )) );
+  TQCheckBox *f_filter = static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_UseFFilterRule", "TQCheckBox", true )) );
 
   if ( on && f_filter->isChecked() )
   {
diff --git a/smb4k/dialogs/smb4ksynchronizationdialog.cpp b/smb4k/dialogs/smb4ksynchronizationdialog.cpp
index 8cb85cf..9ad3a51 100644
--- a/smb4k/dialogs/smb4ksynchronizationdialog.cpp
+++ b/smb4k/dialogs/smb4ksynchronizationdialog.cpp
@@ -145,7 +145,7 @@ void Smb4KSynchronizationDialog::slotUser1()
   destination->lineEdit()->setReadOnly( true );
   destination->button()->setEnabled( false );
 
-  TQWidget *transfer_widget = static_cast<TQWidget *>( TQT_TQWIDGET(child( "TransferInfoWidget", TQWIDGET_OBJECT_NAME_STRING, true )) );
+  TQWidget *transfer_widget = static_cast<TQWidget *>( TQT_TQWIDGET(child( "TransferInfoWidget", "TQWidget", true )) );
   transfer_widget->setEnabled( true );
 
   enableButton( User1, false );
@@ -187,8 +187,8 @@ void Smb4KSynchronizationDialog::slotProgress( const Smb4KSynchronizationInfo &i
   KLineEdit *progress =   static_cast<KLineEdit *>( TQT_TQWIDGET(child( "ProgressInfo", "KLineEdit", true )) );
   KProgress *individual = static_cast<KProgress *>( TQT_TQWIDGET(child( "IndividualProgress", "KProgress", true )) );
   KProgress *total =      static_cast<KProgress *>( TQT_TQWIDGET(child( "TotalProgress", "KProgress", true )) );
-  TQLabel *transferred =   static_cast<TQLabel *>( TQT_TQWIDGET(child( "FilesTransferred", TQLABEL_OBJECT_NAME_STRING, true )) );
-  TQLabel *rate =          static_cast<TQLabel *>( TQT_TQWIDGET(child( "TransferRate", TQLABEL_OBJECT_NAME_STRING, true )) );
+  TQLabel *transferred =   static_cast<TQLabel *>( TQT_TQWIDGET(child( "FilesTransferred", "TQLabel", true )) );
+  TQLabel *rate =          static_cast<TQLabel *>( TQT_TQWIDGET(child( "TransferRate", "TQLabel", true )) );
 
   if ( !info.text().isEmpty() )
   {
diff --git a/smb4k/iconview/smb4ksharesiconviewtooltip.cpp b/smb4k/iconview/smb4ksharesiconviewtooltip.cpp
index 1784393..a1af8fc 100644
--- a/smb4k/iconview/smb4ksharesiconviewtooltip.cpp
+++ b/smb4k/iconview/smb4ksharesiconviewtooltip.cpp
@@ -322,7 +322,7 @@ void Smb4KSharesIconViewToolTip::update()
   }
   else
   {
-    TQLabel *free_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "FreeLabel", TQLABEL_OBJECT_NAME_STRING )) );
+    TQLabel *free_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "FreeLabel", "TQLabel" )) );
 
     if ( free_label )
     {
@@ -337,7 +337,7 @@ void Smb4KSharesIconViewToolTip::update()
       m_free = NULL;
     }
 
-    TQLabel *used_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "UsedLabel", TQLABEL_OBJECT_NAME_STRING )) );
+    TQLabel *used_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "UsedLabel", "TQLabel" )) );
 
     if ( used_label )
     {
@@ -352,7 +352,7 @@ void Smb4KSharesIconViewToolTip::update()
       m_used = NULL;
     }
 
-    TQLabel *total_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "TotalLabel", TQLABEL_OBJECT_NAME_STRING )) );
+    TQLabel *total_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "TotalLabel", "TQLabel" )) );
 
     if ( total_label )
     {
@@ -367,7 +367,7 @@ void Smb4KSharesIconViewToolTip::update()
       m_total = NULL;
     }
 
-    TQLabel *usage_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "UsageLabel", TQLABEL_OBJECT_NAME_STRING )) );
+    TQLabel *usage_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "UsageLabel", "TQLabel" )) );
 
     if ( usage_label )
     {
diff --git a/smb4k/listview/smb4kshareslistviewtooltip.cpp b/smb4k/listview/smb4kshareslistviewtooltip.cpp
index 5851e18..d97404b 100644
--- a/smb4k/listview/smb4kshareslistviewtooltip.cpp
+++ b/smb4k/listview/smb4kshareslistviewtooltip.cpp
@@ -322,7 +322,7 @@ void Smb4KSharesListViewToolTip::update()
   }
   else
   {
-    TQLabel *free_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "FreeLabel", TQLABEL_OBJECT_NAME_STRING )) );
+    TQLabel *free_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "FreeLabel", "TQLabel" )) );
 
     if ( free_label )
     {
@@ -337,7 +337,7 @@ void Smb4KSharesListViewToolTip::update()
       m_free = NULL;
     }
 
-    TQLabel *used_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "UsedLabel", TQLABEL_OBJECT_NAME_STRING )) );
+    TQLabel *used_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "UsedLabel", "TQLabel" )) );
 
     if ( used_label )
     {
@@ -352,7 +352,7 @@ void Smb4KSharesListViewToolTip::update()
       m_used = NULL;
     }
 
-    TQLabel *total_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "TotalLabel", TQLABEL_OBJECT_NAME_STRING )) );
+    TQLabel *total_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "TotalLabel", "TQLabel" )) );
 
     if ( total_label )
     {
@@ -367,7 +367,7 @@ void Smb4KSharesListViewToolTip::update()
       m_total = NULL;
     }
 
-    TQLabel *usage_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "UsageLabel", TQLABEL_OBJECT_NAME_STRING )) );
+    TQLabel *usage_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "UsageLabel", "TQLabel" )) );
 
     if ( usage_label )
     {
diff --git a/smb4k/smb4k.cpp b/smb4k/smb4k.cpp
index f94f89e..1c262e8 100644
--- a/smb4k/smb4k.cpp
+++ b/smb4k/smb4k.cpp
@@ -77,7 +77,7 @@ Smb4KApp::Smb4KApp( TQWidget *parent, const char *name )
 
   // Setup all things that need to be done *after* createGUI()
   // was run:
-  TQPopupMenu *settings = static_cast<TQPopupMenu *>( TQT_TQWIDGET(child( "settings", TQPOPUPMENU_OBJECT_NAME_STRING, true )) );
+  TQPopupMenu *settings = static_cast<TQPopupMenu *>( TQT_TQWIDGET(child( "settings", "TQPopupMenu", true )) );
 
   if ( settings )
   {