summaryrefslogtreecommitdiffstats
path: root/khexedit
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:23:57 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:23:57 -0600
commit2877440fbda2e245d04f534ed51d7cb7c0a06482 (patch)
tree874d2d10bf56b0547de792b6b6d48c4e895be034 /khexedit
parent6fdacb9c2e3adb3b5da38cd8a22afc1668e1d36b (diff)
downloadtdeutils-2877440fbda2e245d04f534ed51d7cb7c0a06482.tar.gz
tdeutils-2877440fbda2e245d04f534ed51d7cb7c0a06482.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'khexedit')
-rw-r--r--khexedit/hexviewwidget.cc2
-rw-r--r--khexedit/hexviewwidget.h2
-rw-r--r--khexedit/main.cc2
3 files changed, 3 insertions, 3 deletions
diff --git a/khexedit/hexviewwidget.cc b/khexedit/hexviewwidget.cc
index 18ea05b..22f939d 100644
--- a/khexedit/hexviewwidget.cc
+++ b/khexedit/hexviewwidget.cc
@@ -139,7 +139,7 @@ void CDragManager::timerEvent( TQTimerEvent *e )
if( mPending == true )
{
mPending = false;
- emit startDrag( ( kapp->keyboardModifiers() & KApplication::ShiftModifier ) );
+ emit startDrag( ( kapp->keyboardModifiers() & TDEApplication::ShiftModifier ) );
}
}
}
diff --git a/khexedit/hexviewwidget.h b/khexedit/hexviewwidget.h
index bccf654..85fd284 100644
--- a/khexedit/hexviewwidget.h
+++ b/khexedit/hexviewwidget.h
@@ -312,7 +312,7 @@ class CHexViewWidget : public TQFrame
inline bool CHexViewWidget::shiftButtonState( void )
{
- return kapp->keyboardModifiers() & KApplication::ShiftModifier;
+ return kapp->keyboardModifiers() & TDEApplication::ShiftModifier;
}
diff --git a/khexedit/main.cc b/khexedit/main.cc
index 8c8e8ab..89d8203 100644
--- a/khexedit/main.cc
+++ b/khexedit/main.cc
@@ -70,7 +70,7 @@ int main( int argc, char **argv )
TDECmdLineArgs::init( argc, argv, &aboutData );
TDECmdLineArgs::addCmdLineOptions( option );
- KApplication app;
+ TDEApplication app;
if( app.isRestored() != 0 )
{