summaryrefslogtreecommitdiffstats
path: root/kbfxlib
diff options
context:
space:
mode:
Diffstat (limited to 'kbfxlib')
-rw-r--r--kbfxlib/common/kbfxconfig.cpp48
-rw-r--r--kbfxlib/common/kbfxconfig.h4
-rw-r--r--kbfxlib/common/kbfxfontchooser.cpp4
-rw-r--r--kbfxlib/common/kbfxkiodownload.cpp2
-rw-r--r--kbfxlib/common/kbfxpixmaplabel.cpp6
-rw-r--r--kbfxlib/common/kbfxplasmapixmapprovider.cpp4
-rw-r--r--kbfxlib/common/kbfxpushbutton.cpp2
-rw-r--r--kbfxlib/common/kbfxthemesdata.cpp4
-rw-r--r--kbfxlib/data/kbfxdatagroup.cpp2
-rw-r--r--kbfxlib/data/kbfxplasmapluginloader.cpp2
10 files changed, 39 insertions, 39 deletions
diff --git a/kbfxlib/common/kbfxconfig.cpp b/kbfxlib/common/kbfxconfig.cpp
index e321232..75ed103 100644
--- a/kbfxlib/common/kbfxconfig.cpp
+++ b/kbfxlib/common/kbfxconfig.cpp
@@ -26,9 +26,9 @@ KbfxConfig::KbfxConfig()
/* set default configuration values */
/* KBFX internal settings */
- KbfxThemeRcDestination = TDEGlobal::dirs()->saveLocation ( "data", TQString ( "kbfx/themerc/" ), TRUE );
+ KbfxThemeRcDestination = TDEGlobal::dirs()->saveLocation ( "data", TQString ( "kbfx/themerc/" ), true );
KbfxRcPath = TDEGlobal::dirs()->findResource ( "config", "kbfxrc" );
- m_KbfxDeleteOldConf = FALSE;
+ m_KbfxDeleteOldConf = false;
TQString _unspecified = tr2i18n ( "Not Specified" );
TQString path = locate ( "data", "kbfx/skins/default/bg.png" );
path.remove ( "default/bg.png" );
@@ -47,19 +47,19 @@ KbfxConfig::KbfxConfig()
m_UserSpinxThemeBasePathDefault = path;
m_KbfxMenuTypeDefault = "spinx";
- m_ToolBarResizeDefault = FALSE;
- m_KbfxWatcherDefault = TRUE;
- m_KbfxShowOldThemesDefault = FALSE;
+ m_ToolBarResizeDefault = false;
+ m_KbfxWatcherDefault = true;
+ m_KbfxShowOldThemesDefault = false;
/* user(dude) image properties */
- m_SpinxDudeBlinkDefault = FALSE;
+ m_SpinxDudeBlinkDefault = false;
KUser *user = new KUser();
m_SpinxDudeImageDefault = locate ( "data", user->homeDir () + "/.face.icon" );
delete user;
/* tooltip properties */
- m_ToolTipDefault = FALSE;
- m_ToolTipAnimationDefault = TRUE;
+ m_ToolTipDefault = false;
+ m_ToolTipAnimationDefault = true;
m_ToolTipTextDefault = "Application menu";
m_ToolTipAvatarDefault = path + "default/butterfly.png";
m_SpinxTooltipDudeboxDefault = path + "default/tooltip_dudebox.png";
@@ -87,7 +87,7 @@ KbfxConfig::KbfxConfig()
m_faceIconWDefault = 65;
m_userNamePos_xDefault = 130;
m_userNamePos_yDefault = 32;
- m_faceBoxHideTextDefault = FALSE;
+ m_faceBoxHideTextDefault = false;
/* top bar properties */
m_topBar_xDefault = 0;
@@ -118,7 +118,7 @@ KbfxConfig::KbfxConfig()
m_searchBox_wDefault = 240;
m_searchBox_xDefault = 130;
m_searchBox_yDefault = 48;
- m_searchBox_staticDefault = TRUE;
+ m_searchBox_staticDefault = true;
/* item view properties */
m_itemView_hDefault = 380;
@@ -133,9 +133,9 @@ KbfxConfig::KbfxConfig()
/* KBFX misc properties */
m_userMenuHeightDefault = 513;
m_userMenuWidthDefault = 504;
- m_startHiddenDefault = FALSE;
+ m_startHiddenDefault = false;
m_fadeTimeDefault = 75;
- m_noCommentsDefault = FALSE;
+ m_noCommentsDefault = false;
m_commentMargineDefault = 66;
m_iconSizeDefault = 32;
@@ -155,7 +155,7 @@ KbfxConfig::KbfxConfig()
m_pluginNameColorDefault = TQColor ( 0,0,0 );
m_pluginNameFontDefault = TQFont ( "Arial", 8, TQFont::Normal );
m_lineColorDefault = TQColor ( 255,220,125 );
- m_fontHoverBoldDefault = FALSE;
+ m_fontHoverBoldDefault = false;
/* set default theme info values */
m_InfoVersionDefault = _unspecified;
@@ -300,7 +300,7 @@ void KbfxConfig::readThemeInfo ( TQString &themePath, TQString &themeName )
TQFileInfo * info_theme = new TQFileInfo ( themePath + themeName + "/" + m_KbfxThemesVersion );
TDEConfig * infoconfig = 0;
- if ( info_theme->exists() == TRUE )
+ if ( info_theme->exists() )
{
infoconfig = new TDEConfig ( info_theme->absFilePath() );
infoconfig->setGroup ( "ThemeGeneral" );
@@ -329,7 +329,7 @@ void KbfxConfig::read()
TDEConfig *conf = confskel->config();
- TQString __default = TDEGlobal::iconLoader()->iconPath ( "kbfx", ( int ) TDEIcon::Desktop, FALSE );
+ TQString __default = TDEGlobal::iconLoader()->iconPath ( "kbfx", ( int ) TDEIcon::Desktop, false );
conf->setGroup ( "KbfxGeneral" );
m_KbfxGeneralVersion = conf->readNumEntry ( "Version", 0 );
@@ -396,7 +396,7 @@ void KbfxConfig::read()
if ( m_KbfxGeneralVersion < m_KbfxGeneralVersionDefault )
{
m_KbfxGeneralVersion = m_KbfxGeneralVersionDefault;
- m_KbfxDeleteOldConf = TRUE;
+ m_KbfxDeleteOldConf = true;
}
}
@@ -417,13 +417,13 @@ void KbfxConfig::readFontrc ( TQString & themePath, TQString & themeName, bool u
TDEConfig * fontconfig = 0;
/* if theme kbfxfontrc exists, make its configuration as default values - prefer users' configuration */
- if ( info_theme->exists() == TRUE || info->exists() == TRUE )
+ if ( info_theme->exists() || info->exists() )
{
- if ( info_theme->exists() == TRUE && m_KbfxGeneralVersion >= m_KbfxGeneralVersionDefault && user_rc )
+ if ( info_theme->exists() && m_KbfxGeneralVersion >= m_KbfxGeneralVersionDefault && user_rc )
{
_abs_path = info_theme->absFilePath();
}
- else if ( info->exists() == TRUE || m_KbfxGeneralVersion < m_KbfxGeneralVersionDefault )
+ else if ( info->exists() || m_KbfxGeneralVersion < m_KbfxGeneralVersionDefault )
{
_abs_path = info->absFilePath();
}
@@ -501,7 +501,7 @@ void KbfxConfig::readThemerc ( TQString &themePath, TQString &themeName, bool us
/* use theme's default dude image if any */
TDEConfigSkeleton *confskel = new TDEConfigSkeleton ( TQString::fromLatin1 ( "kbfxrc" ) );
TDEConfig *conf = confskel->config();
- TQString __default = TDEGlobal::iconLoader()->iconPath ( "kbfx", ( int ) TDEIcon::Desktop, FALSE );
+ TQString __default = TDEGlobal::iconLoader()->iconPath ( "kbfx", ( int ) TDEIcon::Desktop, false );
if ( m_SpinxDudeImageDefault == TQString() || !TDEStandardDirs::exists ( m_SpinxDudeImageDefault ) )
{
@@ -532,13 +532,13 @@ void KbfxConfig::readThemerc ( TQString &themePath, TQString &themeName, bool us
TDEConfig *layoutconfig = 0;
/* if theme kbfxlayoutrc exists, make its configuration as default values - prefer users' configuration */
- if ( info_theme->exists() == TRUE || info->exists() == TRUE )
+ if ( info_theme->exists() || info->exists() )
{
- if ( info_theme->exists() == TRUE && m_KbfxGeneralVersion >= m_KbfxGeneralVersionDefault && user_rc )
+ if ( info_theme->exists() && m_KbfxGeneralVersion >= m_KbfxGeneralVersionDefault && user_rc )
{
_abs_path = info_theme->absFilePath();
}
- else if ( info->exists() == TRUE || m_KbfxGeneralVersion < m_KbfxGeneralVersionDefault )
+ else if ( info->exists() || m_KbfxGeneralVersion < m_KbfxGeneralVersionDefault )
{
_abs_path = info->absFilePath();
}
@@ -708,7 +708,7 @@ void KbfxConfig::write()
TDEConfig *conf = confskel->config();
conf->setGroup ( "KDE Action Restrictions" );
- conf->writeEntry ( "warn_unwritable_config", FALSE );
+ conf->writeEntry ( "warn_unwritable_config", false );
conf->setGroup ( "KbfxGeneral" );
conf->writeEntry ( "Version", m_KbfxGeneralVersion );
diff --git a/kbfxlib/common/kbfxconfig.h b/kbfxlib/common/kbfxconfig.h
index 13b8456..77f09ee 100644
--- a/kbfxlib/common/kbfxconfig.h
+++ b/kbfxlib/common/kbfxconfig.h
@@ -47,8 +47,8 @@ class KbfxConfig
{
public:
void read();
- void readFontrc ( TQString &themePath, TQString &themeName, bool user_rc=TRUE );
- void readThemerc ( TQString &themePath, TQString &themeName, bool user_rc=TRUE );
+ void readFontrc ( TQString &themePath, TQString &themeName, bool user_rc=true );
+ void readThemerc ( TQString &themePath, TQString &themeName, bool user_rc=true );
void readThemeInfo ( TQString &themePath, TQString &themeName );
void setDefault();
void setThemeDefault();
diff --git a/kbfxlib/common/kbfxfontchooser.cpp b/kbfxlib/common/kbfxfontchooser.cpp
index a95d120..a1cbc8c 100644
--- a/kbfxlib/common/kbfxfontchooser.cpp
+++ b/kbfxlib/common/kbfxfontchooser.cpp
@@ -26,7 +26,7 @@ KBFXFontChooser::KBFXFontChooser ( TQWidget *parent, const char *name )
TQHBoxLayout* layout = new TQHBoxLayout ( this, 0, KDialog::spacingHint() );
m_label = new TQLabel ( this, "fontLabel" );
- m_label->setSizePolicy ( TQSizePolicy::Expanding, TQSizePolicy::Fixed, TRUE);
+ m_label->setSizePolicy ( TQSizePolicy::Expanding, TQSizePolicy::Fixed, true);
// m_label->setFrameShape ( TQFrame::StyledPanel );
// m_label->setFrameShadow ( TQFrame::Sunken );
@@ -36,7 +36,7 @@ KBFXFontChooser::KBFXFontChooser ( TQWidget *parent, const char *name )
m_label->setMaximumHeight ( m_button -> height() );
m_label->setMinimumHeight ( m_button -> height() );
TQString fontText = i18n ( "Font..." );
-// m_button->setSizePolicy ( TQSizePolicy::Minimum, TQSizePolicy::Minimum, TRUE);
+// m_button->setSizePolicy ( TQSizePolicy::Minimum, TQSizePolicy::Minimum, true);
m_button->setText ( fontText );
TQIconSet iconSet = SmallIconSet ( TQString::fromLatin1 ( "fonts" ) );
TQPixmap pixmap = iconSet.pixmap ( TQIconSet::Small, TQIconSet::Normal );
diff --git a/kbfxlib/common/kbfxkiodownload.cpp b/kbfxlib/common/kbfxkiodownload.cpp
index 7101a7f..2c81bae 100644
--- a/kbfxlib/common/kbfxkiodownload.cpp
+++ b/kbfxlib/common/kbfxkiodownload.cpp
@@ -41,7 +41,7 @@ void KbfxKioDownload::KbfxKioDownloadStart ( TQString &url )
TDEIO::Job *download_job = TDEIO::file_copy ( KURL ( url ),
KURL ( m_KbfxBrowserTmpFile ),
-1,
- TRUE );
+ true );
connect ( download_job, TQ_SIGNAL ( result ( TDEIO::Job* ) ),
this, TQ_SLOT ( KbfxBrowserResult ( TDEIO::Job * ) ) );
}
diff --git a/kbfxlib/common/kbfxpixmaplabel.cpp b/kbfxlib/common/kbfxpixmaplabel.cpp
index a9f3dc4..c3affd6 100644
--- a/kbfxlib/common/kbfxpixmaplabel.cpp
+++ b/kbfxlib/common/kbfxpixmaplabel.cpp
@@ -28,9 +28,9 @@ KbfxPixmapLabel::KbfxPixmapLabel ( TQWidget *parent, const char *name, WFlags fl
// setFrameShadow(TQLabel::Sunken);
setFrameShape ( TQLabel::LineEditPanel );
setFrameShadow ( TQLabel::Plain );
- setScaledContents ( FALSE );
+ setScaledContents ( false );
setAlignment ( int ( TQLabel::WordBreak | TQLabel::AlignCenter ) );
- setMouseTracking ( TRUE );
+ setMouseTracking ( true );
}
KbfxPixmapLabel::~KbfxPixmapLabel()
@@ -42,7 +42,7 @@ void KbfxPixmapLabel::normalize ()
{
setFrameShape ( TQLabel::NoFrame );
setFrameShadow ( TQLabel::Plain );
- setScaledContents ( FALSE );
+ setScaledContents ( false );
setAlignment ( int ( TQLabel::WordBreak | TQLabel::AlignCenter ) );
}
diff --git a/kbfxlib/common/kbfxplasmapixmapprovider.cpp b/kbfxlib/common/kbfxplasmapixmapprovider.cpp
index 106f63b..0ca0dfd 100644
--- a/kbfxlib/common/kbfxplasmapixmapprovider.cpp
+++ b/kbfxlib/common/kbfxplasmapixmapprovider.cpp
@@ -62,9 +62,9 @@ bool
KbfxPlasmaPixmapProvider::PixmapPathCheck ( TQString pixmapPath )
{
if ( TQPixmap ( pixmapPath ).isNull() )
- return FALSE;
+ return false;
- return TRUE;
+ return true;
}
void
diff --git a/kbfxlib/common/kbfxpushbutton.cpp b/kbfxlib/common/kbfxpushbutton.cpp
index 35acf17..78522f0 100644
--- a/kbfxlib/common/kbfxpushbutton.cpp
+++ b/kbfxlib/common/kbfxpushbutton.cpp
@@ -25,7 +25,7 @@ KbfxPushButton::KbfxPushButton ( TQWidget *parent, const char *name )
: KPushButton ( parent, name )
{
setText ( "P R E V I E W" );
- setToggleButton ( TRUE );
+ setToggleButton ( true );
setFocusPolicy ( TQWidget::NoFocus );
}
diff --git a/kbfxlib/common/kbfxthemesdata.cpp b/kbfxlib/common/kbfxthemesdata.cpp
index 5247e9d..174d8f9 100644
--- a/kbfxlib/common/kbfxthemesdata.cpp
+++ b/kbfxlib/common/kbfxthemesdata.cpp
@@ -65,12 +65,12 @@ ThemesMap KbfxThemesData::setThemeList ( TQString path )
f = new TQFileInfo ( d, fi->fileName() + "/" + m_KbfxThemesVersion );
if ( m_KbfxShowOldThemes )
{
- m_themesMap[fi->fileName() ] = ( fi->dirPath ( TRUE ) ).append ( "/" );
+ m_themesMap[fi->fileName() ] = ( fi->dirPath ( true ) ).append ( "/" );
}
else
{
if ( f->exists () )
- m_themesMap[fi->fileName() ] = ( fi->dirPath ( TRUE ) ).append ( "/" );
+ m_themesMap[fi->fileName() ] = ( fi->dirPath ( true ) ).append ( "/" );
}
}
++it;
diff --git a/kbfxlib/data/kbfxdatagroup.cpp b/kbfxlib/data/kbfxdatagroup.cpp
index 93a9c1c..a321f8e 100644
--- a/kbfxlib/data/kbfxdatagroup.cpp
+++ b/kbfxlib/data/kbfxdatagroup.cpp
@@ -47,7 +47,7 @@ KbfxDataGroup::lookup ( TQString str )
Data::Iterator it;
for ( it = m_data.begin();it!=m_data.end();++it )
{
- if ( ( *it )->lookup ( str ) == true )
+ if ( ( *it )->lookup ( str ) )
{
_matching.prepend ( * ( *it ) );
}
diff --git a/kbfxlib/data/kbfxplasmapluginloader.cpp b/kbfxlib/data/kbfxplasmapluginloader.cpp
index 712813e..efc25ed 100644
--- a/kbfxlib/data/kbfxplasmapluginloader.cpp
+++ b/kbfxlib/data/kbfxplasmapluginloader.cpp
@@ -152,7 +152,7 @@ KbfxPlasmaPluginLoader::scanPlugins()
for ( it = pluginMap().begin(); it != pluginMap().end();++it )
{
- if ( it.data()->status() == false )
+ if ( !it.data()->status() )
plugins.append ( it.data()->name() );
}
return plugins;