[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/libkonq
From:       Dirk Mueller <mueller () kde ! org>
Date:       2007-02-09 16:55:16
Message-ID: 1171040116.159735.24729.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 631972 by mueller:

fix porting errors


 M  +2 -2      konq_iconviewwidget.cc  
 M  +1 -1      konq_popupmenu.cc  
 M  +11 -11    konq_propsview.cc  
 M  +7 -7      konq_settings.cc  


--- trunk/KDE/kdebase/libkonq/konq_iconviewwidget.cc #631971:631972
@@ -239,7 +239,7 @@
 void KonqIconViewWidget::readAnimatedIconsConfig()
 {
     KConfigGroup cfgGroup( KGlobal::config(), "DesktopIcons" );
-    d->doAnimations = cfgGroup.readEntry( "Animated", QVariant(true /*default*/ \
)).toBool(); +    d->doAnimations = cfgGroup.readEntry( "Animated", true \
/*default*/);  }
 
 void KonqIconViewWidget::slotOnItem( Q3IconViewItem *_item )
@@ -591,7 +591,7 @@
     if ( m_bDesktop ) return false;
 
     KConfigGroup group( KGlobal::config(), "PreviewSettings" );
-    return group.readEntry( "BoostSize", QVariant(false )).toBool();
+    return group.readEntry( "BoostSize", false);
 }
 
 void KonqIconViewWidget::disableSoundPreviews()
--- trunk/KDE/kdebase/libkonq/konq_popupmenu.cc #631971:631972
@@ -550,7 +550,7 @@
                 }
                 else {
                     KConfigGroup configGroup( KGlobal::config(), "KDE" );
-                    if ( configGroup.readEntry( "ShowDeleteCommand", QVariant(false \
)).toBool() ) +                    if ( configGroup.readEntry( "ShowDeleteCommand", \
false) )  addDel = true;
                 }
             }
--- trunk/KDE/kdebase/libkonq/konq_propsview.cc #631971:631972
@@ -86,7 +86,7 @@
 
   d = new Private;
   d->previewsToShow = 0;
-  d->caseInsensitiveSort=cgs.readEntry( "CaseInsensitiveSort", QVariant(true \
)).toBool(); +  d->caseInsensitiveSort=cgs.readEntry( "CaseInsensitiveSort", true);
 
   m_iIconSize = cgs.readEntry( "IconSize", 0 );
   m_iItemTextPos = cgs.readEntry( "ItemTextPos", int(Qt::DockBottom) );
@@ -94,7 +94,7 @@
   d->dirsfirst = cgs.readEntry( "SortDirsFirst", true );
   d->descending = cgs.readEntry( "SortDescending", false );
   m_bShowDot = cgs.readEntry( "ShowDotFiles", false );
-  m_bShowDirectoryOverlays = cgs.readEntry( "ShowDirectoryOverlays", QVariant(false \
)).toBool(); +  m_bShowDirectoryOverlays = cgs.readEntry( "ShowDirectoryOverlays", \
false);  
   m_dontPreview = cgs.readEntry( "DontPreview" , QStringList() );
   m_dontPreview.removeAll("audio/"); //Use the separate setting.
@@ -102,13 +102,13 @@
 
   //The setting for sound previews is stored separately, so we can force
   //the default-to-off bias to propagate up.
-  if (!cgs.readEntry("EnableSoundPreviews", QVariant(false)).toBool())
+  if (!cgs.readEntry("EnableSoundPreviews", false))
   {
     if (!m_dontPreview.contains("audio/"))
       m_dontPreview.append("audio/");
   }
 
-  d->previewsEnabled = cgs.readEntry( "PreviewsEnabled", QVariant(true )).toBool();
+  d->previewsEnabled = cgs.readEntry( "PreviewsEnabled", true);
 
   QColor tc = KonqFMSettings::settings()->normalTextColor();
   m_textColor = cgs.readEntry( "TextColor", tc );
@@ -218,11 +218,11 @@
     m_iIconSize = config->readEntry( "IconSize", m_iIconSize );
     m_iItemTextPos = config->readEntry( "ItemTextPos", m_iItemTextPos );
     d->sortcriterion = config->readEntry( "SortingCriterion" , d->sortcriterion );
-    d->dirsfirst = config->readEntry( "SortDirsFirst", QVariant(d->dirsfirst \
                )).toBool();
-    d->descending = config->readEntry( "SortDescending", QVariant(d->descending \
                )).toBool();
-    m_bShowDot = config->readEntry( "ShowDotFiles", QVariant(m_bShowDot )).toBool();
-    d->caseInsensitiveSort=config->readEntry("CaseInsensitiveSort", \
                QVariant(d->caseInsensitiveSort)).toBool();
-    m_bShowDirectoryOverlays = config->readEntry( "ShowDirectoryOverlays", \
QVariant(m_bShowDirectoryOverlays )).toBool(); +    d->dirsfirst = config->readEntry( \
"SortDirsFirst", d->dirsfirst); +    d->descending = config->readEntry( \
"SortDescending", d->descending); +    m_bShowDot = config->readEntry( \
"ShowDotFiles", m_bShowDot); +    \
d->caseInsensitiveSort=config->readEntry("CaseInsensitiveSort", \
d->caseInsensitiveSort); +    m_bShowDirectoryOverlays = config->readEntry( \
"ShowDirectoryOverlays", m_bShowDirectoryOverlays);  if (config->hasKey( \
"DontPreview" ))  {
         m_dontPreview = config->readEntry( "DontPreview" , QStringList() );
@@ -234,7 +234,7 @@
         if (config->hasKey("EnableSoundPreviews"))
         {
 
-            if (!config->readEntry("EnableSoundPreviews", QVariant(false)).toBool())
+            if (!config->readEntry("EnableSoundPreviews", false))
                 if (!m_dontPreview.contains("audio/"))
                     m_dontPreview.append("audio/");
         }
@@ -252,7 +252,7 @@
     m_bgColor = config->readEntry( "BgColor", m_bgColor );
     m_bgPixmapFile = config->readPathEntry( "BgImage", m_bgPixmapFile );
     //kDebug(1203) << "KonqPropsView::enterDir m_bgPixmapFile=" << m_bgPixmapFile << \
                endl;
-    d->previewsEnabled = config->readEntry( "PreviewsEnabled", \
QVariant(d->previewsEnabled )).toBool(); +    d->previewsEnabled = config->readEntry( \
"PreviewsEnabled", d->previewsEnabled);  delete config;
   }
   //if there is or was a .directory then the settings probably have changed
--- trunk/KDE/kdebase/libkonq/konq_settings.cc #631971:631972
@@ -95,27 +95,27 @@
 
   m_iconTextHeight = config->readEntry( "TextHeight", 0 );
   if ( m_iconTextHeight == 0 ) {
-    if ( config->readEntry( "WordWrapText", QVariant(true )).toBool() )
+    if ( config->readEntry( "WordWrapText", true ) )
       m_iconTextHeight = DEFAULT_TEXTHEIGHT;
     else
       m_iconTextHeight = 1;
   }
   m_bWordWrapText = ( m_iconTextHeight > 1 );
 
-  m_underlineLink = config->readEntry( "UnderlineLinks", \
                QVariant(DEFAULT_UNDERLINELINKS )).toBool();
-  d->m_renameIconDirectly = config->readEntry( "RenameIconDirectly", \
                QVariant(DEFAULT_RENAMEICONDIRECTLY )).toBool();
-  m_fileSizeInBytes = config->readEntry( "DisplayFileSizeInBytes", \
QVariant(DEFAULT_FILESIZEINBYTES )).toBool(); +  m_underlineLink = config->readEntry( \
"UnderlineLinks", bool(DEFAULT_UNDERLINELINKS )); +  d->m_renameIconDirectly = \
config->readEntry( "RenameIconDirectly", bool(DEFAULT_RENAMEICONDIRECTLY )); +  \
m_fileSizeInBytes = config->readEntry( "DisplayFileSizeInBytes", \
bool(DEFAULT_FILESIZEINBYTES ));  m_iconTransparency = config->readEntry( \
"TextpreviewIconOpacity", DEFAULT_TEXTPREVIEW_ICONTRANSPARENCY );  if ( \
m_iconTransparency < 0 || m_iconTransparency > 255 )  m_iconTransparency = \
DEFAULT_TEXTPREVIEW_ICONTRANSPARENCY;  
   // Behaviour
-  m_alwaysNewWin = config->readEntry( "AlwaysNewWin", QVariant(false )).toBool();
+  m_alwaysNewWin = config->readEntry( "AlwaysNewWin", false);
 
   m_homeURL = config->readPathEntry("HomeURL", "~");
 
-  m_showFileTips = config->readEntry("ShowFileTips", QVariant(true)).toBool();
-  d->showPreviewsInFileTips = config->readEntry("ShowPreviewsInFileTips", \
QVariant(true)).toBool(); +  m_showFileTips = config->readEntry("ShowFileTips", \
true); +  d->showPreviewsInFileTips = config->readEntry("ShowPreviewsInFileTips", \
true);  m_numFileTips = config->readEntry("FileTipsItems", 6);
 
   m_embedMap = config->entryMap( "EmbedSettings" );


[prev in list] [next in list] [prev in thread] [next in thread]