diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:15:55 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:15:55 -0600 |
| commit | 1d061b286a8b183b39be60fe531f2b1c2915f03a (patch) | |
| tree | 0a4c6ee79918e366077094fb59e9c1196d7f4156 /konsole/konsole/konsole_part.cpp | |
| parent | 1e0a98b8623428064963b1627e4e09ea02c1e87e (diff) | |
| download | tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'konsole/konsole/konsole_part.cpp')
| -rw-r--r-- | konsole/konsole/konsole_part.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/konsole/konsole/konsole_part.cpp b/konsole/konsole/konsole_part.cpp index 1054ce826..b6fa5eedf 100644 --- a/konsole/konsole/konsole_part.cpp +++ b/konsole/konsole/konsole_part.cpp @@ -57,8 +57,8 @@ K_EXPORT_COMPONENT_FACTORY( libkonsolepart, konsoleFactory ) /** * We need one static instance of the factory for our C 'main' function */ -KInstance *konsoleFactory::s_instance = 0L; -KAboutData *konsoleFactory::s_aboutData = 0; +TDEInstance *konsoleFactory::s_instance = 0L; +TDEAboutData *konsoleFactory::s_aboutData = 0; konsoleFactory::konsoleFactory() { @@ -85,12 +85,12 @@ KParts::Part *konsoleFactory::createPartObject(TQWidget *parentWidget, const cha return obj; } -KInstance *konsoleFactory::instance() +TDEInstance *konsoleFactory::instance() { if ( !s_instance ) { - s_aboutData = new KAboutData("konsole", I18N_NOOP("Konsole"), "1.5"); - s_instance = new KInstance( s_aboutData ); + s_aboutData = new TDEAboutData("konsole", I18N_NOOP("Konsole"), "1.5"); + s_instance = new TDEInstance( s_aboutData ); } return s_instance; } |