diff options
author | Timothy Pearson <[email protected]> | 2013-01-20 00:17:06 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-20 00:17:06 -0600 |
commit | e4e0479220e9e9616b68b2a11e42cff7a8af7b3d (patch) | |
tree | 8e01571cdd132dad34ebec38b12c2dbc37d05bd9 /kcontrol/access | |
parent | d41050ea3f6904e5156d35f664346b816b9e4d12 (diff) | |
download | tdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.tar.gz tdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.zip |
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/access')
-rw-r--r-- | kcontrol/access/kaccess.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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); |