diff options
author | Timothy Pearson <[email protected]> | 2013-01-24 13:18:58 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-24 13:18:58 -0600 |
commit | 6d3902bd20c24613b2f13f5c04294ff83f104006 (patch) | |
tree | 6cf224cc11b6dfd4ebf884b1045ff7e95de7c8e7 /src/dolphiniconsviewsettings.cpp | |
parent | 87346b386fec7055f53b607d9cad63f48fbb8e28 (diff) | |
download | dolphin-6d3902bd20c24613b2f13f5c04294ff83f104006.tar.gz dolphin-6d3902bd20c24613b2f13f5c04294ff83f104006.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'src/dolphiniconsviewsettings.cpp')
-rw-r--r-- | src/dolphiniconsviewsettings.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dolphiniconsviewsettings.cpp b/src/dolphiniconsviewsettings.cpp index 1affc38..5fa4960 100644 --- a/src/dolphiniconsviewsettings.cpp +++ b/src/dolphiniconsviewsettings.cpp @@ -79,7 +79,7 @@ DolphinIconsViewSettings::DolphinIconsViewSettings(DolphinIconsView::LayoutMode m_fontSize = config->readNumEntry("Font Size", -1); m_fontFamily = config->readEntry("Font Family"); - const TQFont font(KGlobalSettings::generalFont()); + const TQFont font(TDEGlobalSettings::generalFont()); if (m_fontSize < 0) { m_fontSize = font.pointSize(); } |