TDE
/
kbfx
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kbfx
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

Browse Source
pull/1/head
Timothy Pearson 12 years ago
parent 69f1eaa31f
commit daaefa8824
7 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File

2
configdialog/kbfxconfigdlgfonts-old.ui.h
Unescape View File

@ -138,7 +138,7 @@ void KbfxConfigDlgFonts::KbfxExportFileAction()
<< KbfxExportFontRcDialogURL << KbfxExportFontRcDialogURL
<< endl; << endl;
KConfig *fontconfig = new KConfig ( KbfxExportFontRcDialogURL ); TDEConfig *fontconfig = new TDEConfig ( KbfxExportFontRcDialogURL );
fontconfig->setGroup ( "Fonts" ); fontconfig->setGroup ( "Fonts" );
fontconfig->writeEntry ( "TooltipText", ConfigInit().m_fontTooltipColor ); fontconfig->writeEntry ( "TooltipText", ConfigInit().m_fontTooltipColor );

2
configdialog/kbfxconfigdlglayout.ui.h
Unescape View File

@ -466,7 +466,7 @@ void KbfxConfigDlgLayout::KbfxExportFileAction()
<< endl; << endl;
/* write layout theme configuration file */ /* write layout theme configuration file */
KConfig *layoutconfig = new KConfig ( KbfxExportLayoutRcDialogURL ); TDEConfig *layoutconfig = new TDEConfig ( KbfxExportLayoutRcDialogURL );
layoutconfig->setGroup ( "KbfxButton" ); layoutconfig->setGroup ( "KbfxButton" );
layoutconfig->writeEntry ( "FadeTime", ConfigInit().m_fadeTime ); layoutconfig->writeEntry ( "FadeTime", ConfigInit().m_fadeTime );

2
configdialog/kbfxconfigdlgthemes.ui.h
Unescape View File

@ -204,7 +204,7 @@ void KbfxConfigDlgThemes::KbfxDeleteThemeClicked()
<< ConfigInit().m_SpinxThemeBasePath + ConfigInit().m_SpinxThemeName << ConfigInit().m_SpinxThemeBasePath + ConfigInit().m_SpinxThemeName
<< endl; << endl;
if ( !KIO::NetAccess::del ( ConfigInit().m_SpinxThemeBasePath+ConfigInit().m_SpinxThemeName, 0 ) ) if ( !TDEIO::NetAccess::del ( ConfigInit().m_SpinxThemeBasePath+ConfigInit().m_SpinxThemeName, 0 ) )
{ {
KMessageBox::sorry ( 0, KMessageBox::sorry ( 0,
tr2i18n ( "<p align='center'>Could not uninstall this KBFX theme.</p>" tr2i18n ( "<p align='center'>Could not uninstall this KBFX theme.</p>"

28
kbfxlib/common/kbfxconfig.cpp
Unescape View File

@ -298,11 +298,11 @@ void KbfxConfig::readThemeInfo ( TQString &themePath, TQString &themeName )
setThemeInfoDefault(); setThemeInfoDefault();
TQFileInfo * info_theme = new TQFileInfo ( themePath + themeName + "/" + m_KbfxThemesVersion ); TQFileInfo * info_theme = new TQFileInfo ( themePath + themeName + "/" + m_KbfxThemesVersion );
KConfig * infoconfig = 0; TDEConfig * infoconfig = 0;
if ( info_theme->exists() == TRUE ) if ( info_theme->exists() == TRUE )
{ {
infoconfig = new KConfig ( info_theme->absFilePath() ); infoconfig = new TDEConfig ( info_theme->absFilePath() );
infoconfig->setGroup ( "ThemeGeneral" ); infoconfig->setGroup ( "ThemeGeneral" );
m_InfoVersion = infoconfig->readEntry ( "ThemeVersion", m_InfoVersionDefault ); m_InfoVersion = infoconfig->readEntry ( "ThemeVersion", m_InfoVersionDefault );
m_InfoAuthor = infoconfig->readEntry ( "AuthorName", m_InfoAuthorDefault ); m_InfoAuthor = infoconfig->readEntry ( "AuthorName", m_InfoAuthorDefault );
@ -325,9 +325,9 @@ void KbfxConfig::readThemeInfo ( TQString &themePath, TQString &themeName )
void KbfxConfig::read() void KbfxConfig::read()
{ {
/* read general configuration */ /* read general configuration */
KConfigSkeleton *confskel = new KConfigSkeleton ( TQString::fromLatin1 ( "kbfxrc" ) ); TDEConfigSkeleton *confskel = new TDEConfigSkeleton ( TQString::fromLatin1 ( "kbfxrc" ) );
KConfig *conf = confskel->config(); TDEConfig *conf = confskel->config();
TQString __default = TDEGlobal::iconLoader()->iconPath ( "kbfx", ( int ) KIcon::Desktop, FALSE ); TQString __default = TDEGlobal::iconLoader()->iconPath ( "kbfx", ( int ) KIcon::Desktop, FALSE );
@ -414,7 +414,7 @@ void KbfxConfig::readFontrc ( TQString & themePath, TQString & themeName, bool u
TQString _abs_path = ""; TQString _abs_path = "";
TQFileInfo * info = new TQFileInfo ( themePath + themeName + "/kbfxfontrc" ); TQFileInfo * info = new TQFileInfo ( themePath + themeName + "/kbfxfontrc" );
TQFileInfo * info_theme = new TQFileInfo ( KbfxThemeRcDestination + "/" + themeName + "_fontrc" ); TQFileInfo * info_theme = new TQFileInfo ( KbfxThemeRcDestination + "/" + themeName + "_fontrc" );
KConfig * fontconfig = 0; TDEConfig * fontconfig = 0;
/* if theme kbfxfontrc exists, make its configuration as default values - prefer users' configuration */ /* 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() == TRUE || info->exists() == TRUE )
@ -427,7 +427,7 @@ void KbfxConfig::readFontrc ( TQString & themePath, TQString & themeName, bool u
{ {
_abs_path = info->absFilePath(); _abs_path = info->absFilePath();
} }
fontconfig = new KConfig ( _abs_path ); fontconfig = new TDEConfig ( _abs_path );
fontconfig->setGroup ( "Fonts" ); fontconfig->setGroup ( "Fonts" );
m_fontTooltipColor = fontconfig->readColorEntry ( "TooltipText", &m_fontTooltipColorDefault ); m_fontTooltipColor = fontconfig->readColorEntry ( "TooltipText", &m_fontTooltipColorDefault );
@ -499,8 +499,8 @@ void KbfxConfig::readThemerc ( TQString &themePath, TQString &themeName, bool us
KbfxOffImg = TQPixmap ( KbfxPlasmaPixmapProvider::PixmapPath ( "off", themePath, themeName ) ); KbfxOffImg = TQPixmap ( KbfxPlasmaPixmapProvider::PixmapPath ( "off", themePath, themeName ) );
/* use theme's default dude image if any */ /* use theme's default dude image if any */
KConfigSkeleton *confskel = new KConfigSkeleton ( TQString::fromLatin1 ( "kbfxrc" ) ); TDEConfigSkeleton *confskel = new TDEConfigSkeleton ( TQString::fromLatin1 ( "kbfxrc" ) );
KConfig *conf = confskel->config(); TDEConfig *conf = confskel->config();
TQString __default = TDEGlobal::iconLoader()->iconPath ( "kbfx", ( int ) KIcon::Desktop, FALSE ); TQString __default = TDEGlobal::iconLoader()->iconPath ( "kbfx", ( int ) KIcon::Desktop, FALSE );
if ( m_SpinxDudeImageDefault == TQString() || !KStandardDirs::exists ( m_SpinxDudeImageDefault ) ) if ( m_SpinxDudeImageDefault == TQString() || !KStandardDirs::exists ( m_SpinxDudeImageDefault ) )
@ -529,7 +529,7 @@ void KbfxConfig::readThemerc ( TQString &themePath, TQString &themeName, bool us
TQString _abs_path = ""; TQString _abs_path = "";
TQFileInfo * info = new TQFileInfo ( themePath + themeName + "/kbfxlayoutrc" ); TQFileInfo * info = new TQFileInfo ( themePath + themeName + "/kbfxlayoutrc" );
TQFileInfo * info_theme = new TQFileInfo ( KbfxThemeRcDestination + "/" + themeName + "_layoutrc" ); TQFileInfo * info_theme = new TQFileInfo ( KbfxThemeRcDestination + "/" + themeName + "_layoutrc" );
KConfig *layoutconfig = 0; TDEConfig *layoutconfig = 0;
/* if theme kbfxlayoutrc exists, make its configuration as default values - prefer users' configuration */ /* 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() == TRUE || info->exists() == TRUE )
@ -543,7 +543,7 @@ void KbfxConfig::readThemerc ( TQString &themePath, TQString &themeName, bool us
_abs_path = info->absFilePath(); _abs_path = info->absFilePath();
} }
layoutconfig = new KConfig ( _abs_path ); layoutconfig = new TDEConfig ( _abs_path );
layoutconfig->setGroup ( "KbfxButton" ); layoutconfig->setGroup ( "KbfxButton" );
m_KbfxNormalButtonPath = layoutconfig->readEntry ( "Normal", m_KbfxNormalButtonPathDefault ); m_KbfxNormalButtonPath = layoutconfig->readEntry ( "Normal", m_KbfxNormalButtonPathDefault );
@ -702,10 +702,10 @@ void KbfxConfig::write()
kdDebug() << "Deleting general RC file: " << KbfxRcPath << endl; kdDebug() << "Deleting general RC file: " << KbfxRcPath << endl;
} }
KConfigSkeleton *confskel = new KConfigSkeleton ( TQString::fromLatin1 ( "kbfxrc" ) ); TDEConfigSkeleton *confskel = new TDEConfigSkeleton ( TQString::fromLatin1 ( "kbfxrc" ) );
/* write general KBFX configuration options */ /* write general KBFX configuration options */
KConfig *conf = confskel->config(); TDEConfig *conf = confskel->config();
conf->setGroup ( "KDE Action Restrictions" ); conf->setGroup ( "KDE Action Restrictions" );
conf->writeEntry ( "warn_unwritable_config", FALSE ); conf->writeEntry ( "warn_unwritable_config", FALSE );
@ -746,7 +746,7 @@ void KbfxConfig::write()
void KbfxConfig::writeFontrc ( TQString & themeName ) void KbfxConfig::writeFontrc ( TQString & themeName )
{ {
/* write fonts KBFX configuration from theme name */ /* write fonts KBFX configuration from theme name */
KConfig *fontconfig = new KConfig ( KbfxThemeRcDestination + "/" + themeName + "_fontrc" ); TDEConfig *fontconfig = new TDEConfig ( KbfxThemeRcDestination + "/" + themeName + "_fontrc" );
fontconfig->setGroup ( "Fonts" ); fontconfig->setGroup ( "Fonts" );
fontconfig->writeEntry ( "TooltipText", m_fontTooltipColor ); fontconfig->writeEntry ( "TooltipText", m_fontTooltipColor );
@ -775,7 +775,7 @@ void KbfxConfig::writeThemerc ( TQString & themeName )
checkValues(); checkValues();
/* write layout theme configuration from theme name */ /* write layout theme configuration from theme name */
KConfig *layoutconfig = new KConfig ( KbfxThemeRcDestination + "/" + themeName + "_layoutrc" ); TDEConfig *layoutconfig = new TDEConfig ( KbfxThemeRcDestination + "/" + themeName + "_layoutrc" );
layoutconfig->setGroup ( "KbfxButton" ); layoutconfig->setGroup ( "KbfxButton" );
layoutconfig->writeEntry ( "Normal", m_KbfxNormalButtonPath ); layoutconfig->writeEntry ( "Normal", m_KbfxNormalButtonPath );

8
kbfxlib/common/kbfxkiodownload.cpp
Unescape View File

@ -38,15 +38,15 @@ KbfxKioDownload::~KbfxKioDownload()
void KbfxKioDownload::KbfxKioDownloadStart ( TQString &url ) void KbfxKioDownload::KbfxKioDownloadStart ( TQString &url )
{ {
KIO::Job *download_job = KIO::file_copy ( KURL ( url ), TDEIO::Job *download_job = TDEIO::file_copy ( KURL ( url ),
KURL ( m_KbfxBrowserTmpFile ), KURL ( m_KbfxBrowserTmpFile ),
-1, -1,
TRUE ); TRUE );
connect ( download_job, TQT_SIGNAL ( result ( KIO::Job* ) ), connect ( download_job, TQT_SIGNAL ( result ( TDEIO::Job* ) ),
this, TQT_SLOT ( KbfxBrowserResult ( KIO::Job * ) ) ); this, TQT_SLOT ( KbfxBrowserResult ( TDEIO::Job * ) ) );
} }
void KbfxKioDownload::KbfxBrowserResult ( KIO::Job *download_job ) void KbfxKioDownload::KbfxBrowserResult ( TDEIO::Job *download_job )
{ {
m_KbfxBrowserError = download_job->error(); m_KbfxBrowserError = download_job->error();

2
kbfxlib/common/kbfxkiodownload.h
Unescape View File

@ -66,7 +66,7 @@ class KbfxKioDownload : public TQObject
private slots: private slots:
/* current job is done here */ /* current job is done here */
virtual void KbfxBrowserResult ( KIO::Job * ); virtual void KbfxBrowserResult ( TDEIO::Job * );
signals: signals:
/* emitted when the download is ready */ /* emitted when the download is ready */

2
src/kbfxspinx.h
Unescape View File

@ -93,7 +93,7 @@ class KbfxSpinx : public KPanelApplet,public DCOPObject
bool m_tooltip; bool m_tooltip;
private: private:
KConfig *ksConfig; TDEConfig *ksConfig;
KbfxButton * kbfxBtn; KbfxButton * kbfxBtn;
KbfxSpinxMenuWidget * m_menuWidget; KbfxSpinxMenuWidget * m_menuWidget;
KbfxSpinxPopUp * m_menu; KbfxSpinxPopUp * m_menu;

Write Preview
Loading…
Cancel
Save