diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:24:21 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:24:21 -0600 |
| commit | 8ba97103df12b002f6b2cf1d24a4b389a6379f61 (patch) | |
| tree | 583bb7f0c8a54d0d497abec2f95a692cda8c7b30 /kimagemapeditor | |
| parent | 0111fdc2a40580d418d365006c52845c320558b0 (diff) | |
| download | tdewebdev-8ba97103df12b002f6b2cf1d24a4b389a6379f61.tar.gz tdewebdev-8ba97103df12b002f6b2cf1d24a4b389a6379f61.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kimagemapeditor')
| -rw-r--r-- | kimagemapeditor/kimagemapeditor.cpp | 8 | ||||
| -rw-r--r-- | kimagemapeditor/kimagemapeditor.h | 2 | ||||
| -rw-r--r-- | kimagemapeditor/main.cpp | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/kimagemapeditor/kimagemapeditor.cpp b/kimagemapeditor/kimagemapeditor.cpp index 4ca05bc4..7aa45ddb 100644 --- a/kimagemapeditor/kimagemapeditor.cpp +++ b/kimagemapeditor/kimagemapeditor.cpp @@ -252,12 +252,12 @@ void KImageMapEditor::init() setImageActionsEnabled(false); } -KAboutData* KImageMapEditor::createAboutData() +TDEAboutData* KImageMapEditor::createAboutData() { - KAboutData* aboutData = - new KAboutData( "kimagemapeditor", I18N_NOOP("KImageMapEditor"), + TDEAboutData* aboutData = + new TDEAboutData( "kimagemapeditor", I18N_NOOP("KImageMapEditor"), "1.0", I18N_NOOP( "An HTML imagemap editor" ), - KAboutData::License_GPL, + TDEAboutData::License_GPL, "(c) 2001-2003 Jan Schäfer <janschaefer@users.sourceforge.net>"); return aboutData; } diff --git a/kimagemapeditor/kimagemapeditor.h b/kimagemapeditor/kimagemapeditor.h index d5462645..9497ee84 100644 --- a/kimagemapeditor/kimagemapeditor.h +++ b/kimagemapeditor/kimagemapeditor.h @@ -138,7 +138,7 @@ public : TQObject *parent, const char *name, const TQStringList & args = TQStringList()); virtual ~KImageMapEditor(); - static KAboutData *createAboutData(); + static TDEAboutData *createAboutData(); static KConfig *config(); /** diff --git a/kimagemapeditor/main.cpp b/kimagemapeditor/main.cpp index c27be373..36ab97f6 100644 --- a/kimagemapeditor/main.cpp +++ b/kimagemapeditor/main.cpp @@ -40,8 +40,8 @@ static KCmdLineOptions options[] = int main(int argc, char *argv[]) { - KAboutData aboutData( "kimagemapeditor", I18N_NOOP("KImageMapEditor"), - VERSION, description, KAboutData::License_GPL, + TDEAboutData aboutData( "kimagemapeditor", I18N_NOOP("KImageMapEditor"), + VERSION, description, TDEAboutData::License_GPL, "(C) 2001-2008 Jan Schaefer", 0, "http://www.nongnu.org/kimagemap/", "janschaefer@users.sourceforge.net"); aboutData.addAuthor("Jan Schaefer",0, "janschaefer@users.sourceforge.net"); aboutData.addCredit("Joerg Jaspert",I18N_NOOP("For helping me with the Makefiles, and creating the Debian package")); |