From 57b3f979afe5dde48418b92a6c8e8e7ce6a2432f Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 19:59:05 -0600 Subject: [PATCH] Rename KInstance and KAboutData to avoid conflicts with KDE4 --- plugin/smb4k_konqplugin.cpp | 4 ++-- plugin/smb4k_konqplugin.h | 2 +- smb4k/browser/smb4knetworkbrowser_part.cpp | 12 ++++++------ smb4k/browser/smb4knetworkbrowser_part.h | 12 ++++++------ smb4k/configdlg/smb4kconfigdialog.cpp | 12 ++++++------ smb4k/configdlg/smb4kconfigdialog.h | 12 ++++++------ smb4k/iconview/smb4ksharesiconview_part.cpp | 12 ++++++------ smb4k/iconview/smb4ksharesiconview_part.h | 12 ++++++------ smb4k/listview/smb4kshareslistview_part.cpp | 12 ++++++------ smb4k/listview/smb4kshareslistview_part.h | 12 ++++++------ smb4k/main.cpp | 4 ++-- smb4k/searchdlg/smb4ksearchdialog_part.cpp | 12 ++++++------ smb4k/searchdlg/smb4ksearchdialog_part.h | 12 ++++++------ 13 files changed, 65 insertions(+), 65 deletions(-) diff --git a/plugin/smb4k_konqplugin.cpp b/plugin/smb4k_konqplugin.cpp index 21f9d8d..07e6af2 100644 --- a/plugin/smb4k_konqplugin.cpp +++ b/plugin/smb4k_konqplugin.cpp @@ -59,7 +59,7 @@ smb4kWidget::smb4kWidget( TQWidget * parent, const char * name, WFlags f ) // Nothing exciting to do ! } -KonqSidebar_Smb4K::KonqSidebar_Smb4K(KInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name): +KonqSidebar_Smb4K::KonqSidebar_Smb4K(TDEInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name): KonqSidebarPlugin(inst,parent,widgetParent,desktopName,name) { @@ -106,7 +106,7 @@ KonqSidebar_Smb4K::~KonqSidebar_Smb4K() extern "C" { - void* create_konqsidebar_smb4k(KInstance *instance,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name) + void* create_konqsidebar_smb4k(TDEInstance *instance,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name) { KGlobal::locale()->insertCatalogue("smb4k"); return new KonqSidebar_Smb4K(instance,par,widp,desktopname,name); diff --git a/plugin/smb4k_konqplugin.h b/plugin/smb4k_konqplugin.h index e15bde1..8e49512 100644 --- a/plugin/smb4k_konqplugin.h +++ b/plugin/smb4k_konqplugin.h @@ -65,7 +65,7 @@ public: * @param desktopName The filename of the configuration file. * @param name A TQt object name for your plugin. **/ - KonqSidebar_Smb4K(KInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name=0); + KonqSidebar_Smb4K(TDEInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name=0); /** destructor */ ~KonqSidebar_Smb4K(); diff --git a/smb4k/browser/smb4knetworkbrowser_part.cpp b/smb4k/browser/smb4knetworkbrowser_part.cpp index 3ef0e6c..34ea1b0 100644 --- a/smb4k/browser/smb4knetworkbrowser_part.cpp +++ b/smb4k/browser/smb4knetworkbrowser_part.cpp @@ -57,8 +57,8 @@ using namespace Smb4KGlobal; -KInstance *Smb4KNetworkBrowserPartFactory::m_instance = 0L; -KAboutData *Smb4KNetworkBrowserPartFactory::m_about = 0L; +TDEInstance *Smb4KNetworkBrowserPartFactory::m_instance = 0L; +TDEAboutData *Smb4KNetworkBrowserPartFactory::m_about = 0L; Smb4KNetworkBrowserPart::Smb4KNetworkBrowserPart( TQWidget *parentWidget, const char *widgetName, @@ -1898,14 +1898,14 @@ TQObject *parent, const char *name, const char *, const TQStringList &args ) } -KInstance *Smb4KNetworkBrowserPartFactory::instance() +TDEInstance *Smb4KNetworkBrowserPartFactory::instance() { if( !m_instance ) { - m_about = new KAboutData( "smb4knetworkbrowserpart", I18N_NOOP( "Smb4KNetworkBrowserPart" ), "1.0" ); + m_about = new TDEAboutData( "smb4knetworkbrowserpart", I18N_NOOP( "Smb4KNetworkBrowserPart" ), "1.0" ); m_about->addAuthor("Alexander Reinholdt", 0, "dustpuppy@users.berlios.de"); - m_about->setLicense( KAboutData::License_GPL ); - m_instance = new KInstance( m_about ); + m_about->setLicense( TDEAboutData::License_GPL ); + m_instance = new TDEInstance( m_about ); } return m_instance; diff --git a/smb4k/browser/smb4knetworkbrowser_part.h b/smb4k/browser/smb4knetworkbrowser_part.h index 49b3241..0519d56 100644 --- a/smb4k/browser/smb4knetworkbrowser_part.h +++ b/smb4k/browser/smb4knetworkbrowser_part.h @@ -317,8 +317,8 @@ class Smb4KNetworkBrowserPart : public KParts::Part }; -class KInstance; -class KAboutData; +class TDEInstance; +class TDEAboutData; class Smb4KNetworkBrowserPartFactory : public KParts::Factory { @@ -362,18 +362,18 @@ class Smb4KNetworkBrowserPartFactory : public KParts::Factory /** * The instance */ - static KInstance *instance(); + static TDEInstance *instance(); private: /** * The factory's instance. */ - static KInstance *m_instance; + static TDEInstance *m_instance; /** - * The factory's KAboutData object + * The factory's TDEAboutData object */ - static KAboutData *m_about; + static TDEAboutData *m_about; }; #endif diff --git a/smb4k/configdlg/smb4kconfigdialog.cpp b/smb4k/configdlg/smb4kconfigdialog.cpp index 2326389..a98ca7a 100644 --- a/smb4k/configdlg/smb4kconfigdialog.cpp +++ b/smb4k/configdlg/smb4kconfigdialog.cpp @@ -57,8 +57,8 @@ using namespace Smb4KGlobal; -KInstance *Smb4KConfigDialogFactory::m_instance = 0L; -KAboutData *Smb4KConfigDialogFactory::m_about = 0L; +TDEInstance *Smb4KConfigDialogFactory::m_instance = 0L; +TDEAboutData *Smb4KConfigDialogFactory::m_about = 0L; // Variables we need to determine if super user entries // have to be written to /etc/sudoers or /etc/super.tab @@ -1184,14 +1184,14 @@ Smb4KConfigDialogFactory::~Smb4KConfigDialogFactory() } -KInstance *Smb4KConfigDialogFactory::instance() +TDEInstance *Smb4KConfigDialogFactory::instance() { if( !m_instance ) { - m_about = new KAboutData( "smb4kconfigdialog", I18N_NOOP( "Smb4KConfigDialog" ), "1.0" ); + m_about = new TDEAboutData( "smb4kconfigdialog", I18N_NOOP( "Smb4KConfigDialog" ), "1.0" ); m_about->addAuthor("Alexander Reinholdt", 0, "dustpuppy@users.berlios.de"); - m_about->setLicense( KAboutData::License_GPL ); - m_instance = new KInstance( m_about ); + m_about->setLicense( TDEAboutData::License_GPL ); + m_instance = new TDEInstance( m_about ); } return m_instance; diff --git a/smb4k/configdlg/smb4kconfigdialog.h b/smb4k/configdlg/smb4kconfigdialog.h index d2b10be..ece086b 100644 --- a/smb4k/configdlg/smb4kconfigdialog.h +++ b/smb4k/configdlg/smb4kconfigdialog.h @@ -165,8 +165,8 @@ class Smb4KConfigDialog : public KConfigDialog }; -class KInstance; -class KAboutData; +class TDEInstance; +class TDEAboutData; class Smb4KConfigDialogFactory : KLibFactory @@ -188,7 +188,7 @@ class Smb4KConfigDialogFactory : KLibFactory /** * The instance */ - static KInstance *instance(); + static TDEInstance *instance(); protected: TQObject *createObject( TQObject *parent = 0, const char *name = 0, @@ -199,12 +199,12 @@ class Smb4KConfigDialogFactory : KLibFactory /** * The factory's instance */ - static KInstance *m_instance; + static TDEInstance *m_instance; /** - * The factory's KAboutData object + * The factory's TDEAboutData object */ - static KAboutData *m_about; + static TDEAboutData *m_about; }; #endif diff --git a/smb4k/iconview/smb4ksharesiconview_part.cpp b/smb4k/iconview/smb4ksharesiconview_part.cpp index 093ca9e..7cc409e 100644 --- a/smb4k/iconview/smb4ksharesiconview_part.cpp +++ b/smb4k/iconview/smb4ksharesiconview_part.cpp @@ -47,8 +47,8 @@ #include "../core/smb4ksettings.h" -KInstance *Smb4KSharesIconViewPartFactory::m_instance = 0L; -KAboutData *Smb4KSharesIconViewPartFactory::m_about = 0L; +TDEInstance *Smb4KSharesIconViewPartFactory::m_instance = 0L; +TDEAboutData *Smb4KSharesIconViewPartFactory::m_about = 0L; Smb4KSharesIconViewPart::Smb4KSharesIconViewPart( TQWidget *parentWidget, const char *widgetName, @@ -542,14 +542,14 @@ TQObject *parent, const char *name, const char *, const TQStringList & ) } -KInstance *Smb4KSharesIconViewPartFactory::instance() +TDEInstance *Smb4KSharesIconViewPartFactory::instance() { if( !m_instance ) { - m_about = new KAboutData( "smb4ksharesiconviewpart", I18N_NOOP( "Smb4KSharesIconViewPart" ), "1.0" ); + m_about = new TDEAboutData( "smb4ksharesiconviewpart", I18N_NOOP( "Smb4KSharesIconViewPart" ), "1.0" ); m_about->addAuthor("Alexander Reinholdt", 0, "dustpuppy@users.berlios.de"); - m_about->setLicense( KAboutData::License_GPL ); - m_instance = new KInstance( m_about ); + m_about->setLicense( TDEAboutData::License_GPL ); + m_instance = new TDEInstance( m_about ); } return m_instance; diff --git a/smb4k/iconview/smb4ksharesiconview_part.h b/smb4k/iconview/smb4ksharesiconview_part.h index d1e56f1..1248b5d 100644 --- a/smb4k/iconview/smb4ksharesiconview_part.h +++ b/smb4k/iconview/smb4ksharesiconview_part.h @@ -187,8 +187,8 @@ class Smb4KSharesIconViewPart : public KParts::Part }; -class KInstance; -class KAboutData; +class TDEInstance; +class TDEAboutData; class Smb4KSharesIconViewPartFactory : public KParts::Factory { @@ -216,18 +216,18 @@ class Smb4KSharesIconViewPartFactory : public KParts::Factory /** * The instance */ - static KInstance *instance(); + static TDEInstance *instance(); private: /** * The factory's instance. */ - static KInstance *m_instance; + static TDEInstance *m_instance; /** - * The factory's KAboutData object + * The factory's TDEAboutData object */ - static KAboutData *m_about; + static TDEAboutData *m_about; }; diff --git a/smb4k/listview/smb4kshareslistview_part.cpp b/smb4k/listview/smb4kshareslistview_part.cpp index fcd1f8e..4f8ce1d 100644 --- a/smb4k/listview/smb4kshareslistview_part.cpp +++ b/smb4k/listview/smb4kshareslistview_part.cpp @@ -50,8 +50,8 @@ #include "../core/smb4ksettings.h" -KInstance *Smb4KSharesListViewPartFactory::m_instance = 0L; -KAboutData *Smb4KSharesListViewPartFactory::m_about = 0L; +TDEInstance *Smb4KSharesListViewPartFactory::m_instance = 0L; +TDEAboutData *Smb4KSharesListViewPartFactory::m_about = 0L; Smb4KSharesListViewPart::Smb4KSharesListViewPart( TQWidget *parentWidget, const char *widgetName, @@ -669,14 +669,14 @@ TQObject *parent, const char *name, const char *, const TQStringList & ) } -KInstance *Smb4KSharesListViewPartFactory::instance() +TDEInstance *Smb4KSharesListViewPartFactory::instance() { if( !m_instance ) { - m_about = new KAboutData( "smb4kshareslistviewpart", I18N_NOOP( "Smb4KSharesListViewPart" ), "1.0" ); + m_about = new TDEAboutData( "smb4kshareslistviewpart", I18N_NOOP( "Smb4KSharesListViewPart" ), "1.0" ); m_about->addAuthor("Alexander Reinholdt", 0, "dustpuppy@users.berlios.de"); - m_about->setLicense( KAboutData::License_GPL ); - m_instance = new KInstance( m_about ); + m_about->setLicense( TDEAboutData::License_GPL ); + m_instance = new TDEInstance( m_about ); } return m_instance; diff --git a/smb4k/listview/smb4kshareslistview_part.h b/smb4k/listview/smb4kshareslistview_part.h index 880aa4d..a7b21ad 100644 --- a/smb4k/listview/smb4kshareslistview_part.h +++ b/smb4k/listview/smb4kshareslistview_part.h @@ -189,8 +189,8 @@ class Smb4KSharesListViewPart : public KParts::Part }; -class KInstance; -class KAboutData; +class TDEInstance; +class TDEAboutData; class Smb4KSharesListViewPartFactory : public KParts::Factory { @@ -218,18 +218,18 @@ class Smb4KSharesListViewPartFactory : public KParts::Factory /** * The instance */ - static KInstance *instance(); + static TDEInstance *instance(); private: /** * The factory's instance. */ - static KInstance *m_instance; + static TDEInstance *m_instance; /** - * The factory's KAboutData object + * The factory's TDEAboutData object */ - static KAboutData *m_about; + static TDEAboutData *m_about; }; diff --git a/smb4k/main.cpp b/smb4k/main.cpp index 2e5b0d9..828a274 100644 --- a/smb4k/main.cpp +++ b/smb4k/main.cpp @@ -61,8 +61,8 @@ static KCmdLineOptions options[] = int main( int argc, char *argv[] ) { - KAboutData aboutData( "smb4k", I18N_NOOP( "Smb4K" ), - VERSION, description, KAboutData::License_GPL, + TDEAboutData aboutData( "smb4k", I18N_NOOP( "Smb4K" ), + VERSION, description, TDEAboutData::License_GPL, I18N_NOOP( "(c) 2003-2008, Alexander Reinholdt\n(c) 2004-2008, Massimo Callegari\n(c) 2004, Franck Babin" ), 0, "http://smb4k.berlios.de", "smb4k-bugs@lists.berlios.de" ); // Authors: diff --git a/smb4k/searchdlg/smb4ksearchdialog_part.cpp b/smb4k/searchdlg/smb4ksearchdialog_part.cpp index 72d9563..1c122dd 100644 --- a/smb4k/searchdlg/smb4ksearchdialog_part.cpp +++ b/smb4k/searchdlg/smb4ksearchdialog_part.cpp @@ -44,8 +44,8 @@ #include "../core/smb4knetworkitems.h" #include "../core/smb4kdefs.h" -KInstance *Smb4KSearchDialogPartFactory::m_instance = 0L; -KAboutData *Smb4KSearchDialogPartFactory::m_about = 0L; +TDEInstance *Smb4KSearchDialogPartFactory::m_instance = 0L; +TDEAboutData *Smb4KSearchDialogPartFactory::m_about = 0L; Smb4KSearchDialogPart::Smb4KSearchDialogPart( TQWidget *parentWidget, const char *widgetName, @@ -247,14 +247,14 @@ TQObject *parent, const char *name, const char *, const TQStringList & ) } -KInstance *Smb4KSearchDialogPartFactory::instance() +TDEInstance *Smb4KSearchDialogPartFactory::instance() { if( !m_instance ) { - m_about = new KAboutData( "smb4ksearchdialogpart", I18N_NOOP( "Smb4KSearchDialogPart" ), "1.0" ); + m_about = new TDEAboutData( "smb4ksearchdialogpart", I18N_NOOP( "Smb4KSearchDialogPart" ), "1.0" ); m_about->addAuthor("Alexander Reinholdt", 0, "dustpuppy@users.berlios.de"); - m_about->setLicense( KAboutData::License_GPL ); - m_instance = new KInstance( m_about ); + m_about->setLicense( TDEAboutData::License_GPL ); + m_instance = new TDEInstance( m_about ); } return m_instance; diff --git a/smb4k/searchdlg/smb4ksearchdialog_part.h b/smb4k/searchdlg/smb4ksearchdialog_part.h index ed60782..f6ba680 100644 --- a/smb4k/searchdlg/smb4ksearchdialog_part.h +++ b/smb4k/searchdlg/smb4ksearchdialog_part.h @@ -127,8 +127,8 @@ class Smb4KSearchDialogPart : public KParts::Part }; -class KInstance; -class KAboutData; +class TDEInstance; +class TDEAboutData; class Smb4KSearchDialogPartFactory : public KParts::Factory { @@ -156,18 +156,18 @@ class Smb4KSearchDialogPartFactory : public KParts::Factory /** * The instance */ - static KInstance *instance(); + static TDEInstance *instance(); private: /** * The factory's instance. */ - static KInstance *m_instance; + static TDEInstance *m_instance; /** - * The factory's KAboutData object + * The factory's TDEAboutData object */ - static KAboutData *m_about; + static TDEAboutData *m_about; }; #endif