diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:44:46 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:44:46 -0600 |
commit | cee429821aa6f1acc97fb482d325fb4eb37376ca (patch) | |
tree | 4f55e04b7f000c854fe2b8347dcdb62d97de3c73 /kanagram/src/kanagram.cpp | |
parent | ab801f72ab45e8066a8ec6c533ef13c2da67e559 (diff) | |
download | tdeedu-cee429821aa6f1acc97fb482d325fb4eb37376ca.tar.gz tdeedu-cee429821aa6f1acc97fb482d325fb4eb37376ca.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kanagram/src/kanagram.cpp')
-rw-r--r-- | kanagram/src/kanagram.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kanagram/src/kanagram.cpp b/kanagram/src/kanagram.cpp index bc3c8f21..4e762921 100644 --- a/kanagram/src/kanagram.cpp +++ b/kanagram/src/kanagram.cpp @@ -128,7 +128,7 @@ Kanagram::Kanagram() : TQWidget(0, 0, WStaticContents | WNoAutoErase), m_overNex m_inputBox->setFont(f); m_inputBox->show(); - m_font = KGlobalSettings::generalFont(); + m_font = TDEGlobalSettings::generalFont(); //Initialize the sound server #ifndef WITHOUT_ARTS @@ -155,7 +155,7 @@ void Kanagram::loadSettings() if(m_useStandardFonts) { - m_blackboardFont = KGlobalSettings::generalFont(); + m_blackboardFont = TDEGlobalSettings::generalFont(); m_arrow = new TQPixmap(locate("appdata", "images/basicarrow.png")); m_arrowOver = new TQPixmap(locate("appdata", "images/basicarrowover.png")); } |