diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:22:15 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:22:15 -0600 |
| commit | 5fc6f26e12b596addd235f87320c31761bd5a84d (patch) | |
| tree | 0a1ff964c23fce07fc088017df4ad537d57e62e5 /korganizer/plugins | |
| parent | 12c8a23fe75817cb4bfcd604c1863266dd75e840 (diff) | |
| download | tdepim-5fc6f26e12b596addd235f87320c31761bd5a84d.tar.gz tdepim-5fc6f26e12b596addd235f87320c31761bd5a84d.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'korganizer/plugins')
| -rw-r--r-- | korganizer/plugins/exchange/exchange.cpp | 2 | ||||
| -rw-r--r-- | korganizer/plugins/projectview/projectview.cpp | 2 | ||||
| -rw-r--r-- | korganizer/plugins/timespanview/timespanview.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/korganizer/plugins/exchange/exchange.cpp b/korganizer/plugins/exchange/exchange.cpp index a0062387c..063c6756e 100644 --- a/korganizer/plugins/exchange/exchange.cpp +++ b/korganizer/plugins/exchange/exchange.cpp @@ -59,7 +59,7 @@ K_EXPORT_COMPONENT_FACTORY( libkorg_exchange, ExchangeFactory ) Exchange::Exchange(KOrg::MainWindow *parent, const char *name) : KOrg::Part(parent,name) { - setInstance( new KInstance( "korganizer" ) ); + setInstance( new TDEInstance( "korganizer" ) ); kdDebug(5850) << "Creating Exchange Plugin...\n"; diff --git a/korganizer/plugins/projectview/projectview.cpp b/korganizer/plugins/projectview/projectview.cpp index 2e7b3dc61..64cdd7a3f 100644 --- a/korganizer/plugins/projectview/projectview.cpp +++ b/korganizer/plugins/projectview/projectview.cpp @@ -48,7 +48,7 @@ K_EXPORT_COMPONENT_FACTORY( libkorg_projectview, ProjectViewFactory ) ProjectView::ProjectView(KOrg::MainWindow *parent, const char *name) : KOrg::Part(parent,name), mView(0) { - setInstance( new KInstance( "korganizer" ) ); + setInstance( new TDEInstance( "korganizer" ) ); setXMLFile("plugins/projectviewui.rc"); diff --git a/korganizer/plugins/timespanview/timespanview.cpp b/korganizer/plugins/timespanview/timespanview.cpp index 24a45abb1..bd910677b 100644 --- a/korganizer/plugins/timespanview/timespanview.cpp +++ b/korganizer/plugins/timespanview/timespanview.cpp @@ -47,7 +47,7 @@ K_EXPORT_COMPONENT_FACTORY( libkorg_timespanview, TimespanViewFactory ) TimespanView::TimespanView(KOrg::MainWindow *parent, const char *name) : KOrg::Part(parent,name), mView(0) { - setInstance( new KInstance( "korganizer" ) ); + setInstance( new TDEInstance( "korganizer" ) ); setXMLFile( "plugins/timespanviewui.rc" ); |