diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-19 23:54:46 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-19 23:54:46 -0600 |
commit | fe52f645fd58a8c0309a37360507c1b13361a348 (patch) | |
tree | d89a335f7e9331a367e66b388e2e29cbf40be159 /src/kreplacements/kreplacements.h | |
parent | c8fc7b9d459cfe043934f86dd3e0af7bf8ecccf7 (diff) | |
download | kdiff3-fe52f645fd58a8c0309a37360507c1b13361a348.tar.gz kdiff3-fe52f645fd58a8c0309a37360507c1b13361a348.zip |
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'src/kreplacements/kreplacements.h')
-rw-r--r-- | src/kreplacements/kreplacements.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/kreplacements/kreplacements.h b/src/kreplacements/kreplacements.h index e56f9bd..42993e1 100644 --- a/src/kreplacements/kreplacements.h +++ b/src/kreplacements/kreplacements.h @@ -375,19 +375,19 @@ public: TQPixmap loadIcon(const TQString& name, int); }; -class KApplication : public TQApplication +class TDEApplication : public TQApplication { KConfig m_config; KIconLoader m_iconLoader; public: - KApplication(); - static KApplication* kApplication(); + TDEApplication(); + static TDEApplication* kApplication(); KIconLoader* iconLoader(); KConfig* config(); bool isRestored(); }; -extern KApplication* kapp; +extern TDEApplication* kapp; class KLibFactory : public TQObject { @@ -473,7 +473,7 @@ namespace KParts { public: KActionCollection* actionCollection(); - KApplication* instance(); + TDEApplication* instance(); void setWidget( TQWidget* w ){ m_pWidget=w; } TQWidget* widget(){return m_pWidget;} void setXMLFile(const TQString&){} |