]> cloud.milkyroute.net Git - dolphin.git/commitdiff
Remove kdelibs4support
authorMontel Laurent <montel@kde.org>
Sat, 18 Oct 2014 12:40:47 +0000 (14:40 +0200)
committerMontel Laurent <montel@kde.org>
Sat, 18 Oct 2014 12:40:47 +0000 (14:40 +0200)
src/settings/dolphin_compactmodesettings.kcfg
src/settings/dolphin_detailsmodesettings.kcfg
src/settings/dolphin_iconsmodesettings.kcfg

index b9000c8e21f513b21e79ec831eaf79349411834d..93f9947abad7e014cae95fd0ace03b6ec3dcd1c9 100644 (file)
@@ -4,7 +4,7 @@
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
       http://www.kde.org/standards/kcfg/1.0/kcfg.xsd">
-    <include>kglobalsettings.h</include>
+    <include>QFontDatabase</include>
     <include>kiconloader.h</include>
     <kcfgfile name="dolphinrc"/>
     <group name="CompactMode">
         </entry>
         <entry name="FontFamily" type="String">
             <label>Font family</label>
-            <default code="true">KGlobalSettings::generalFont().family()</default>
+            <default code="true">QFontDatabase::systemFont(QFontDatabase::GeneralFont).family()</default>
         </entry>
         <entry name="FontSize" type="Double">
             <label>Font size</label>
-            <default code="true">KGlobalSettings::generalFont().pointSizeF()</default>
+            <default code="true">QFontDatabase::systemFont(QFontDatabase::GeneralFont).pointSizeF()</default>
         </entry>
         <entry name="ItalicFont" type="Bool">
             <label>Italic</label>
index 64e99898acaf53f0b3d6de70ab628f078da1e219..e9a8fb28d26de61a0a3ba4e87a76491a902f3e50 100644 (file)
@@ -5,12 +5,12 @@
       xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
       http://www.kde.org/standards/kcfg/1.0/kcfg.xsd">
     <include>kiconloader.h</include>
-    <include>kglobalsettings.h</include>
+    <include>QFontDatabase</include>
     <kcfgfile name="dolphinrc"/>
     <group name="DetailsMode">
         <entry name="FontFamily" type="String">
             <label>Font family</label>
-            <default code="true">KGlobalSettings::generalFont().family()</default>
+            <default code="true">QFontDatabase::systemFont(QFontDatabase::GeneralFont).family()</default>
         </entry>
         <entry name="UseSystemFont" type="Bool">
             <label>Use system font</label>
@@ -18,7 +18,7 @@
         </entry>
         <entry name="FontSize" type="Double">
             <label>Font size</label>
-            <default code="true">KGlobalSettings::generalFont().pointSizeF()</default>
+            <default code="true">QFontDatabase::systemFont(QFontDatabase::GeneralFont).pointSizeF()</default>
         </entry>
         <entry name="ItalicFont" type="Bool">
             <label>Italic</label>
index 52cd9a28c38e4f52dce2ee795f09c3dc60755931..9b286d1391a8e3a7894e2756f014db483b6ee9f1 100644 (file)
@@ -4,7 +4,7 @@
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
       http://www.kde.org/standards/kcfg/1.0/kcfg.xsd">
-    <include>kglobalsettings.h</include>
+    <include>QFontDatabase</include>
     <include>kiconloader.h</include>
     <kcfgfile name="dolphinrc"/>
     <group name="IconsMode">
         </entry>
         <entry name="FontFamily" type="String">
             <label>Font family</label>
-            <default code="true">KGlobalSettings::generalFont().family()</default>
+            <default code="true">QFontDatabase::systemFont(QFontDatabase::GeneralFont).family()</default>
         </entry>
         <entry name="FontSize" type="Double">
             <label>Font size</label>
-            <default code="true">KGlobalSettings::generalFont().pointSizeF()</default>
+            <default code="true">QFontDatabase::systemFont(QFontDatabase::GeneralFont).pointSizeF()</default>
         </entry>
         <entry name="ItalicFont" type="Bool">
             <label>Italic</label>