summaryrefslogtreecommitdiffstats
path: root/kolourpaint/kptool.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-20 00:19:40 -0600
committerTimothy Pearson <[email protected]>2013-01-20 00:19:40 -0600
commit74f47aebb77b4744bf18960b81c3744106cf56e0 (patch)
tree98f808be7ee64f341ba893cfc4fc6a2db7ed5092 /kolourpaint/kptool.cpp
parentc705f8f0619865875d6247d9470dced55241bc79 (diff)
downloadtdegraphics-74f47aebb77b4744bf18960b81c3744106cf56e0.tar.gz
tdegraphics-74f47aebb77b4744bf18960b81c3744106cf56e0.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'kolourpaint/kptool.cpp')
-rw-r--r--kolourpaint/kptool.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/kolourpaint/kptool.cpp b/kolourpaint/kptool.cpp
index dd2eea9c..1aa58bf7 100644
--- a/kolourpaint/kptool.cpp
+++ b/kolourpaint/kptool.cpp
@@ -499,12 +499,12 @@ void kpTool::beginInternal ()
m_beganDraw = false;
- uint keyState = KApplication::keyboardModifiers ();
+ uint keyState = TDEApplication::keyboardModifiers ();
- m_shiftPressed = (keyState & KApplication::ShiftModifier);
- m_controlPressed = (keyState & KApplication::ControlModifier);
+ m_shiftPressed = (keyState & TDEApplication::ShiftModifier);
+ m_controlPressed = (keyState & TDEApplication::ControlModifier);
- // TODO: Can't do much about ALT - unless it's always KApplication::Modifier1?
+ // TODO: Can't do much about ALT - unless it's always TDEApplication::Modifier1?
// Ditto for everywhere else where I set SHIFT & CTRL but not alt.
m_altPressed = false;
}
@@ -1372,12 +1372,12 @@ void kpTool::keyUpdateModifierState (TQKeyEvent *e)
#if DEBUG_KP_TOOL && 0
kdDebug () << "\t\tmodifiers not changed - figure out the truth" << endl;
#endif
- uint keyState = KApplication::keyboardModifiers ();
+ uint keyState = TDEApplication::keyboardModifiers ();
- setShiftPressed (keyState & KApplication::ShiftModifier);
- setControlPressed (keyState & KApplication::ControlModifier);
+ setShiftPressed (keyState & TDEApplication::ShiftModifier);
+ setControlPressed (keyState & TDEApplication::ControlModifier);
- // TODO: Can't do much about ALT - unless it's always KApplication::Modifier1?
+ // TODO: Can't do much about ALT - unless it's always TDEApplication::Modifier1?
// Ditto for everywhere else where I set SHIFT & CTRL but not alt.
setAltPressed (e->stateAfter () & TQt::AltButton);
}