diff options
| author | Timothy Pearson <[email protected]> | 2013-01-22 19:53:02 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-22 19:53:02 -0600 |
| commit | 4734a6107171f37a23cd0718a9e5a5bb54d1698b (patch) | |
| tree | c0ec8dfbb84f173e37a8986b7f110a36a43617d5 | |
| parent | 7e81995551d32851431e269e68dc8b5152ac2022 (diff) | |
| download | kile-4734a6107171f37a23cd0718a9e5a5bb54d1698b.tar.gz kile-4734a6107171f37a23cd0718a9e5a5bb54d1698b.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
| -rw-r--r-- | src/kile/kile.cpp | 2 | ||||
| -rw-r--r-- | src/kile/main.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/kile/kile.cpp b/src/kile/kile.cpp index 27db743..73df995 100644 --- a/src/kile/kile.cpp +++ b/src/kile/kile.cpp @@ -652,7 +652,7 @@ void Kile::setupActions() else {WatchFileAction->setChecked(false);} setHelpMenuEnabled(false); - const KAboutData *aboutData = KGlobal::instance()->aboutData(); + const TDEAboutData *aboutData = KGlobal::instance()->aboutData(); KHelpMenu *help_menu = new KHelpMenu( this, aboutData); KStdAction::tipOfDay(TQT_TQOBJECT(this), TQT_SLOT(showTip()), actionCollection(), "help_tipofday"); diff --git a/src/kile/main.cpp b/src/kile/main.cpp index e1ef398..82e43ee 100644 --- a/src/kile/main.cpp +++ b/src/kile/main.cpp @@ -73,7 +73,7 @@ TQString completePath(const TQString &path) int main( int argc, char ** argv ) { - KAboutData aboutData( "kile", "Kile", kileFullVersion.ascii(), I18N_NOOP("TDE Integrated LaTeX Environment"), KAboutData::License_GPL, + TDEAboutData aboutData( "kile", "Kile", kileFullVersion.ascii(), I18N_NOOP("TDE Integrated LaTeX Environment"), TDEAboutData::License_GPL, I18N_NOOP("by the Kile Team (2003 - 2008)"), 0, "http://kile.sourceforge.net"); |