From e4e0479220e9e9616b68b2a11e42cff7a8af7b3d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 20 Jan 2013 00:17:06 -0600 Subject: Rename KApplication to TDEApplication to avoid conflicts with KDE4 --- kcontrol/access/kaccess.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'kcontrol/access') diff --git a/kcontrol/access/kaccess.cpp b/kcontrol/access/kaccess.cpp index a69c47304..d119ed683 100644 --- a/kcontrol/access/kaccess.cpp +++ b/kcontrol/access/kaccess.cpp @@ -357,7 +357,7 @@ bool KAccessApp::x11EventFilter(XEvent *event) } // process other events as usual - return KApplication::x11EventFilter(event); + return TDEApplication::x11EventFilter(event); } @@ -574,7 +574,7 @@ void KAccessApp::createDialogContents() { lay->setSpacing(KDialog::spacingHint()); TQLabel *label1 = new TQLabel( contents); - TQPixmap pixmap = KApplication::kApplication()->iconLoader()->loadIcon("messagebox_warning", KIcon::NoGroup, KIcon::SizeMedium, KIcon::DefaultState, 0, true); + TQPixmap pixmap = TDEApplication::kApplication()->iconLoader()->loadIcon("messagebox_warning", KIcon::NoGroup, KIcon::SizeMedium, KIcon::DefaultState, 0, true); if (pixmap.isNull()) pixmap = TQMessageBox::standardIcon(TQMessageBox::Warning); label1->setPixmap(pixmap); -- cgit v1.2.1