From 6ec5cc8d82b29c330def669cf20534cadd2cf29e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 19 Jan 2013 23:57:47 -0600 Subject: Rename KApplication to TDEApplication to avoid conflicts with KDE4 --- chalk/plugins/tools/defaulttools/kis_tool_zoom.cc | 4 ++-- chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'chalk/plugins/tools') diff --git a/chalk/plugins/tools/defaulttools/kis_tool_zoom.cc b/chalk/plugins/tools/defaulttools/kis_tool_zoom.cc index f866e5e2..eda09f6e 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_zoom.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_zoom.cc @@ -131,8 +131,8 @@ void KisToolZoom::slotTimer() #if KDE_IS_VERSION(3,4,0) int state = kapp->keyboardMouseState() & (TQt::ShiftButton|TQt::ControlButton|TQt::AltButton); #else - int state = kapp->keyboardModifiers() & (KApplication::ShiftModifier - |KApplication::ControlModifier|KApplication::Modifier1); + int state = kapp->keyboardModifiers() & (TDEApplication::ShiftModifier + |TDEApplication::ControlModifier|TDEApplication::Modifier1); #endif if (state & TQt::ControlButton) { diff --git a/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc b/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc index 58db0dad..9eb795ba 100644 --- a/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc +++ b/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc @@ -168,8 +168,8 @@ void KisToolSelectSimilar::slotTimer() #if KDE_IS_VERSION(3,4,0) int state = kapp->keyboardMouseState() & (TQt::ShiftButton|TQt::ControlButton|TQt::AltButton); #else - int state = kapp->keyboardModifiers() & (KApplication::ShiftModifier - |KApplication::ControlModifier|KApplication::Modifier1); + int state = kapp->keyboardModifiers() & (TDEApplication::ShiftModifier + |TDEApplication::ControlModifier|TDEApplication::Modifier1); #endif enumSelectionMode action; -- cgit v1.2.1