kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-09-20 08:51:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix porting errors

Browse source 
svn path=/trunk/KDE/kdebase/libkonq/; revision=631972
This commit is contained in:
Dirk Mueller 2007-02-09 16:55:14 +00:00
parent 9f4469953b
commit 32111733cb
4 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/konq/konq_iconviewwidget.cc
View file

@ -239,7 +239,7 @@ void KonqIconViewWidget::slotIconChanged( int group )
void KonqIconViewWidget::readAnimatedIconsConfig() void KonqIconViewWidget::readAnimatedIconsConfig()
{ {
KConfigGroup cfgGroup( KGlobal::config(), "DesktopIcons" ); 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 ) void KonqIconViewWidget::slotOnItem( Q3IconViewItem *_item )
@ -591,7 +591,7 @@ bool KonqIconViewWidget::boostPreview() const
if ( m_bDesktop ) return false; if ( m_bDesktop ) return false;
KConfigGroup group( KGlobal::config(), "PreviewSettings" ); KConfigGroup group( KGlobal::config(), "PreviewSettings" );
return group.readEntry( "BoostSize", QVariant(false )).toBool(); return group.readEntry( "BoostSize", false);
} }
void KonqIconViewWidget::disableSoundPreviews() void KonqIconViewWidget::disableSoundPreviews()

2
lib/konq/konq_popupmenu.cc
View file

@ -550,7 +550,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
} }
else { else {
KConfigGroup configGroup( KGlobal::config(), "KDE" ); KConfigGroup configGroup( KGlobal::config(), "KDE" );
if ( configGroup.readEntry( "ShowDeleteCommand", QVariant(false )).toBool() ) if ( configGroup.readEntry( "ShowDeleteCommand", false) )
addDel = true; addDel = true;
} }
} }

22
lib/konq/konq_propsview.cc
View file

@ -86,7 +86,7 @@ KonqPropsView::KonqPropsView(const KComponentData &componentData, KonqPropsView
d = new Private; d = new Private;
d->previewsToShow = 0; d->previewsToShow = 0;
d->caseInsensitiveSort=cgs.readEntry( "CaseInsensitiveSort", QVariant(true )).toBool(); d->caseInsensitiveSort=cgs.readEntry( "CaseInsensitiveSort", true);
m_iIconSize = cgs.readEntry( "IconSize", 0 ); m_iIconSize = cgs.readEntry( "IconSize", 0 );
m_iItemTextPos = cgs.readEntry( "ItemTextPos", int(Qt::DockBottom) ); m_iItemTextPos = cgs.readEntry( "ItemTextPos", int(Qt::DockBottom) );
@ -94,7 +94,7 @@ KonqPropsView::KonqPropsView(const KComponentData &componentData, KonqPropsView
d->dirsfirst = cgs.readEntry( "SortDirsFirst", true ); d->dirsfirst = cgs.readEntry( "SortDirsFirst", true );
d->descending = cgs.readEntry( "SortDescending", false ); d->descending = cgs.readEntry( "SortDescending", false );
m_bShowDot = cgs.readEntry( "ShowDotFiles", 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 = cgs.readEntry( "DontPreview" , QStringList() );
m_dontPreview.removeAll("audio/"); //Use the separate setting. m_dontPreview.removeAll("audio/"); //Use the separate setting.
@ -102,13 +102,13 @@ KonqPropsView::KonqPropsView(const KComponentData &componentData, KonqPropsView
//The setting for sound previews is stored separately, so we can force //The setting for sound previews is stored separately, so we can force
//the default-to-off bias to propagate up. //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/")) if (!m_dontPreview.contains("audio/"))
m_dontPreview.append("audio/"); m_dontPreview.append("audio/");
} }
d->previewsEnabled = cgs.readEntry( "PreviewsEnabled", QVariant(true )).toBool(); d->previewsEnabled = cgs.readEntry( "PreviewsEnabled", true);
QColor tc = KonqFMSettings::settings()->normalTextColor(); QColor tc = KonqFMSettings::settings()->normalTextColor();
m_textColor = cgs.readEntry( "TextColor", tc ); m_textColor = cgs.readEntry( "TextColor", tc );
@ -218,11 +218,11 @@ bool KonqPropsView::enterDir( const KUrl & dir )
m_iIconSize = config->readEntry( "IconSize", m_iIconSize ); m_iIconSize = config->readEntry( "IconSize", m_iIconSize );
m_iItemTextPos = config->readEntry( "ItemTextPos", m_iItemTextPos ); m_iItemTextPos = config->readEntry( "ItemTextPos", m_iItemTextPos );
d->sortcriterion = config->readEntry( "SortingCriterion" , d->sortcriterion ); d->sortcriterion = config->readEntry( "SortingCriterion" , d->sortcriterion );
d->dirsfirst = config->readEntry( "SortDirsFirst", QVariant(d->dirsfirst )).toBool(); d->dirsfirst = config->readEntry( "SortDirsFirst", d->dirsfirst);
d->descending = config->readEntry( "SortDescending", QVariant(d->descending )).toBool(); d->descending = config->readEntry( "SortDescending", d->descending);
m_bShowDot = config->readEntry( "ShowDotFiles", QVariant(m_bShowDot )).toBool(); m_bShowDot = config->readEntry( "ShowDotFiles", m_bShowDot);
d->caseInsensitiveSort=config->readEntry("CaseInsensitiveSort", QVariant(d->caseInsensitiveSort)).toBool(); d->caseInsensitiveSort=config->readEntry("CaseInsensitiveSort", d->caseInsensitiveSort);
m_bShowDirectoryOverlays = config->readEntry( "ShowDirectoryOverlays", QVariant(m_bShowDirectoryOverlays )).toBool(); m_bShowDirectoryOverlays = config->readEntry( "ShowDirectoryOverlays", m_bShowDirectoryOverlays);
if (config->hasKey( "DontPreview" )) if (config->hasKey( "DontPreview" ))
{ {
m_dontPreview = config->readEntry( "DontPreview" , QStringList() ); m_dontPreview = config->readEntry( "DontPreview" , QStringList() );
@ -234,7 +234,7 @@ bool KonqPropsView::enterDir( const KUrl & dir )
if (config->hasKey("EnableSoundPreviews")) if (config->hasKey("EnableSoundPreviews"))
{ {
if (!config->readEntry("EnableSoundPreviews", QVariant(false)).toBool()) if (!config->readEntry("EnableSoundPreviews", false))
if (!m_dontPreview.contains("audio/")) if (!m_dontPreview.contains("audio/"))
m_dontPreview.append("audio/"); m_dontPreview.append("audio/");
} }
@ -252,7 +252,7 @@ bool KonqPropsView::enterDir( const KUrl & dir )
m_bgColor = config->readEntry( "BgColor", m_bgColor ); m_bgColor = config->readEntry( "BgColor", m_bgColor );
m_bgPixmapFile = config->readPathEntry( "BgImage", m_bgPixmapFile ); m_bgPixmapFile = config->readPathEntry( "BgImage", m_bgPixmapFile );
//kDebug(1203) << "KonqPropsView::enterDir m_bgPixmapFile=" << m_bgPixmapFile << endl; //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; delete config;
} }
//if there is or was a .directory then the settings probably have changed //if there is or was a .directory then the settings probably have changed

14
lib/konq/konq_settings.cc
View file

@ -95,27 +95,27 @@ void KonqFMSettings::init(const KSharedConfigPtr &config)
m_iconTextHeight = config->readEntry( "TextHeight", 0 ); m_iconTextHeight = config->readEntry( "TextHeight", 0 );
if ( m_iconTextHeight == 0 ) { if ( m_iconTextHeight == 0 ) {
if ( config->readEntry( "WordWrapText", QVariant(true )).toBool() ) if ( config->readEntry( "WordWrapText", true ) )
m_iconTextHeight = DEFAULT_TEXTHEIGHT; m_iconTextHeight = DEFAULT_TEXTHEIGHT;
else else
m_iconTextHeight = 1; m_iconTextHeight = 1;
} }
m_bWordWrapText = ( m_iconTextHeight > 1 ); m_bWordWrapText = ( m_iconTextHeight > 1 );
m_underlineLink = config->readEntry( "UnderlineLinks", QVariant(DEFAULT_UNDERLINELINKS )).toBool(); m_underlineLink = config->readEntry( "UnderlineLinks", bool(DEFAULT_UNDERLINELINKS ));
d->m_renameIconDirectly = config->readEntry( "RenameIconDirectly", QVariant(DEFAULT_RENAMEICONDIRECTLY )).toBool(); d->m_renameIconDirectly = config->readEntry( "RenameIconDirectly", bool(DEFAULT_RENAMEICONDIRECTLY ));
m_fileSizeInBytes = config->readEntry( "DisplayFileSizeInBytes", QVariant(DEFAULT_FILESIZEINBYTES )).toBool(); m_fileSizeInBytes = config->readEntry( "DisplayFileSizeInBytes", bool(DEFAULT_FILESIZEINBYTES ));
m_iconTransparency = config->readEntry( "TextpreviewIconOpacity", DEFAULT_TEXTPREVIEW_ICONTRANSPARENCY ); m_iconTransparency = config->readEntry( "TextpreviewIconOpacity", DEFAULT_TEXTPREVIEW_ICONTRANSPARENCY );
if ( m_iconTransparency < 0 || m_iconTransparency > 255 ) if ( m_iconTransparency < 0 || m_iconTransparency > 255 )
m_iconTransparency = DEFAULT_TEXTPREVIEW_ICONTRANSPARENCY; m_iconTransparency = DEFAULT_TEXTPREVIEW_ICONTRANSPARENCY;
// Behaviour // Behaviour
m_alwaysNewWin = config->readEntry( "AlwaysNewWin", QVariant(false )).toBool(); m_alwaysNewWin = config->readEntry( "AlwaysNewWin", false);
m_homeURL = config->readPathEntry("HomeURL", "~"); m_homeURL = config->readPathEntry("HomeURL", "~");
m_showFileTips = config->readEntry("ShowFileTips", QVariant(true)).toBool(); m_showFileTips = config->readEntry("ShowFileTips", true);
d->showPreviewsInFileTips = config->readEntry("ShowPreviewsInFileTips", QVariant(true)).toBool(); d->showPreviewsInFileTips = config->readEntry("ShowPreviewsInFileTips", true);
m_numFileTips = config->readEntry("FileTipsItems", 6); m_numFileTips = config->readEntry("FileTipsItems", 6);
m_embedMap = config->entryMap( "EmbedSettings" ); m_embedMap = config->entryMap( "EmbedSettings" );