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 /libtdepim/komposer | |
| parent | 12c8a23fe75817cb4bfcd604c1863266dd75e840 (diff) | |
| download | tdepim-5fc6f26e12b596addd235f87320c31761bd5a84d.tar.gz tdepim-5fc6f26e12b596addd235f87320c31761bd5a84d.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'libtdepim/komposer')
| -rw-r--r-- | libtdepim/komposer/core/core.cpp | 2 | ||||
| -rw-r--r-- | libtdepim/komposer/core/prefsmodule.cpp | 6 | ||||
| -rw-r--r-- | libtdepim/komposer/core/prefsmodule.h | 4 | ||||
| -rw-r--r-- | libtdepim/komposer/core/tests/main.cpp | 2 | ||||
| -rw-r--r-- | libtdepim/komposer/test/test.cpp | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/libtdepim/komposer/core/core.cpp b/libtdepim/komposer/core/core.cpp index f93e59cc9..945c22311 100644 --- a/libtdepim/komposer/core/core.cpp +++ b/libtdepim/komposer/core/core.cpp @@ -60,7 +60,7 @@ Core::Core( TQWidget *parent, const char *name ) initWidgets(); initCore(); initConnections(); - setInstance( new KInstance( "komposer" ) ); + setInstance( new TDEInstance( "komposer" ) ); createActions(); setXMLFile( "komposerui.rc" ); diff --git a/libtdepim/komposer/core/prefsmodule.cpp b/libtdepim/komposer/core/prefsmodule.cpp index 5aed441a9..807869487 100644 --- a/libtdepim/komposer/core/prefsmodule.cpp +++ b/libtdepim/komposer/core/prefsmodule.cpp @@ -56,12 +56,12 @@ PrefsModule::PrefsModule( TQWidget *parent, const char *name ) load(); } -const KAboutData* +const TDEAboutData* PrefsModule::aboutData() const { - KAboutData *about = new KAboutData( I18N_NOOP( "komposerconfig" ), + TDEAboutData *about = new TDEAboutData( I18N_NOOP( "komposerconfig" ), I18N_NOOP( "TDE Komposer" ), - 0, 0, KAboutData::License_LGPL, + 0, 0, TDEAboutData::License_LGPL, I18N_NOOP( "(c), 2003-2004 Zack Rusin" ) ); about->addAuthor( "Zack Rusin", 0, "zack@kde.org" );; diff --git a/libtdepim/komposer/core/prefsmodule.h b/libtdepim/komposer/core/prefsmodule.h index 9e60098ee..a7733019c 100644 --- a/libtdepim/komposer/core/prefsmodule.h +++ b/libtdepim/komposer/core/prefsmodule.h @@ -27,7 +27,7 @@ class TQGroupBox; class TQListViewItem; -class KAboutData; +class TDEAboutData; class KComboBox; namespace Komposer { @@ -38,7 +38,7 @@ namespace Komposer { public: PrefsModule( TQWidget *parent=0, const char *name=0 ); - virtual const KAboutData *aboutData() const; + virtual const TDEAboutData *aboutData() const; }; class EditorSelection : public KPrefsWid diff --git a/libtdepim/komposer/core/tests/main.cpp b/libtdepim/komposer/core/tests/main.cpp index 80bf8fc95..e132ac883 100644 --- a/libtdepim/komposer/core/tests/main.cpp +++ b/libtdepim/komposer/core/tests/main.cpp @@ -38,7 +38,7 @@ static const KCmdLineOptions options[] = }; int main( int argc, char** argv ) { - KAboutData aboutData( "tests","Test","0.1" ); + TDEAboutData aboutData( "tests","Test","0.1" ); TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::addCmdLineOptions( options ); diff --git a/libtdepim/komposer/test/test.cpp b/libtdepim/komposer/test/test.cpp index c6cf91518..4f811e90f 100644 --- a/libtdepim/komposer/test/test.cpp +++ b/libtdepim/komposer/test/test.cpp @@ -36,8 +36,8 @@ static const char version[] = "0.0.1 (SVN)"; int main(int argc, char **argv) { - KAboutData about( "komposertest", I18N_NOOP( "KomposerTest" ), version, description, - KAboutData::License_GPL, "(C) 2001-2003 The Kontact developers", 0, "http://kontact.kde.org", "zack@kde.org" ); + TDEAboutData about( "komposertest", I18N_NOOP( "KomposerTest" ), version, description, + TDEAboutData::License_GPL, "(C) 2001-2003 The Kontact developers", 0, "http://kontact.kde.org", "zack@kde.org" ); about.addAuthor( "Zack Rusin", 0, "zack@kde.org" ); TDECmdLineArgs::init( argc, argv, &about ); |