diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 19:59:05 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 19:59:05 -0600 |
| commit | 57b3f979afe5dde48418b92a6c8e8e7ce6a2432f (patch) | |
| tree | e646b993b6d3c76472c2586f189af737f2e5e58e /smb4k/listview | |
| parent | 2d61c9d5657f81f98a8a6bad2494a3b49b7e8e99 (diff) | |
| download | smb4k-57b3f979afe5dde48418b92a6c8e8e7ce6a2432f.tar.gz smb4k-57b3f979afe5dde48418b92a6c8e8e7ce6a2432f.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'smb4k/listview')
| -rw-r--r-- | smb4k/listview/smb4kshareslistview_part.cpp | 12 | ||||
| -rw-r--r-- | smb4k/listview/smb4kshareslistview_part.h | 12 |
2 files changed, 12 insertions, 12 deletions
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; }; |