diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-19 23:57:47 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-19 23:57:47 -0600 |
| commit | 6ec5cc8d82b29c330def669cf20534cadd2cf29e (patch) | |
| tree | 7e66b929b5455837f22ea54ed91fc9af6f64f7bf /chalk/plugins | |
| parent | 68a4fdfd2c2b70a7c22c4c6d6c916e604a0efac2 (diff) | |
| download | koffice-6ec5cc8d82b29c330def669cf20534cadd2cf29e.tar.gz koffice-6ec5cc8d82b29c330def669cf20534cadd2cf29e.zip | |
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'chalk/plugins')
| -rw-r--r-- | chalk/plugins/tools/defaulttools/kis_tool_zoom.cc | 4 | ||||
| -rw-r--r-- | chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc | 4 | ||||
| -rw-r--r-- | chalk/plugins/viewplugins/screenshot/main.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_zoom.cc b/chalk/plugins/tools/defaulttools/kis_tool_zoom.cc index f866e5e29..eda09f6ef 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 58db0dad1..9eb795ba4 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; diff --git a/chalk/plugins/viewplugins/screenshot/main.cpp b/chalk/plugins/viewplugins/screenshot/main.cpp index 6d74a63e7..21c4112ba 100644 --- a/chalk/plugins/viewplugins/screenshot/main.cpp +++ b/chalk/plugins/viewplugins/screenshot/main.cpp @@ -21,7 +21,7 @@ int main(int argc, char **argv) "nhasan@kde.org" ); TDECmdLineArgs::init( argc, argv, &aboutData ); - KApplication app; + TDEApplication app; KImageIO::registerFormats(); |