diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:22 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:22 -0600 |
| commit | 28edc0aa2ab09297288186f5bc15765eb7be58c0 (patch) | |
| tree | 7b7a01768b3781763186c825af21bb14717d2c32 /tdecore/kconfigskeleton.h | |
| parent | 07c48c43ff72c237e4028154f4594102b798073f (diff) | |
| download | tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.tar.gz tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'tdecore/kconfigskeleton.h')
| -rw-r--r-- | tdecore/kconfigskeleton.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tdecore/kconfigskeleton.h b/tdecore/kconfigskeleton.h index dde0779cf..3ad18d958 100644 --- a/tdecore/kconfigskeleton.h +++ b/tdecore/kconfigskeleton.h @@ -670,7 +670,7 @@ public: { public: ItemFont(const TQString & group, const TQString & key, TQFont & reference, - const TQFont & defaultValue = KGlobalSettings::generalFont()); + const TQFont & defaultValue = TDEGlobalSettings::generalFont()); void readConfig(KConfig * config); void setProperty(const TQVariant & p); @@ -1059,7 +1059,7 @@ public: */ ItemFont *addItemFont(const TQString & name, TQFont & reference, const TQFont & defaultValue = - KGlobalSettings::generalFont(), + TDEGlobalSettings::generalFont(), const TQString & key = TQString::null); /** |