diff options
| author | Timothy Pearson <[email protected]> | 2013-01-22 20:15:55 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-22 20:15:55 -0600 |
| commit | 1d061b286a8b183b39be60fe531f2b1c2915f03a (patch) | |
| tree | 0a4c6ee79918e366077094fb59e9c1196d7f4156 /konqueror/sidebar/konqsidebar.cpp | |
| parent | 1e0a98b8623428064963b1627e4e09ea02c1e87e (diff) | |
| download | tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'konqueror/sidebar/konqsidebar.cpp')
| -rw-r--r-- | konqueror/sidebar/konqsidebar.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/konqueror/sidebar/konqsidebar.cpp b/konqueror/sidebar/konqsidebar.cpp index 29f8de794..61e0f3b82 100644 --- a/konqueror/sidebar/konqsidebar.cpp +++ b/konqueror/sidebar/konqsidebar.cpp @@ -41,7 +41,7 @@ KonqSidebar::KonqSidebar( TQWidget *parentWidget, const char *widgetName, setWidget(TQT_TQWIDGET(m_widget)); } -KInstance *KonqSidebar::getInstance() +TDEInstance *KonqSidebar::getInstance() { kdDebug() << "KonqSidebar::getInstance()" << endl; return KonqSidebarFactory::instance(); @@ -76,13 +76,13 @@ void KonqSidebar::customEvent(TQCustomEvent* ev) // It's usually safe to leave the factory code alone.. with the -// notable exception of the KAboutData data +// notable exception of the TDEAboutData data #include <kaboutdata.h> #include <klocale.h> #include <kinstance.h> -KInstance* KonqSidebarFactory::s_instance = 0L; -KAboutData* KonqSidebarFactory::s_about = 0L; +TDEInstance* KonqSidebarFactory::s_instance = 0L; +TDEAboutData* KonqSidebarFactory::s_about = 0L; KonqSidebarFactory::KonqSidebarFactory() : KParts::Factory() @@ -111,13 +111,13 @@ KParts::Part* KonqSidebarFactory::createPartObject( TQWidget *parentWidget, cons return obj; } -KInstance* KonqSidebarFactory::instance() +TDEInstance* KonqSidebarFactory::instance() { if( !s_instance ) { - s_about = new KAboutData("konqsidebartng", I18N_NOOP("Extended Sidebar"), "0.1"); + s_about = new TDEAboutData("konqsidebartng", I18N_NOOP("Extended Sidebar"), "0.1"); s_about->addAuthor("Joseph WENNINGER", 0, "[email protected]"); - s_instance = new KInstance(s_about); + s_instance = new TDEInstance(s_about); } return s_instance; } |