Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent 5fb97907dc
commit 69f1eaa31f

@ -163,7 +163,7 @@ void KbfxConfigDlgThemes::KbfxDeleteThemeClicked()
{ {
int messageBoxReturn; int messageBoxReturn;
int messageBoxUserResReturn; int messageBoxUserResReturn;
TQString KbfxThemeRcDestination = KGlobal::dirs()->saveLocation ( "data", TQString ( "kbfx/themerc/" ), TRUE ); TQString KbfxThemeRcDestination = TDEGlobal::dirs()->saveLocation ( "data", TQString ( "kbfx/themerc/" ), TRUE );
KbfxThemeRcDestination.append( ConfigInit().m_SpinxThemeName ); KbfxThemeRcDestination.append( ConfigInit().m_SpinxThemeName );
messageBoxReturn = KMessageBox::warningContinueCancel ( 0, messageBoxReturn = KMessageBox::warningContinueCancel ( 0,
@ -247,7 +247,7 @@ void KbfxConfigDlgThemes::KbfxThemeInstall ( TQString &installUrl )
return; return;
} }
const TQString KbfxThemeDestination = KGlobal::dirs()->saveLocation ( "data", const TQString KbfxThemeDestination = TDEGlobal::dirs()->saveLocation ( "data",
TQString ( "kbfx/skins/" ), TQString ( "kbfx/skins/" ),
TRUE ); TRUE );

@ -26,8 +26,8 @@ KbfxConfig::KbfxConfig()
/* set default configuration values */ /* set default configuration values */
/* KBFX internal settings */ /* KBFX internal settings */
KbfxThemeRcDestination = KGlobal::dirs()->saveLocation ( "data", TQString ( "kbfx/themerc/" ), TRUE ); KbfxThemeRcDestination = TDEGlobal::dirs()->saveLocation ( "data", TQString ( "kbfx/themerc/" ), TRUE );
KbfxRcPath = KGlobal::dirs()->findResource ( "config", "kbfxrc" ); KbfxRcPath = TDEGlobal::dirs()->findResource ( "config", "kbfxrc" );
m_KbfxDeleteOldConf = FALSE; m_KbfxDeleteOldConf = FALSE;
TQString _unspecified = tr2i18n ( "Not Specified" ); TQString _unspecified = tr2i18n ( "Not Specified" );
TQString path = locate ( "data", "kbfx/skins/default/bg.png" ); TQString path = locate ( "data", "kbfx/skins/default/bg.png" );
@ -329,7 +329,7 @@ void KbfxConfig::read()
KConfig *conf = confskel->config(); KConfig *conf = confskel->config();
TQString __default = KGlobal::iconLoader()->iconPath ( "kbfx", ( int ) KIcon::Desktop, FALSE ); TQString __default = TDEGlobal::iconLoader()->iconPath ( "kbfx", ( int ) KIcon::Desktop, FALSE );
conf->setGroup ( "KbfxGeneral" ); conf->setGroup ( "KbfxGeneral" );
m_KbfxGeneralVersion = conf->readNumEntry ( "Version", 0 ); m_KbfxGeneralVersion = conf->readNumEntry ( "Version", 0 );
@ -501,7 +501,7 @@ void KbfxConfig::readThemerc ( TQString &themePath, TQString &themeName, bool us
/* use theme's default dude image if any */ /* use theme's default dude image if any */
KConfigSkeleton *confskel = new KConfigSkeleton ( TQString::fromLatin1 ( "kbfxrc" ) ); KConfigSkeleton *confskel = new KConfigSkeleton ( TQString::fromLatin1 ( "kbfxrc" ) );
KConfig *conf = confskel->config(); KConfig *conf = confskel->config();
TQString __default = KGlobal::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 ) )
{ {

@ -132,7 +132,7 @@ KbfxPlasmaCanvasItem::setExec ( TQString desktopfile )
void void
KbfxPlasmaCanvasItem::setIconPath ( TQString str ) KbfxPlasmaCanvasItem::setIconPath ( TQString str )
{ {
KIconLoader *iconload = KGlobal::iconLoader (); KIconLoader *iconload = TDEGlobal::iconLoader ();
m_iconPath = iconload->iconPath ( str, KIcon::Desktop, false ); m_iconPath = iconload->iconPath ( str, KIcon::Desktop, false );
// m_icon.load(m_iconPath); // m_icon.load(m_iconPath);
TQImage _img ( m_iconPath ); TQImage _img ( m_iconPath );

@ -44,7 +44,7 @@ KbfxPlasmaIndexItem::~KbfxPlasmaIndexItem()
void void
KbfxPlasmaIndexItem::setIcon ( TQString str ) KbfxPlasmaIndexItem::setIcon ( TQString str )
{ {
KIconLoader *iconload = KGlobal::iconLoader (); KIconLoader *iconload = TDEGlobal::iconLoader ();
m_iconPath = iconload->iconPath ( str, KIcon::Desktop, false ); m_iconPath = iconload->iconPath ( str, KIcon::Desktop, false );
m_icon.load ( m_iconPath ); m_icon.load ( m_iconPath );

@ -317,7 +317,7 @@ extern "C"
{ {
KPanelApplet* init ( TQWidget *parent, const TQString& configFile ) KPanelApplet* init ( TQWidget *parent, const TQString& configFile )
{ {
KGlobal::locale()->insertCatalogue ( "KbfxSpinx" ); TDEGlobal::locale()->insertCatalogue ( "KbfxSpinx" );
return new KbfxSpinx ( configFile, KPanelApplet::Normal, return new KbfxSpinx ( configFile, KPanelApplet::Normal,
KPanelApplet::About | KPanelApplet::Help | KPanelApplet::Preferences, KPanelApplet::About | KPanelApplet::Help | KPanelApplet::Preferences,
parent, "KbfxSpinx" ); parent, "KbfxSpinx" );

@ -105,7 +105,7 @@ KbfxSpinxToolButton::setDataSource ( KbfxDataSource * src )
m_exe = src->command(); m_exe = src->command();
m_dataSource = new KbfxDataSource(); m_dataSource = new KbfxDataSource();
*m_dataSource = *src; // copy *m_dataSource = *src; // copy
KIconLoader *iconload = KGlobal::iconLoader (); KIconLoader *iconload = TDEGlobal::iconLoader ();
TQString m_iconPath = iconload->iconPath ( m_icon, KIcon::Desktop, false ); TQString m_iconPath = iconload->iconPath ( m_icon, KIcon::Desktop, false );
m_iconPixmap = TQPixmap ( m_iconPath ); m_iconPixmap = TQPixmap ( m_iconPath );
} }

Loading…
Cancel
Save