summaryrefslogtreecommitdiffstats
path: root/kcontrol/kfontinst
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:17:06 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:17:06 -0600
commite4e0479220e9e9616b68b2a11e42cff7a8af7b3d (patch)
tree8e01571cdd132dad34ebec38b12c2dbc37d05bd9 /kcontrol/kfontinst
parentd41050ea3f6904e5156d35f664346b816b9e4d12 (diff)
downloadtdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.tar.gz
tdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/kfontinst')
-rw-r--r--kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp2
-rw-r--r--kcontrol/kfontinst/viewpart/FontViewerApp.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp b/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp
index 1ba7822ec..df1bbe746 100644
--- a/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp
+++ b/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp
@@ -188,7 +188,7 @@ void CKFileFontView::slotActivate(TQListViewItem *item)
void CKFileFontView::selected(TQListViewItem *item)
{
- if (item && !(KApplication::keyboardMouseState() & (ShiftButton|ControlButton)) &&
+ if (item && !(TDEApplication::keyboardMouseState() & (ShiftButton|ControlButton)) &&
KGlobalSettings::singleClick())
{
const KFileItem *fi = ((CFontListViewItem*)item)->fileInfo();
diff --git a/kcontrol/kfontinst/viewpart/FontViewerApp.h b/kcontrol/kfontinst/viewpart/FontViewerApp.h
index 70543a8f3..0364e0bbd 100644
--- a/kcontrol/kfontinst/viewpart/FontViewerApp.h
+++ b/kcontrol/kfontinst/viewpart/FontViewerApp.h
@@ -55,7 +55,7 @@ class CFontViewerAppMainWindow : public KParts::MainWindow
};
-class CFontViewerApp : public KApplication
+class CFontViewerApp : public TDEApplication
{
public: