From 73ff676f11662d6178c8854a7832ebffe2ae409d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 19:55:40 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- kexi/main/keximainwindowimpl.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'kexi/main/keximainwindowimpl.cpp') diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp index 96bd81be1..d5d77cd96 100644 --- a/kexi/main/keximainwindowimpl.cpp +++ b/kexi/main/keximainwindowimpl.cpp @@ -144,7 +144,7 @@ //------------------------------------------------- //static -int KexiMainWindowImpl::create(int argc, char *argv[], KAboutData* aboutdata) +int KexiMainWindowImpl::create(int argc, char *argv[], TDEAboutData* aboutdata) { Kexi::initCmdLineArgs( argc, argv, aboutdata ); @@ -3957,7 +3957,7 @@ void KexiMainWindowImpl::slotStartFeedbackAgent() { #ifndef KEXI_NO_FEEDBACK_AGENT #ifdef FEEDBACK_CLASS - const KAboutData* about = TDEApplication::kApplication()->aboutData(); + const TDEAboutData* about = TDEApplication::kApplication()->aboutData(); FEEDBACK_CLASS* wizard = new FEEDBACK_CLASS( about->programName(), about->version(), 0, 0, 0, FEEDBACK_CLASS::AllPages ); -- cgit v1.2.3