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 /kontact/plugins/knotes | |
| parent | 12c8a23fe75817cb4bfcd604c1863266dd75e840 (diff) | |
| download | tdepim-5fc6f26e12b596addd235f87320c31761bd5a84d.tar.gz tdepim-5fc6f26e12b596addd235f87320c31761bd5a84d.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kontact/plugins/knotes')
| -rw-r--r-- | kontact/plugins/knotes/knotes_part.cpp | 2 | ||||
| -rw-r--r-- | kontact/plugins/knotes/knotes_part_p.h | 2 | ||||
| -rw-r--r-- | kontact/plugins/knotes/knotes_plugin.cpp | 6 | ||||
| -rw-r--r-- | kontact/plugins/knotes/knotes_plugin.h | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/kontact/plugins/knotes/knotes_part.cpp b/kontact/plugins/knotes/knotes_part.cpp index 0e5d806ba..0752ade06 100644 --- a/kontact/plugins/knotes/knotes_part.cpp +++ b/kontact/plugins/knotes/knotes_part.cpp @@ -47,7 +47,7 @@ KNotesPart::KNotesPart( TQObject *parent, const char *name ) { mNoteList.setAutoDelete( true ); - setInstance( new KInstance( "knotes" ) ); + setInstance( new TDEInstance( "knotes" ) ); // create the actions new KAction( i18n( "&New" ), "knotes", CTRL+Key_N, this, TQT_SLOT( newNote() ), diff --git a/kontact/plugins/knotes/knotes_part_p.h b/kontact/plugins/knotes/knotes_part_p.h index b8a66b968..a9eb11bdb 100644 --- a/kontact/plugins/knotes/knotes_part_p.h +++ b/kontact/plugins/knotes/knotes_part_p.h @@ -125,7 +125,7 @@ class KNoteEditDlg : public KDialogBase, virtual public KXMLGUIClient // this dialog is modal to prevent one from editing the same note twice in two // different windows - setInstance( new KInstance( "knotes" ) ); // TODO: hm, memleak?? + setInstance( new TDEInstance( "knotes" ) ); // TODO: hm, memleak?? setXMLFile( "knotesui.rc" ); actionCollection()->setWidget( this ); diff --git a/kontact/plugins/knotes/knotes_plugin.cpp b/kontact/plugins/knotes/knotes_plugin.cpp index 5010bf7d9..2f3f470b8 100644 --- a/kontact/plugins/knotes/knotes_plugin.cpp +++ b/kontact/plugins/knotes/knotes_plugin.cpp @@ -64,12 +64,12 @@ Kontact::Summary *KNotesPlugin::createSummaryWidget( TQWidget *parentWidget ) return new KNotesSummaryWidget( this, parentWidget ); } -const KAboutData *KNotesPlugin::aboutData() +const TDEAboutData *KNotesPlugin::aboutData() { if ( !mAboutData ) { - mAboutData = new KAboutData( "knotes", I18N_NOOP( "Notes Management" ), + mAboutData = new TDEAboutData( "knotes", I18N_NOOP( "Notes Management" ), "0.5", I18N_NOOP( "Notes Management" ), - KAboutData::License_GPL_V2, + TDEAboutData::License_GPL_V2, "(c) 2003-2004 The Kontact developers" ); mAboutData->addAuthor( "Michael Brade", "Current Maintainer", "brade@kde.org" ); mAboutData->addAuthor( "Tobias Koenig", "", "tokoe@kde.org" ); diff --git a/kontact/plugins/knotes/knotes_plugin.h b/kontact/plugins/knotes/knotes_plugin.h index 12d485404..fe17bad52 100644 --- a/kontact/plugins/knotes/knotes_plugin.h +++ b/kontact/plugins/knotes/knotes_plugin.h @@ -42,7 +42,7 @@ class KNotesPlugin : public Kontact::Plugin int weight() const { return 600; } - const KAboutData *aboutData(); + const TDEAboutData *aboutData(); protected: KParts::ReadOnlyPart* createPart(); @@ -52,7 +52,7 @@ class KNotesPlugin : public Kontact::Plugin void slotSyncNotes(); private: - KAboutData *mAboutData; + TDEAboutData *mAboutData; }; #endif |