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

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

Browse Source
pull/1/head
Timothy Pearson 12 years ago
parent 36117c8a3e
commit b1b005cf85
25 changed files with 65 additions and 65 deletions
Show Stats Download Patch File Download Diff File

4
kscreensaver/kdesavers/Euphoria.cpp
Unescape Escape View File

@ -944,7 +944,7 @@ static int filterRandom( int n )
void KEuphoriaScreenSaver::readSettings()
{
KConfig* config = KGlobal::config();
KConfig* config = TDEGlobal::config();
config->setGroup("Settings");
_mode = config->readNumEntry( "Mode", EuphoriaWidget::Regular );
@ -1047,7 +1047,7 @@ void KEuphoriaSetup::slotHelp()
*/
void KEuphoriaSetup::slotOk()
{
KConfig* config = KGlobal::config();
KConfig* config = TDEGlobal::config();
config->setGroup("Settings");
TQString val;

4
kscreensaver/kdesavers/Flux.cpp
Unescape Escape View File

@ -828,7 +828,7 @@ static int filterRandom( int n )
void KFluxScreenSaver::readSettings()
{
KConfig* config = KGlobal::config();
KConfig* config = TDEGlobal::config();
config->setGroup("Settings");
_mode = config->readNumEntry( "Mode", FluxWidget::Regular );
@ -928,7 +928,7 @@ void KFluxSetup::slotHelp()
*/
void KFluxSetup::slotOk()
{
KConfig* config = KGlobal::config();
KConfig* config = TDEGlobal::config();
config->setGroup("Settings");
TQString val;

4
kscreensaver/kdesavers/SolarWinds.cpp
Unescape Escape View File

@ -642,7 +642,7 @@ static int filterRandom( int n )
void KSWindsScreenSaver::readSettings()
{
KConfig* config = KGlobal::config();
KConfig* config = TDEGlobal::config();
config->setGroup("Settings");
_mode = config->readNumEntry( "Mode", SWindsWidget::Regular );
@ -740,7 +740,7 @@ void KSWindsSetup::slotHelp()
*/
void KSWindsSetup::slotOk()
{
KConfig* config = KGlobal::config();
KConfig* config = TDEGlobal::config();
config->setGroup("Settings");
TQString val;

8
kscreensaver/kdesavers/banner.cpp
Unescape Escape View File

@ -166,7 +166,7 @@ KBannerSetup::KBannerSetup( TQWidget *parent, const char *name )
// read settings from config file
void KBannerSetup::readSettings()
{
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
config->setGroup( "Settings" );
speed=config->readNumEntry("Speed",50);
@ -308,7 +308,7 @@ void KBannerSetup::slotTimeToggled( bool on )
// Ok pressed - save settings and exit
void KBannerSetup::slotOk()
{
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
config->setGroup( "Settings" );
config->writeEntry( "Speed", speed );
@ -415,7 +415,7 @@ void KBannerSaver::setTimeDisplay()
// read settings from config file
void KBannerSaver::readSettings()
{
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
config->setGroup( "Settings" );
setSpeed( config->readNumEntry("Speed",50) );
@ -470,7 +470,7 @@ void KBannerSaver::slotTimeout()
}
if (showTime)
{
TQString new_message = KGlobal::locale()->formatTime(TQTime::currentTime(), true);
TQString new_message = TDEGlobal::locale()->formatTime(TQTime::currentTime(), true);
if( new_message != message )
needUpdate = TRUE;
message = new_message;

6
kscreensaver/kdesavers/blob.cpp
Unescape Escape View File

@ -412,7 +412,7 @@ void KBlobSaver::blank()
void KBlobSaver::readSettings()
{
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
config->setGroup("Settings");
// number of seconds to spend on a frame
@ -491,7 +491,7 @@ KBlobSetup::KBlobSetup
void KBlobSetup::readSettings()
{
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
config->setGroup("Settings");
// number of seconds to spend on a frame
@ -504,7 +504,7 @@ void KBlobSetup::readSettings()
// Ok pressed - save settings and exit
void KBlobSetup::slotOk()
{
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
config->setGroup("Settings");

6
kscreensaver/kdesavers/kclock.cpp
Unescape Escape View File

@ -174,7 +174,7 @@ KClockSetup::~KClockSetup()
void KClockSetup::readSettings()
{
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
config->setGroup("Settings");
m_keepCentered = config->readBoolEntry("KeepCentered", DEFAULT_KEEP_CENTERED);
@ -206,7 +206,7 @@ void KClockSetup::readSettings()
void KClockSetup::slotOk()
{
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
config->setGroup("Settings");
config->writeEntry("Size", m_size);
config->writeEntry("KeepCentered", m_keepCentered);
@ -488,7 +488,7 @@ void KClockSaver::setKeepCentered(bool b)
void KClockSaver::readSettings()
{
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
config->setGroup("Settings");
m_keepCentered = config->readBoolEntry("KeepCentered", DEFAULT_KEEP_CENTERED);

6
kscreensaver/kdesavers/kvm.cpp
Unescape Escape View File

@ -226,7 +226,7 @@ void kVmSaver::setRefreshTimeout( const int refreshTimeout )
void kVmSaver::readSettings()
{
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
config->setGroup( "Settings" );
speed = config->readNumEntry( "Speed", 50 );
@ -329,7 +329,7 @@ kVmSetup::~kVmSetup()
void kVmSetup::readSettings()
{
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
config->setGroup( "Settings" );
speed = config->readNumEntry( "Speed", 50 );
@ -359,7 +359,7 @@ void kVmSetup::slotRefreshTimeout( int num )
void kVmSetup::slotOk()
{
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
config->setGroup( "Settings" );
TQString sspeed;

6
kscreensaver/kdesavers/lines.cpp
Unescape Escape View File

@ -186,7 +186,7 @@ kLinesSetup::~kLinesSetup()
// read settings from config file
void kLinesSetup::readSettings(){
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
config->setGroup( "Settings" );
TQString str;
@ -244,7 +244,7 @@ void kLinesSetup::slotHelp(){
// Ok pressed - save settings and exit
void kLinesSetup::slotOk(){
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
config->setGroup("Settings");
TQString slength;
@ -319,7 +319,7 @@ void kLinesSaver::setColor(const TQColor& cs, const TQColor& cm, const TQColor&
// read configuration settings from config file
void kLinesSaver::readSettings(){
KConfig *config=KGlobal::config();
KConfig *config=TDEGlobal::config();
config->setGroup("Settings");
numLines=config->readNumEntry("Length", 10);

8
kscreensaver/kdesavers/lorenz.cpp
Unescape Escape View File

@ -155,7 +155,7 @@ KLorenzSetup::~KLorenzSetup()
// read settings from config file
void KLorenzSetup::readSettings()
{
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
config->setGroup( "Settings" );
speed = config->readNumEntry( "Speed", DEFSPEED );
@ -223,7 +223,7 @@ void KLorenzSetup::slotHelp()
// Ok pressed - save settings and exit
void KLorenzSetup::slotOk()
{
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
config->setGroup( "Settings" );
config->writeEntry( "Speed", speed );
@ -265,7 +265,7 @@ void KLorenzSetup::slotDefault()
/* // User can cancel, or save defaults?
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
config->setGroup( "Settings" );
config->writeEntry( "Speed", speed );
@ -461,7 +461,7 @@ KLorenzSaver::~KLorenzSaver()
// read configuration settings from config file
void KLorenzSaver::readSettings()
{
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
config->setGroup( "Settings" );
speed = config->readNumEntry( "Speed", DEFSPEED );

4
kscreensaver/kdesavers/pendulum.cpp
Unescape Escape View File

@ -392,7 +392,7 @@ KPendulumSaver::~KPendulumSaver()
void KPendulumSaver::readSettings()
{
// read configuration settings from config file
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
config->setGroup("Settings");
// internal saver parameters are set to stored values or left at their
@ -766,7 +766,7 @@ KPendulumSetup::~KPendulumSetup()
// Ok pressed - save settings and exit
void KPendulumSetup::okButtonClickedSlot()
{
KConfig* config = KGlobal::config();
KConfig* config = TDEGlobal::config();
config->setGroup("Settings");
config->writeEntry("mass ratio", saver->massRatio());

6
kscreensaver/kdesavers/polygon.cpp
Unescape Escape View File

@ -113,7 +113,7 @@ kPolygonSetup::~kPolygonSetup()
// read settings from config file
void kPolygonSetup::readSettings()
{
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
config->setGroup( "Settings" );
length = config->readNumEntry( "Length", length );
@ -159,7 +159,7 @@ void kPolygonSetup::slotSpeed( int num )
// Ok pressed - save settings and exit
void kPolygonSetup::slotOk()
{
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
config->setGroup( "Settings" );
TQString slength;
@ -241,7 +241,7 @@ void kPolygonSaver::setSpeed( int spd )
// read configuration settings from config file
void kPolygonSaver::readSettings()
{
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
config->setGroup( "Settings" );
numLines = config->readNumEntry( "Length", 10 );

4
kscreensaver/kdesavers/rotation.cpp
Unescape Escape View File

@ -558,7 +558,7 @@ void KRotationSaver::initData()
void KRotationSaver::readSettings()
{
// read configuration settings from config file
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
config->setGroup("Settings");
// internal saver parameters are set to stored values or left at their
@ -764,7 +764,7 @@ KRotationSetup::~KRotationSetup()
// Ok pressed - save settings and exit
void KRotationSetup::okButtonClickedSlot(void)
{
KConfig* config = KGlobal::config();
KConfig* config = TDEGlobal::config();
config->setGroup("Settings");
config->writeEntry("x trace", saver->traceFlag(0));
config->writeEntry("y trace", saver->traceFlag(1));

6
kscreensaver/kdesavers/science.cpp
Unescape Escape View File

@ -560,7 +560,7 @@ void KScienceSaver::setHideBG( bool b )
void KScienceSaver::readSettings()
{
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
TQString sMode;
config->setGroup( "Settings" );
@ -1008,7 +1008,7 @@ void KScienceSetup::updateSettings()
// read settings from config file
void KScienceSetup::readSettings()
{
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
TQString sMode;
config->setGroup( "Settings" );
@ -1118,7 +1118,7 @@ void KScienceSetup::slotSliderReleased()
// Ok pressed - save settings and exit
void KScienceSetup::slotOk()
{
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
TQString sSize, sSpeed, sIntensity, sMode;
config->setGroup( "Settings" );

8
kscreensaver/kdesavers/slideshow.cpp
Unescape Escape View File

@ -139,12 +139,12 @@ void kSlideShowSaver::initNextScreen()
//-----------------------------------------------------------------------------
void kSlideShowSaver::readConfig()
{
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
config->setGroup("Settings");
mShowRandom = config->readBoolEntry("ShowRandom", true);
mZoomImages = config->readBoolEntry("ZoomImages", false);
mPrintName = config->readBoolEntry("PrintName", true);
mDirectory = config->readPathEntry("Directory", KGlobal::dirs()->findDirs("wallpaper", "").last());
mDirectory = config->readPathEntry("Directory", TDEGlobal::dirs()->findDirs("wallpaper", "").last());
mDelay = config->readNumEntry("Delay", 10) * 1000;
mSubdirectory = config->readBoolEntry("SubDirectory", false);
mRandomPosition = config->readBoolEntry("RandomPosition", false);
@ -955,7 +955,7 @@ kSlideShowSetup::~kSlideShowSetup()
//-----------------------------------------------------------------------------
void kSlideShowSetup::readSettings()
{
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
config->setGroup("Settings");
cfg->mCbxRandom->setChecked(config->readBoolEntry("ShowRandom", true));
@ -971,7 +971,7 @@ void kSlideShowSetup::readSettings()
//-----------------------------------------------------------------------------
void kSlideShowSetup::writeSettings()
{
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
config->setGroup("Settings");
config->writeEntry("ShowRandom", cfg->mCbxRandom->isChecked());

6
kscreensaver/kdesavers/wave.cpp
Unescape Escape View File

@ -83,7 +83,7 @@ KWaveSetup::~KWaveSetup( )
// read settings from config file
void KWaveSetup::readSettings()
{
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
config->setGroup( "Settings" );
// color = config->readColorEntry( "Color", &black );
@ -92,7 +92,7 @@ void KWaveSetup::readSettings()
// Ok pressed - save settings and exit
void KWaveSetup::slotOkPressed()
{
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
config->setGroup( "Settings" );
// config->writeEntry( "Color", color );
@ -133,7 +133,7 @@ KWaveSaver::~KWaveSaver()
// read configuration settings from config file
void KWaveSaver::readSettings()
{
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
config->setGroup( "Settings" );
// color = config->readColorEntry( "Color", &black );

4
kscreensaver/kpartsaver/kpartsaver.cpp
Unescape Escape View File

@ -64,14 +64,14 @@ extern "C"
KDE_EXPORT KScreenSaver *kss_create( WId d )
{
KGlobal::locale()->insertCatalogue("kpartsaver");
TDEGlobal::locale()->insertCatalogue("kpartsaver");
return new KPartSaver( d );
}
KDE_EXPORT TQDialog *kss_setup()
{
kdDebug() << "kss_setup" << endl;
KGlobal::locale()->insertCatalogue("kpartsaver");
TDEGlobal::locale()->insertCatalogue("kpartsaver");
return new SaverConfig;
}
}

8
kscreensaver/kxsconfig/kxsconfig.cpp
Unescape Escape View File

@ -165,9 +165,9 @@ bool KXSConfigDialog::create()
}
}
mPreviewProc = new KProcess;
connect(mPreviewProc, TQT_SIGNAL(processExited(KProcess *)),
TQT_SLOT(slotPreviewExited(KProcess *)));
mPreviewProc = new TDEProcess;
connect(mPreviewProc, TQT_SIGNAL(processExited(TDEProcess *)),
TQT_SLOT(slotPreviewExited(TDEProcess *)));
mPreviewTimer = new TQTimer(this);
connect(mPreviewTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotNewPreview()));
@ -213,7 +213,7 @@ TQString KXSConfigDialog::command()
}
//---------------------------------------------------------------------------
void KXSConfigDialog::slotPreviewExited(KProcess *)
void KXSConfigDialog::slotPreviewExited(TDEProcess *)
{
if ( mKilled ) {
mKilled = false;

6
kscreensaver/kxsconfig/kxsconfig.h
Unescape Escape View File

@ -25,7 +25,7 @@
#include <kdialogbase.h>
#include "kxsitem.h"
class KProcess;
class TDEProcess;
class TQLabel;
class KXSConfigDialog : public KDialogBase
@ -40,7 +40,7 @@ public:
TQString command();
protected slots:
void slotPreviewExited(KProcess *);
void slotPreviewExited(TDEProcess *);
void slotNewPreview();
void slotChanged();
virtual void slotOk();
@ -50,7 +50,7 @@ protected:
TQString mFilename;
TQString mExeName;
TQString mConfigFile;
KProcess *mPreviewProc;
TDEProcess *mPreviewProc;
TQWidget *mPreview;
TQTimer *mPreviewTimer;
TQPtrList<KXSConfigItem> mConfigItemList;

2
kscreensaver/xsavers/helpers.h
Unescape Escape View File

@ -13,7 +13,7 @@ void fixed_size(TQWidget *);
/*
* Use this to get a KConfig object that uses a reasonable config filename.
* KGlobal::config() will use the klockrc config file.
* TDEGlobal::config() will use the klockrc config file.
*
* Caller must delete the object when finished.
*/

4
styles/phase/config/phasestyleconfig.cpp
Unescape Escape View File

@ -28,7 +28,7 @@
PhaseStyleConfig::PhaseStyleConfig(TQWidget* parent) : StyleDialog(parent)
{
KGlobal::locale()->insertCatalogue("kstyle_phase_config");
TDEGlobal::locale()->insertCatalogue("kstyle_phase_config");
TQSettings settings;
oldgradients =
@ -52,7 +52,7 @@ PhaseStyleConfig::PhaseStyleConfig(TQWidget* parent) : StyleDialog(parent)
PhaseStyleConfig::~PhaseStyleConfig()
{
KGlobal::locale()->removeCatalogue("kstyle_phase_config");
TDEGlobal::locale()->removeCatalogue("kstyle_phase_config");
}
//////////////////////////////////////////////////////////////////////////////

2
twin-styles/cde/config/config.cpp
Unescape Escape View File

@ -24,7 +24,7 @@ CdeConfig::CdeConfig( KConfig* conf, TQWidget* parent )
: TQObject( parent )
{
cdeConfig = new KConfig("twincderc");
KGlobal::locale()->insertCatalogue("twin_art_clients");
TDEGlobal::locale()->insertCatalogue("twin_art_clients");
groupBox = new TQVBox( parent );

6
twin-styles/glow/config/glowconfigdialog.cpp
Unescape Escape View File

@ -55,7 +55,7 @@ GlowConfigDialog::GlowConfigDialog( KConfig * conf, TQWidget * parent )
: TQObject(parent)
{
_glowConfig = new KConfig("twinglowrc");
KGlobal::locale()->insertCatalogue("twin_glow_config");
TDEGlobal::locale()->insertCatalogue("twin_glow_config");
_main_group_box = new TQWidget(parent);
TQVBoxLayout *main_group_boxLayout = new TQVBoxLayout(_main_group_box);
@ -138,7 +138,7 @@ GlowConfigDialog::GlowConfigDialog( KConfig * conf, TQWidget * parent )
TQHBoxLayout *titlebarGradientTypeLayout = new TQHBoxLayout();
_titlebarGradientTypeComboBox = new TQComboBox(_main_group_box);
KConfig *c = KGlobal::config();
KConfig *c = TDEGlobal::config();
KConfigGroupSaver cgs( c, TQString::fromLatin1("WM") );
TQColor activeBackground = c->readColorEntry("activeBackground");
TQColor activeBlend = c->readColorEntry("activeBlend");
@ -273,7 +273,7 @@ void GlowConfigDialog::defaults()
void GlowConfigDialog::slotLoadThemeList ()
{
TQStringList dir_list=KGlobal::dirs()->findDirs("data", "twin/glow-themes");
TQStringList dir_list=TDEGlobal::dirs()->findDirs("data", "twin/glow-themes");
TQStringList::ConstIterator it;

4
twin-styles/glow/glowclient.cpp
Unescape Escape View File

@ -164,7 +164,7 @@ GlowClientGlobals::borderSizes() const
void GlowClientGlobals::readTheme()
{
TQString theme_config_file = KGlobal::dirs()->findResource ("data",
TQString theme_config_file = TDEGlobal::dirs()->findResource ("data",
TQString("twin/glow-themes/") + config()->themeName + "/" +
config()->themeName + ".theme");
if (theme_config_file.isNull())
@ -290,7 +290,7 @@ const TQString GlowClientGlobals::getPixmapTypeName(PixmapType type)
bool GlowClientGlobals::createPixmap(PixmapType type, bool isActive)
{
TQString theme_dir = KGlobal::dirs()->findResource ("data",
TQString theme_dir = TDEGlobal::dirs()->findResource ("data",
TQString("twin/glow-themes/") + _config->themeName + "/");
TQColor glow_color;

6
twin-styles/icewm/config/config.cpp
Unescape Escape View File

@ -59,7 +59,7 @@ IceWMConfig::IceWMConfig( KConfig* conf, TQWidget* parent )
: TQObject( parent )
{
icewmConfig = new KConfig("twinicewmrc");
KGlobal::locale()->insertCatalogue("twin_art_clients");
TDEGlobal::locale()->insertCatalogue("twin_art_clients");
mainWidget = new TQVBox( parent );
mainWidget->setSpacing( KDialog::spacingHint() );
@ -123,7 +123,7 @@ IceWMConfig::IceWMConfig( KConfig* conf, TQWidget* parent )
this, TQT_SLOT(slotSelectionChanged()) );
// Create the theme directory (if not found) ... and obtain the path as we do so.
localThemeString = KGlobal::dirs()->saveLocation("data", "twin");
localThemeString = TDEGlobal::dirs()->saveLocation("data", "twin");
localThemeString += "/icewm-themes";
if (!TQFile::exists(localThemeString))
TQDir().mkdir(localThemeString);
@ -158,7 +158,7 @@ IceWMConfig::~IceWMConfig()
// Searches for all installed IceWM themes, and adds them to the listBox.
void IceWMConfig::findIceWMThemes()
{
TQStringList dirList = KGlobal::dirs()->findDirs("data", "twin/icewm-themes");
TQStringList dirList = TDEGlobal::dirs()->findDirs("data", "twin/icewm-themes");
TQStringList::ConstIterator it;
// Remove any old themes in the list (if any)

2
twin-styles/smooth-blend/client/config/smoothblendconfig.cc
Unescape Escape View File

@ -30,7 +30,7 @@ smoothblendConfig::smoothblendConfig(KConfig* config, TQWidget* parent)
: TQObject(parent), config_(0), dialog_(0) {
// create the configuration object
config_ = new KConfig("twinsmoothblendrc");
KGlobal::locale()->insertCatalogue("twin_smoothblend_config");
TDEGlobal::locale()->insertCatalogue("twin_smoothblend_config");
// create and show the configuration dialog
dialog_ = new ConfigDialog(parent);

Write Preview
Loading…
Cancel
Save