Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

ChangeLog

@@ -40,7 +40,7 @@ Smb4K 0.9.2:
 - Applied patch provided by Carsten Lohrke so that Smb4K's desktop file
   complies with freedesktop.org's specifications.
 - Fixed double declaration in Smb4KSystemTray class.
-- Removed Smb4KConfigDialogFactory::setConfigObject() function that was not
+- Removed Smb4TDEConfigDialogFactory::setConfigObject() function that was not
   used.
 - Fixed poor IP address check in Smb4KScanner::searchForHost().
 - Fixed saving of default login data when the wallet was closed.
@@ -55,10 +55,10 @@ Smb4K 0.9.1
 Smb4K 0.9.0:
 - Cleaned up the code and updated the copyright statements (class descriptions,
   e-mail address and year).
-- Smb4K now uses KConfig XT throughout the whole application. This breaks
+- Smb4K now uses TDEConfig XT throughout the whole application. This breaks
   compatibility with older versions of Smb4K.
-- Replaced the old configuration dialog with a new one based on KConfigDialog
+- Replaced the old configuration dialog with a new one based on TDEConfigDialog
-  to take advantange of the KConfig XT infrastructure. It is a KDE module
+  to take advantange of the TDEConfig XT infrastructure. It is a KDE module
   library: libsmb4kconfigdialog.
 - Added some configuration options:
   + The '-S <arg>' (signing state) and '-P' (use machine account) arguments of
@@ -90,7 +90,7 @@ Smb4K 0.9.0:
   + Added Smb4KCore::init() function, that initializes the core, i.e. starts the
     scanning of the network and the import and remounting of shares.
 - Improved Smb4KSambaOptionsHandler class:
-  + The constructor does not take a KConfig object anymore.
+  + The constructor does not take a TDEConfig object anymore.
   + The client charset and server codepage will be auto-detected if the 'unix
     charset' and 'dos charset' options are present in smb.conf, respectively
     (closes #10805).
@@ -142,7 +142,7 @@ Smb4K 0.9.0:
 - Modified Smb4KPasswordHandler class:
   + Removed import() function which imported authentication data from old
     password file (versions prior to Smb4K 0.6.0).
-  + The constructor does not take a KConfig object anymore.
+  + The constructor does not take a TDEConfig object anymore.
   + The descriptive text in the askpass dialog now distinguishes between a
     server and a share.
 - Did a major revision of Smb4KFileIO class:
@@ -609,7 +609,7 @@ Smb4K 0.7.0:
 - Replaced deprecated KStdActions.
 - Introduced new Smb4KDataItem container for the core classes.
 - Revised bookmark handling:
-  + The bookmark handler does not use KConfig anymore but has its own read
+  + The bookmark handler does not use TDEConfig anymore but has its own read
     and write functions. Thus, you won't be able to read the bookmark file
     with prior versions once you ran Smb4K 0.7.0.
   + The bookmarks are now stored with workgroup/domain and IP address (closes
@@ -744,7 +744,7 @@ Smb4K 0.6.5:
   /etc/super.tab, respectively. The permissions are no longer hard coded,
   but the stat() system call is used to read the original permissions that
   will then be preserved.
-- Introduced global KConfig object and ported all classes to use it.
+- Introduced global TDEConfig object and ported all classes to use it.
 - Fixed login problem when trying to preview a WinXP share or similar.
 - Added support of the 'include' directive in the smb.conf file (closes
   #5948). NOTE: The file that is to be included *must* be given with its

TODO

@@ -3,7 +3,7 @@ TODO list:
 for 0.10.x:
 - Make Smb4K a KDE4 program.
 - Move to cmake.
-- Use KConfigSkeletonItem::label() in the config dialog instead of the strings
+- Use TDEConfigSkeletonItem::label() in the config dialog instead of the strings
   present at the moment.
 - Replace getenv( "USER" ) cuserid(). Use something like the following code
   snippet:

doc/en/index.docbook

@@ -129,7 +129,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 <para>If all programs have been found, the main window and the system tray widget will be shown and you can start working with &smb4k;.</para>
 <para><emphasis role="bold">Note:</emphasis> It is recommended that you configure Samba before using &smb4k;. The <ulink url="man:/swat"><citerefentry><refentrytitle>swat</refentrytitle><manvolnum>8</manvolnum></citerefentry></ulink> utility can be used for this purpose. It is part of the Samba software suite and provides an easy-to-use web interface. See its manual page for documentation.</para>
 
-<para>Starting with version 0.9.0, &smb4k; uses the KConfig XT configuration system. All previously defined settings are obsolete. To assure a clean transition the old configuration file <filename>$HOME/.trinity/share/config/smb4krc</filename> will be removed the first time you start the new version of &smb4k;. A message box will warn you before the file is actually removed:</para>
+<para>Starting with version 0.9.0, &smb4k; uses the TDEConfig XT configuration system. All previously defined settings are obsolete. To assure a clean transition the old configuration file <filename>$HOME/.trinity/share/config/smb4krc</filename> will be removed the first time you start the new version of &smb4k;. A message box will warn you before the file is actually removed:</para>
 
 <screenshot>
 <screeninfo>Warning message box</screeninfo>

plugin/smb4k_konqplugin.cpp

@@ -188,7 +188,7 @@ void KonqSidebar_Smb4K::slotSmb4KOptionsDlg()
 
   if ( config_factory )
   {
-    KConfigDialog *dlg = static_cast<KConfigDialog *>( TQT_TQWIDGET(config_factory->create( TQT_TQOBJECT(widget), "ConfigDialog", "KConfigDialog" )) );
+    TDEConfigDialog *dlg = static_cast<TDEConfigDialog *>( TQT_TQWIDGET(config_factory->create( TQT_TQOBJECT(widget), "ConfigDialog", "TDEConfigDialog" )) );
 
     if ( dlg )
     {

po/de.po

@@ -690,8 +690,8 @@ msgstr ""
 "%1Bitte korrigieren Sie diese Probleme."
 
 #: smb4k/configdlg/smb4kconfigdialog.cpp:1191
-msgid "Smb4KConfigDialog"
+msgid "Smb4TDEConfigDialog"
-msgstr "Smb4KConfigDialog"
+msgstr "Smb4TDEConfigDialog"
 
 #: smb4k/configdlg/smb4kauthoptions.cpp:52
 msgid "Password Storage"

po/es.po

@@ -682,8 +682,8 @@ msgid ""
 msgstr ""
 
 #: smb4k/configdlg/smb4kconfigdialog.cpp:1191
-msgid "Smb4KConfigDialog"
+msgid "Smb4TDEConfigDialog"
-msgstr "Smb4KConfigDialog"
+msgstr "Smb4TDEConfigDialog"
 
 #: smb4k/configdlg/smb4kauthoptions.cpp:52
 msgid "Password Storage"

po/it.po

@@ -695,7 +695,7 @@ msgstr ""
 
 #: smb4k/configdlg/smb4kconfigdialog.cpp:1191
 #, fuzzy
-msgid "Smb4KConfigDialog"
+msgid "Smb4TDEConfigDialog"
 msgstr "Smb4KMontaggio"
 
 #: smb4k/configdlg/smb4kauthoptions.cpp:52

po/ja.po

@@ -682,7 +682,7 @@ msgstr ""
 "これら( %1 )の問題を修正してください"
 
 #: smb4k/configdlg/smb4kconfigdialog.cpp:1191
-msgid "Smb4KConfigDialog"
+msgid "Smb4TDEConfigDialog"
 msgstr "Smb4K設定・ダイアログ"
 
 #: smb4k/configdlg/smb4kauthoptions.cpp:52

po/sv.po

@@ -1240,7 +1240,7 @@ msgid ""
 msgstr ""
 
 #: smb4k/configdlg/smb4kconfigdialog.cpp:1191
-msgid "Smb4KConfigDialog"
+msgid "Smb4TDEConfigDialog"
 msgstr ""
 
 #: smb4k/configdlg/smb4kauthoptions.cpp:52

po/uk.po

@@ -716,8 +716,8 @@ msgid ""
 msgstr ""
 
 #: smb4k/configdlg/smb4kconfigdialog.cpp:1191
-msgid "Smb4KConfigDialog"
+msgid "Smb4TDEConfigDialog"
-msgstr "Smb4KConfigDialog"
+msgstr "Smb4TDEConfigDialog"
 
 #: smb4k/configdlg/smb4kauthoptions.cpp:52
 msgid "Password Storage"

smb4k/configdlg/smb4kconfigdialog.cpp

@@ -57,8 +57,8 @@
 
 using namespace Smb4TDEGlobal;
 
-TDEInstance *Smb4KConfigDialogFactory::m_instance = 0L;
+TDEInstance *Smb4TDEConfigDialogFactory::m_instance = 0L;
-TDEAboutData *Smb4KConfigDialogFactory::m_about = 0L;
+TDEAboutData *Smb4TDEConfigDialogFactory::m_about = 0L;
 
 // Variables we need to determine if super user entries
 // have to be written to /etc/sudoers or /etc/super.tab
@@ -74,8 +74,8 @@ bool always_use_su = false;
 bool close_dialog = false;
 
 
-Smb4KConfigDialog::Smb4KConfigDialog( Smb4KSettings *settings, TQWidget *parent, const char *name )
+Smb4TDEConfigDialog::Smb4TDEConfigDialog( Smb4KSettings *settings, TQWidget *parent, const char *name )
-: KConfigDialog( parent, name, settings )
+: TDEConfigDialog( parent, name, settings )
 {
   // FIXME: I guess, normally we would not need to close destructively,
   // but at the moment there are issues with the KURLRequester in file
@@ -167,8 +167,8 @@ Smb4KConfigDialog::Smb4KConfigDialog( Smb4KSettings *settings, TQWidget *parent,
   addPage( rsync_options, i18n( "Synchronization" ), "bottom" );
   addPage( super_user_options, i18n( "Super User" ), "penguin" );
 
-  // Stuff that's not managed by KConfig XT is loaded by
+  // Stuff that's not managed by TDEConfig XT is loaded by
-  // Smb4KConfigDialog::showEvent()!
+  // Smb4TDEConfigDialog::showEvent()!
 
   // Resize the dialog
   setInitialSize( configDialogSize( *(Smb4KSettings::self()->config()), "ConfigDialog" ) );
@@ -188,12 +188,12 @@ Smb4KConfigDialog::Smb4KConfigDialog( Smb4KSettings *settings, TQWidget *parent,
 }
 
 
-Smb4KConfigDialog::~Smb4KConfigDialog()
+Smb4TDEConfigDialog::~Smb4TDEConfigDialog()
 {
 }
 
 
-void Smb4KConfigDialog::loadCustomSambaOptions()
+void Smb4TDEConfigDialog::loadCustomSambaOptions()
 {
   // Get the list view:
   KListView *custom_list = static_cast<KListView *>( TQT_TQWIDGET(child( "CustomOptionsList", "KListView", true )) );
@@ -389,7 +389,7 @@ void Smb4KConfigDialog::loadCustomSambaOptions()
 }
 
 
-void Smb4KConfigDialog::saveCustomSambaOptions()
+void Smb4TDEConfigDialog::saveCustomSambaOptions()
 {
   // Get the list view:
   KListView *custom_list = static_cast<KListView *>( TQT_TQWIDGET(child( "CustomOptionsList", "KListView", true )) );
@@ -509,7 +509,7 @@ void Smb4KConfigDialog::saveCustomSambaOptions()
 }
 
 
-void Smb4KConfigDialog::loadAuthenticationData()
+void Smb4TDEConfigDialog::loadAuthenticationData()
 {
   // Load the default login info and put it into the configuration
   // page:
@@ -533,7 +533,7 @@ void Smb4KConfigDialog::loadAuthenticationData()
 }
 
 
-void Smb4KConfigDialog::saveAuthenticationData()
+void Smb4TDEConfigDialog::saveAuthenticationData()
 {
   // Read the default login info from the configuration page
   // and pass it to the password handler, but only if the wallet
@@ -566,7 +566,7 @@ void Smb4KConfigDialog::saveAuthenticationData()
 }
 
 
-bool Smb4KConfigDialog::writeSuperUserEntries()
+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 )) );
@@ -638,7 +638,7 @@ bool Smb4KConfigDialog::writeSuperUserEntries()
 }
 
 
-void Smb4KConfigDialog::removeSuperUserEntries()
+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 )) );
@@ -686,7 +686,7 @@ void Smb4KConfigDialog::removeSuperUserEntries()
 }
 
 
-bool Smb4KConfigDialog::checkSettings()
+bool Smb4TDEConfigDialog::checkSettings()
 {
   bool ok = true;
   TQString issues = TQString();
@@ -917,7 +917,7 @@ bool Smb4KConfigDialog::checkSettings()
 }
 
 
-void Smb4KConfigDialog::showEvent( TQShowEvent *e )
+void Smb4TDEConfigDialog::showEvent( TQShowEvent *e )
 {
   // Spontaneous show events come from outside the application.
   // We do not want to react on them.
@@ -933,7 +933,7 @@ void Smb4KConfigDialog::showEvent( TQShowEvent *e )
 // TQT_SLOT IMPLEMENTATIONS
 /////////////////////////////////////////////////////////////////////////////
 
-void Smb4KConfigDialog::slotApply()
+void Smb4TDEConfigDialog::slotApply()
 {
   // If some settings are not complete, stop here and give
   // the user the opportunity to fill in the needed string(s).
@@ -952,14 +952,14 @@ void Smb4KConfigDialog::slotApply()
     setEnabled( false );
   }
 
-  // The 'Apply' button will be disabled by KConfigDialog, so we do not
+  // The 'Apply' button will be disabled by TDEConfigDialog, so we do not
   // need to do it here.
 
-  KConfigDialog::slotApply();
+  TDEConfigDialog::slotApply();
 }
 
 
-void Smb4KConfigDialog::slotOk()
+void Smb4TDEConfigDialog::slotOk()
 {
   // If some settings are not complete, stop here and give
   // the user the opportunity to fill in the needed string(s).
@@ -978,7 +978,7 @@ void Smb4KConfigDialog::slotOk()
   // Smb4KFileIO::finished() signal is received.
   if ( !writeSuperUserEntries() )
   {
-    KConfigDialog::slotOk();
+    TDEConfigDialog::slotOk();
   }
   else
   {
@@ -986,14 +986,14 @@ void Smb4KConfigDialog::slotOk()
     // is received.
     setEnabled( false );
 
-    // Tell Smb4KConfigDialog::slotReceivedFileIOFinished()
+    // Tell Smb4TDEConfigDialog::slotReceivedFileIOFinished()
     // to close the dialog.
     close_dialog = true;
   }
 }
 
 
-void Smb4KConfigDialog::slotCancel()
+void Smb4TDEConfigDialog::slotCancel()
 {
   // Reset the custom Samba options tab:
   Smb4KSambaOptions *samba_options = static_cast<Smb4KSambaOptions *>( TQT_TQWIDGET(child( "SambaOptions", "Smb4KSambaOptions", true )) );
@@ -1003,11 +1003,11 @@ void Smb4KConfigDialog::slotCancel()
     samba_options->resetCustomTab();
   }
 
-  KConfigDialog::slotCancel();
+  TDEConfigDialog::slotCancel();
 }
 
 
-void Smb4KConfigDialog::slotCustomSambaSettingsChanged()
+void Smb4TDEConfigDialog::slotCustomSambaSettingsChanged()
 {
   // Get the list view and all other input widgets:
   KListView *view = static_cast<KListView *>( TQT_TQWIDGET(child( "CustomOptionsList", "KListView", true )) );
@@ -1123,7 +1123,7 @@ void Smb4KConfigDialog::slotCustomSambaSettingsChanged()
 }
 
 
-void Smb4KConfigDialog::slotRemoveSuperUserEntries()
+void Smb4TDEConfigDialog::slotRemoveSuperUserEntries()
 {
   // Disable this widget until Smb4KFileIO::finished()
   // is received.
@@ -1133,7 +1133,7 @@ void Smb4KConfigDialog::slotRemoveSuperUserEntries()
 }
 
 
-void Smb4KConfigDialog::slotReceivedFileIOFailed()
+void Smb4TDEConfigDialog::slotReceivedFileIOFailed()
 {
 #ifdef __linux__
   TQCheckBox *force =    static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_UseForceUnmount", TQCHECKBOX_OBJECT_NAME_STRING, true )) );
@@ -1153,14 +1153,14 @@ void Smb4KConfigDialog::slotReceivedFileIOFailed()
 }
 
 
-void Smb4KConfigDialog::slotReceivedFileIOFinished()
+void Smb4TDEConfigDialog::slotReceivedFileIOFinished()
 {
   // Enable the widget again.
   setEnabled( true );
 
   if ( close_dialog )
   {
-    KConfigDialog::slotOk();
+    TDEConfigDialog::slotOk();
   }
 }
 
@@ -1169,13 +1169,13 @@ void Smb4KConfigDialog::slotReceivedFileIOFinished()
 // FACTORY STUFF
 /////////////////////////////////////////////////////////////////////////////
 
-Smb4KConfigDialogFactory::Smb4KConfigDialogFactory()
+Smb4TDEConfigDialogFactory::Smb4TDEConfigDialogFactory()
 : KLibFactory()
 {
 }
 
 
-Smb4KConfigDialogFactory::~Smb4KConfigDialogFactory()
+Smb4TDEConfigDialogFactory::~Smb4TDEConfigDialogFactory()
 {
   delete m_instance;
   delete m_about;
@@ -1184,11 +1184,11 @@ Smb4KConfigDialogFactory::~Smb4KConfigDialogFactory()
 }
 
 
-TDEInstance *Smb4KConfigDialogFactory::instance()
+TDEInstance *Smb4TDEConfigDialogFactory::instance()
 {
   if( !m_instance )
   {
-    m_about = new TDEAboutData( "smb4kconfigdialog", I18N_NOOP( "Smb4KConfigDialog" ), "1.0" );
+    m_about = new TDEAboutData( "smb4kconfigdialog", I18N_NOOP( "Smb4TDEConfigDialog" ), "1.0" );
     m_about->addAuthor("Alexander Reinholdt", 0, "dustpuppy@users.berlios.de");
     m_about->setLicense( TDEAboutData::License_GPL );
     m_instance = new TDEInstance( m_about );
@@ -1198,10 +1198,10 @@ TDEInstance *Smb4KConfigDialogFactory::instance()
 }
 
 
-TQObject *Smb4KConfigDialogFactory::createObject( TQObject *parent, const char *name, const char *,
+TQObject *Smb4TDEConfigDialogFactory::createObject( TQObject *parent, const char *name, const char *,
 const TQStringList & )
 {
-  return TQT_TQOBJECT( new Smb4KConfigDialog( Smb4KSettings::self(), TQT_TQWIDGET( parent ), name ) );
+  return TQT_TQOBJECT( new Smb4TDEConfigDialog( Smb4KSettings::self(), TQT_TQWIDGET( parent ), name ) );
 }
 
 
@@ -1215,7 +1215,7 @@ extern "C"
   void *init_libsmb4kconfigdialog()
   {
     TDEGlobal::locale()->insertCatalogue( "smb4k" );
-    return new Smb4KConfigDialogFactory;
+    return new Smb4TDEConfigDialogFactory;
   }
 }
 

smb4k/configdlg/smb4kconfigdialog.h

@@ -45,7 +45,7 @@ class Smb4KSettings;
  * @author Alexander Reinholdt <dustpuppy@users.berlios.de>
  */
 
-class Smb4KConfigDialog : public KConfigDialog
+class Smb4TDEConfigDialog : public TDEConfigDialog
 {
   Q_OBJECT
   
@@ -61,12 +61,12 @@ class Smb4KConfigDialog : public KConfigDialog
      *
      * @param name          The name of this dialog
      */
-    Smb4KConfigDialog( Smb4KSettings *settings, TQWidget *parent = 0, const char *name = 0 );
+    Smb4TDEConfigDialog( Smb4KSettings *settings, TQWidget *parent = 0, const char *name = 0 );
 
     /**
      * The destructor
      */
-    ~Smb4KConfigDialog();
+    ~Smb4TDEConfigDialog();
 
   protected:
     /**
@@ -79,20 +79,20 @@ class Smb4KConfigDialog : public KConfigDialog
 
   protected slots:
     /**
-     * Reimplemented from KConfigDialog. This slot does application
+     * Reimplemented from TDEConfigDialog. This slot does application
-     * specific stuff first and then executes KConfigDialog::slotApply().
+     * specific stuff first and then executes TDEConfigDialog::slotApply().
      */
     void slotApply();
 
     /**
-     * Reimplemented from KConfigDialog. This slot does application
+     * Reimplemented from TDEConfigDialog. This slot does application
-     * specific stuff first and then executes KConfigDialog::slotOk().
+     * specific stuff first and then executes TDEConfigDialog::slotOk().
      */
     void slotOk();
 
     /**
-     *Reimplemented from KConfigDialog. This slot does application
+     *Reimplemented from TDEConfigDialog. This slot does application
-     * specific stuff first and then executes KConfigDialog::slotCancel().
+     * specific stuff first and then executes TDEConfigDialog::slotCancel().
      */
     void slotCancel();
 
@@ -117,7 +117,7 @@ class Smb4KConfigDialog : public KConfigDialog
 
     /**
      * This slot is activated if the Smb4KFileIO::finished() signal is
-     * received. It closes the dialog by invoking KConfigDialog::slotOk().
+     * received. It closes the dialog by invoking TDEConfigDialog::slotOk().
      */
     void slotReceivedFileIOFinished();
 
@@ -169,7 +169,7 @@ class TDEInstance;
 class TDEAboutData;
 
 
-class Smb4KConfigDialogFactory : KLibFactory
+class Smb4TDEConfigDialogFactory : KLibFactory
 {
   Q_OBJECT
   
@@ -178,12 +178,12 @@ class Smb4KConfigDialogFactory : KLibFactory
     /**
      * The constructor.
      */
-    Smb4KConfigDialogFactory();
+    Smb4TDEConfigDialogFactory();
 
     /**
      * The destructor.
      */
-    virtual ~Smb4KConfigDialogFactory();
+    virtual ~Smb4TDEConfigDialogFactory();
 
     /**
      * The instance

smb4k/core/smb4kpasswordhandler.h

@@ -70,7 +70,7 @@ class Smb4KPasswordHandler : public TQObject
     /**
      * The constructor.
      *
-     * @param config        The KConfig object that should be used
+     * @param config        The TDEConfig object that should be used
      *
      * @param handler       The Smb4KHomesSharesHandler object that is needed to retrieve
      *                      infos in case we need to look up authentication information for

smb4k/iconview/smb4ksharesiconview.cpp

@@ -160,7 +160,7 @@ void Smb4KSharesIconView::contentsDropEvent( TQDropEvent *e )
   }
 
   // We only allow copying:
-  KIO::CopyJob *job = KIO::copy( src, dest, true );
+  TDEIO::CopyJob *job = TDEIO::copy( src, dest, true );
   job->setAutoErrorHandlingEnabled( true, NULL );
 #if TDE_VERSION_MAJOR >= 3 && TDE_VERSION_MINOR >= 5
   job->setAutoWarningHandlingEnabled( true );

smb4k/listview/smb4kshareslistview.cpp

@@ -165,7 +165,7 @@ void Smb4KSharesListView::contentsDropEvent( TQDropEvent *e )
   }
 
   // We only allow copying:
-  KIO::CopyJob *job = KIO::copy( src, dest, true );
+  TDEIO::CopyJob *job = TDEIO::copy( src, dest, true );
   job->setAutoErrorHandlingEnabled( true, NULL );
 #if TDE_VERSION_MAJOR >= 3 && TDE_VERSION_MINOR >= 5
   job->setAutoWarningHandlingEnabled( true );

smb4k/main.cpp

@@ -116,7 +116,7 @@ int main( int argc, char *argv[] )
 
   // Check the current config file and remove it if it belongs to
   // a version < 0.9.0.
-  KConfig config( "smb4krc", false, false, "config" );
+  TDEConfig config( "smb4krc", false, false, "config" );
 
   if ( !config.groupList().isEmpty() &&
        (config.groupList().contains( "Browse Options" ) != 0 ||

smb4k/smb4k.cpp

@@ -561,7 +561,7 @@ void Smb4KApp::slotConfigDialog()
 {
   // If the config dialog is already created and cached,
   // we do not create a new one but show the old instead:
-  if ( KConfigDialog::showDialog( "ConfigDialog" ) )
+  if ( TDEConfigDialog::showDialog( "ConfigDialog" ) )
   {
     return;
   }
@@ -571,7 +571,7 @@ void Smb4KApp::slotConfigDialog()
 
   if ( config_factory )
   {
-    KConfigDialog *dlg = static_cast<KConfigDialog *>( TQT_TQWIDGET(config_factory->create( TQT_TQOBJECT(this), "ConfigDialog", "KConfigDialog" )) );
+    TDEConfigDialog *dlg = static_cast<TDEConfigDialog *>( TQT_TQWIDGET(config_factory->create( TQT_TQOBJECT(this), "ConfigDialog", "TDEConfigDialog" )) );
 
     if ( dlg )
     {

smb4k/smb4ksystemtray.cpp

@@ -174,9 +174,9 @@ void Smb4KSystemTray::slotConfigDialog()
 {
   // If the config dialog is already created and cached,
   // we do not create a new one but show the old instead:
-  KConfigDialog *dlg = NULL;
+  TDEConfigDialog *dlg = NULL;
 
-  if ( (dlg = KConfigDialog::exists( "ConfigDialog" )) && KConfigDialog::showDialog( "ConfigDialog" ) )
+  if ( (dlg = TDEConfigDialog::exists( "ConfigDialog" )) && TDEConfigDialog::showDialog( "ConfigDialog" ) )
   {
     // To make sure we do not connect the config dialog several times
     // to slotSettingsChanged(), we break the connection first and re-
@@ -194,11 +194,11 @@ void Smb4KSystemTray::slotConfigDialog()
   {
     if ( parentWidget() && parentWidget()->isShown() )
     {
-      dlg = static_cast<KConfigDialog *>( TQT_TQWIDGET(config_factory->create( TQT_TQOBJECT(parentWidget()), "ConfigDialog", "KConfigDialog" )) );
+      dlg = static_cast<TDEConfigDialog *>( TQT_TQWIDGET(config_factory->create( TQT_TQOBJECT(parentWidget()), "ConfigDialog", "TDEConfigDialog" )) );
     }
     else
     {
-      dlg = static_cast<KConfigDialog *>( TQT_TQWIDGET(config_factory->create( TQT_TQOBJECT(this), "ConfigDialog", "KConfigDialog" )) );
+      dlg = static_cast<TDEConfigDialog *>( TQT_TQWIDGET(config_factory->create( TQT_TQOBJECT(this), "ConfigDialog", "TDEConfigDialog" )) );
     }
 
     // ... and show it.