Browse Source

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

tags/r14.0.0
Timothy Pearson 7 years ago
parent
commit
79b21d47bc
100 changed files with 337 additions and 337 deletions
  1. +1
    -1
      doc/kinfocenter/samba/index.docbook
  2. +1
    -1
      doc/ksplashml/index.docbook
  3. +9
    -9
      drkonqi/backtrace.cpp
  4. +4
    -4
      drkonqi/backtrace.h
  5. +1
    -1
      drkonqi/debugger.cpp
  6. +1
    -1
      drkonqi/krashconf.cpp
  7. +2
    -2
      drkonqi/toplevel.cpp
  8. +4
    -4
      kappfinder/common.cpp
  9. +1
    -1
      kappfinder/main_install.cpp
  10. +2
    -2
      kappfinder/toplevel.cpp
  11. +1
    -1
      kate/app/kateapp.cpp
  12. +1
    -1
      kate/app/kateconsole.cpp
  13. +10
    -10
      kate/app/kategrepdialog.cpp
  14. +4
    -4
      kate/app/kategrepdialog.h
  15. +1
    -1
      kate/app/katemain.h
  16. +3
    -3
      kate/app/katemdi.cpp
  17. +5
    -5
      kate/app/katemwmodonhddialog.cpp
  18. +2
    -2
      kate/app/katemwmodonhddialog.h
  19. +1
    -1
      kate/app/katesavemodifieddialog.cpp
  20. +3
    -3
      kate/app/katesession.cpp
  21. +2
    -2
      kate/app/kateviewspace.cpp
  22. +1
    -1
      kate/app/kateviewspacecontainer.cpp
  23. +1
    -1
      kate/app/kwritemain.cpp
  24. +1
    -1
      kate/utils/messageview.h
  25. +5
    -5
      kcontrol/access/kaccess.cpp
  26. +1
    -1
      kcontrol/access/kcmaccess.cpp
  27. +19
    -19
      kcontrol/arts/arts.cpp
  28. +3
    -3
      kcontrol/arts/arts.h
  29. +2
    -2
      kcontrol/arts/krichtextlabel.cpp
  30. +5
    -5
      kcontrol/background/bgdialog.cpp
  31. +1
    -1
      kcontrol/background/bgdialog.h
  32. +4
    -4
      kcontrol/background/bgrender.cpp
  33. +2
    -2
      kcontrol/background/bgrender.h
  34. +27
    -27
      kcontrol/background/bgsettings.cpp
  35. +2
    -2
      kcontrol/background/bgsettings.h
  36. +1
    -1
      kcontrol/background/bgwallpaper.cpp
  37. +9
    -9
      kcontrol/clock/dtime.cpp
  38. +1
    -1
      kcontrol/clock/main.cpp
  39. +8
    -8
      kcontrol/colors/colorscm.cpp
  40. +3
    -3
      kcontrol/colors/widgetcanvas.cpp
  41. +3
    -3
      kcontrol/componentchooser/componentchooser.cpp
  42. +1
    -1
      kcontrol/componentchooser/kcm_componentchooser.cpp
  43. +7
    -7
      kcontrol/crypto/crypto.cpp
  44. +1
    -1
      kcontrol/css/kcmcss.cpp
  45. +1
    -1
      kcontrol/displayconfig/displayconfig.cpp
  46. +3
    -3
      kcontrol/dnssd/kcmdnssd.cpp
  47. +1
    -1
      kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp
  48. +5
    -5
      kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp
  49. +2
    -2
      kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.h
  50. +4
    -4
      kcontrol/fonts/fonts.cpp
  51. +1
    -1
      kcontrol/hwmanager/devicepropsdlg.cpp
  52. +4
    -4
      kcontrol/hwmanager/hwmanager.cpp
  53. +5
    -5
      kcontrol/icons/icons.cpp
  54. +2
    -2
      kcontrol/icons/iconthemes.cpp
  55. +6
    -6
      kcontrol/info/info.cpp
  56. +1
    -1
      kcontrol/info/info_linux.cpp
  57. +4
    -4
      kcontrol/info/memory.cpp
  58. +4
    -4
      kcontrol/input/core/themepage.cpp
  59. +1
    -1
      kcontrol/input/mouse.cpp
  60. +1
    -1
      kcontrol/ioslaveinfo/kcmioslaveinfo.cpp
  61. +1
    -1
      kcontrol/joystick/joywidget.cpp
  62. +1
    -1
      kcontrol/kcontrol/aboutwidget.cpp
  63. +1
    -1
      kcontrol/kcontrol/dockcontainer.cpp
  64. +2
    -2
      kcontrol/kcontrol/helpwidget.cpp
  65. +4
    -4
      kcontrol/kcontrol/main.cpp
  66. +2
    -2
      kcontrol/kcontrol/modulemenu.cpp
  67. +6
    -6
      kcontrol/kcontrol/modules.cpp
  68. +3
    -3
      kcontrol/kcontrol/modules.h
  69. +1
    -1
      kcontrol/kcontrol/moduletreeview.cpp
  70. +1
    -1
      kcontrol/kcontrol/searchwidget.cpp
  71. +5
    -5
      kcontrol/kcontrol/toplevel.cpp
  72. +2
    -2
      kcontrol/kded/kcmkded.cpp
  73. +2
    -2
      kcontrol/keys/ChangeLog
  74. +6
    -6
      kcontrol/keys/keyconfig.cpp
  75. +12
    -12
      kcontrol/keys/main.cpp
  76. +13
    -13
      kcontrol/keys/modifiers.cpp
  77. +7
    -7
      kcontrol/keys/shortcuts.cpp
  78. +2
    -2
      kcontrol/keys/treeview.cpp
  79. +1
    -1
      kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp
  80. +2
    -2
      kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp
  81. +1
    -1
      kcontrol/kfontinst/kfile-plugin/KFileFont.cpp
  82. +16
    -16
      kcontrol/kfontinst/kio/KioFonts.cpp
  83. +1
    -1
      kcontrol/kfontinst/lib/FcEngine.cpp
  84. +2
    -2
      kcontrol/kfontinst/lib/Misc.cpp
  85. +1
    -1
      kcontrol/kfontinst/thumbnail/FontThumbnail.cpp
  86. +1
    -1
      kcontrol/kfontinst/viewpart/FontViewPartFactory.cpp
  87. +1
    -1
      kcontrol/kfontinst/viewpart/FontViewerApp.cpp
  88. +1
    -1
      kcontrol/kicker/applettab_impl.cpp
  89. +1
    -1
      kcontrol/kicker/lookandfeeltab_impl.cpp
  90. +7
    -7
      kcontrol/kicker/main.cpp
  91. +3
    -3
      kcontrol/kicker/menutab_impl.cpp
  92. +1
    -1
      kcontrol/kicker/positiontab_impl.cpp
  93. +2
    -2
      kcontrol/kio/cache.cpp
  94. +1
    -1
      kcontrol/kio/fakeuaprovider.cpp
  95. +1
    -1
      kcontrol/kio/kcookiesmanagement.cpp
  96. +2
    -2
      kcontrol/kio/smbrodlg.cpp
  97. +1
    -1
      kcontrol/knotify/knotify.cpp
  98. +1
    -1
      kcontrol/konq/desktopbehavior_impl.cpp
  99. +3
    -3
      kcontrol/konq/fontopts.cpp
  100. +4
    -4
      kcontrol/konq/previews.cpp

+ 1
- 1
doc/kinfocenter/samba/index.docbook View File

@@ -188,7 +188,7 @@ often, or which user opened the most files or whatever.</para>
<title>Contributors</title>
<listitem><para>Conversion to kcontrol applet:</para>
<para>&Matthias.Hoelzer-Kluepfel; &Matthias.Hoelzer-Kluepfel.mail;</para></listitem>
<listitem><para>Use of <classname>KProcess</classname> instead of popen, and more error checking:</para>
<listitem><para>Use of <classname>TDEProcess</classname> instead of popen, and more error checking:</para>
<para>&David.Faure; &David.Faure.mail;</para></listitem>
<listitem><para>Conversion to kcmodule, added tab pages 2,3,4, bug
fixed:</para>


+ 1
- 1
doc/ksplashml/index.docbook View File

@@ -1154,7 +1154,7 @@ void Theme2k::initUi()
mText-&gt;setFixedHeight( 48 );

setFixedSize( vbox-&gt;sizeHint() );
QRect rect(KGlobalSettings::splashScreenDesktopGeometry());
QRect rect(TDEGlobalSettings::splashScreenDesktopGeometry());
move( rect.x() + (rect.width() - size().width())/2,
rect.y() + (rect.height() - size().height())/2 );
}


+ 9
- 9
drkonqi/backtrace.cpp View File

@@ -44,7 +44,7 @@ BackTrace::BackTrace(const KrashConfig *krashconf, TQObject *parent,
: TQObject(parent, name),
m_krashconf(krashconf), m_temp(NULL), m_temp_cmd(NULL)
{
m_proc = new KProcess;
m_proc = new TDEProcess;
}

BackTrace::~BackTrace()
@@ -123,7 +123,7 @@ void BackTrace::start()
}

// start the debugger
m_proc = new KProcess;
m_proc = new TDEProcess;
m_proc->setUseShell(true);

if (need_root_access == false) {
@@ -133,15 +133,15 @@ void BackTrace::start()
*m_proc << "tdesu -t --comment \"" << i18n("Administrative access is required to generate a backtrace") << "\" -c \"" << m_temp_cmd->name() << "\"";
}

connect(m_proc, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)),
TQT_SLOT(slotReadInput(KProcess*, char*, int)));
connect(m_proc, TQT_SIGNAL(processExited(KProcess*)),
TQT_SLOT(slotProcessExited(KProcess*)));
connect(m_proc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
TQT_SLOT(slotReadInput(TDEProcess*, char*, int)));
connect(m_proc, TQT_SIGNAL(processExited(TDEProcess*)),
TQT_SLOT(slotProcessExited(TDEProcess*)));

m_proc->start ( KProcess::NotifyOnExit, KProcess::All );
m_proc->start ( TDEProcess::NotifyOnExit, TDEProcess::All );
}

void BackTrace::slotReadInput(KProcess *, char* buf, int buflen)
void BackTrace::slotReadInput(TDEProcess *, char* buf, int buflen)
{
TQString newstr = TQString::fromLocal8Bit(buf, buflen);
newstr.replace("\n\n", "\n");
@@ -156,7 +156,7 @@ void BackTrace::slotReadInput(KProcess *, char* buf, int buflen)
}
}

void BackTrace::slotProcessExited(KProcess *proc)
void BackTrace::slotProcessExited(TDEProcess *proc)
{
// start it again
kill(m_krashconf->pid(), SIGCONT);


+ 4
- 4
drkonqi/backtrace.h View File

@@ -28,7 +28,7 @@
#ifndef BACKTRACE_H
#define BACKTRACE_H

class KProcess;
class TDEProcess;
class KrashConfig;
class KTempFile;

@@ -52,13 +52,13 @@ signals:
void done(const TQString &); // replaces whole text

protected slots:
void slotProcessExited(KProcess * proc);
void slotReadInput(KProcess * proc, char * buf, int buflen);
void slotProcessExited(TDEProcess * proc);
void slotReadInput(TDEProcess * proc, char * buf, int buflen);

private:
bool usefulBacktrace();
void processBacktrace();
KProcess *m_proc;
TDEProcess *m_proc;
const KrashConfig *m_krashconf;
KTempFile *m_temp;
KTempFile *m_temp_cmd;


+ 1
- 1
drkonqi/debugger.cpp View File

@@ -55,7 +55,7 @@ KrashDebugger :: KrashDebugger (const KrashConfig *krashconf, TQWidget *parent,

m_backtrace = new KTextBrowser(this);
m_backtrace->setTextFormat(TQt::PlainText);
m_backtrace->setFont(KGlobalSettings::fixedFont());
m_backtrace->setFont(TDEGlobalSettings::fixedFont());

TQWidget *w = new TQWidget( this );
( new TQHBoxLayout( w, 0, KDialog::marginHint() ) )->setAutoAdd( true );


+ 1
- 1
drkonqi/krashconf.cpp View File

@@ -88,7 +88,7 @@ void KrashConfig :: readConfig()
KStartupInfo::sendFinish( id );
}

KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
config->setGroup("drkonqi");

// maybe we should check if it's relative?


+ 2
- 2
drkonqi/toplevel.cpp View File

@@ -176,10 +176,10 @@ void Toplevel :: slotUser2()
TQString str = m_krashconf->debugger();
m_krashconf->expandString(str, true);

KProcess proc;
TDEProcess proc;
proc.setUseShell(true);
proc << str;
proc.start(KProcess::DontCare);
proc.start(TDEProcess::DontCare);
}

void Toplevel :: slotNewDebuggingApp(const TQString& launchName)


+ 4
- 4
kappfinder/common.cpp View File

@@ -55,7 +55,7 @@ bool scanDesktopFile( TQPtrList<AppLnkCache> &appCache, const TQString &templ,
// find out where to put the .desktop files
TQString destName;
if ( destDir.isNull() )
destDir = KGlobal::dirs()->saveLocation( "apps" );
destDir = TDEGlobal::dirs()->saveLocation( "apps" );
else
destDir += "/";

@@ -82,7 +82,7 @@ bool scanDesktopFile( TQPtrList<AppLnkCache> &appCache, const TQString &templ,
exec = exec.left( pos );

// try to locate the binary
TQString pexec = KGlobal::dirs()->findExe( exec,
TQString pexec = TDEGlobal::dirs()->findExe( exec,
TQString( ::getenv( "PATH" ) ) + ":/usr/X11R6/bin:/usr/games" );
if ( pexec.isEmpty() ) {
kdDebug(DBG_CODE) << "looking for " << exec.local8Bit()
@@ -134,11 +134,11 @@ void decorateDirs( TQString destDir )
{
// find out where to put the .directory files
if ( destDir.isNull() )
destDir = KGlobal::dirs()->saveLocation( "apps" );
destDir = TDEGlobal::dirs()->saveLocation( "apps" );
else
destDir += "/";

TQStringList dirs = KGlobal::dirs()->findAllResources( "data", "kappfinder/apps/*.directory", true );
TQStringList dirs = TDEGlobal::dirs()->findAllResources( "data", "kappfinder/apps/*.directory", true );

TQStringList::Iterator it;
for ( it = dirs.begin(); it != dirs.end(); ++it ) {


+ 1
- 1
kappfinder/main_install.cpp View File

@@ -42,7 +42,7 @@ int main( int argc, char *argv[] )
return -1;
}

TQStringList templates = KGlobal::dirs()->findAllResources( "data", "kappfinder/apps/*.desktop", true );
TQStringList templates = TDEGlobal::dirs()->findAllResources( "data", "kappfinder/apps/*.desktop", true );

TQString dir = TQString( argv[ 1 ] ) + "/";



+ 2
- 2
kappfinder/toplevel.cpp View File

@@ -161,9 +161,9 @@ TQListViewItem* TopLevel::addGroupItem( TQListViewItem *parent, const TQString &

void TopLevel::slotScan()
{
KIconLoader* loader = KGlobal::iconLoader();
KIconLoader* loader = TDEGlobal::iconLoader();

mTemplates = KGlobal::dirs()->findAllResources( "data", "kappfinder/apps/*.desktop", true );
mTemplates = TDEGlobal::dirs()->findAllResources( "data", "kappfinder/apps/*.desktop", true );

mAppCache.clear();



+ 1
- 1
kate/app/kateapp.cpp View File

@@ -60,7 +60,7 @@ KateApp::KateApp (TDECmdLineArgs *args)
dcopClient()->suspend();

// insert right translations for the katepart
KGlobal::locale()->insertCatalogue("katepart");
TDEGlobal::locale()->insertCatalogue("katepart");

// some global default
Kate::Document::setFileChangedDialogsActivated (true);


+ 1
- 1
kate/app/kateconsole.cpp View File

@@ -70,7 +70,7 @@ void KateConsole::loadConsoleIfNeeded()

setFocusProxy(m_part->widget());

KGlobal::locale()->insertCatalogue("konsole");
TDEGlobal::locale()->insertCatalogue("konsole");

m_part->widget()->show();



+ 10
- 10
kate/app/kategrepdialog.cpp View File

@@ -69,7 +69,7 @@ GrepTool::GrepTool(TQWidget *parent, const char *name)
: TQWidget(parent, name/*, false*/), m_fixFocus(true), childproc(0)
{
setCaption(i18n("Find in Files"));
config = KGlobal::config();
config = TDEGlobal::config();
config->setGroup("GrepTool");
lastSearchItems = config->readListEntry("LastSearchItems");
lastSearchPaths = config->readListEntry("LastSearchPaths");
@@ -351,7 +351,7 @@ void GrepTool::slotSearch()
TQString pattern = leTemplate->text();
pattern.replace( "%s", s );

childproc = new KProcess();
childproc = new TDEProcess();
childproc->setWorkingDirectory( m_workingDir );
*childproc << "find" << ".";
if (!cbRecursive->isChecked())
@@ -377,18 +377,18 @@ void GrepTool::slotSearch()
*childproc << "/dev/null"; //trick to have grep always display the filename
*childproc << ";";

connect( childproc, TQT_SIGNAL(processExited(KProcess *)),
connect( childproc, TQT_SIGNAL(processExited(TDEProcess *)),
TQT_SLOT(childExited()) );
connect( childproc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)),
TQT_SLOT(receivedOutput(KProcess *, char *, int)) );
connect( childproc, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)),
TQT_SLOT(receivedErrOutput(KProcess *, char *, int)) );
connect( childproc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
TQT_SLOT(receivedOutput(TDEProcess *, char *, int)) );
connect( childproc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
TQT_SLOT(receivedErrOutput(TDEProcess *, char *, int)) );

// actually it should be checked whether the process was started successfully
lbResult->setCursor( TQCursor(Qt::WaitCursor) );
btnClear->setEnabled( false );
btnSearch->setGuiItem( KGuiItem(i18n("Cancel"), "button_cancel"));
childproc->start(KProcess::NotifyOnExit, KProcess::AllOutput);
childproc->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput);
}

void GrepTool::slotSearchFor(const TQString &pattern)
@@ -483,13 +483,13 @@ void GrepTool::childExited()
finish();
}

void GrepTool::receivedOutput(KProcess */*proc*/, char *buffer, int buflen)
void GrepTool::receivedOutput(TDEProcess */*proc*/, char *buffer, int buflen)
{
buf += TQCString(buffer, buflen+1);
processOutput();
}

void GrepTool::receivedErrOutput(KProcess */*proc*/, char *buffer, int buflen)
void GrepTool::receivedErrOutput(TDEProcess */*proc*/, char *buffer, int buflen)
{
errbuf += TQCString( buffer, buflen + 1 );
}


+ 4
- 4
kate/app/kategrepdialog.h View File

@@ -30,7 +30,7 @@ class TQCheckBox;
class TQListBox;
class KPushButton;
class TQLabel;
class KProcess;
class TDEProcess;
class KConfig;
class KURLRequester;
class TQEvent;
@@ -64,8 +64,8 @@ protected:
private slots:
void templateActivated(int index);
void childExited();
void receivedOutput(KProcess *proc, char *buffer, int buflen);
void receivedErrOutput(KProcess *proc, char *buffer, int buflen);
void receivedOutput(TDEProcess *proc, char *buffer, int buflen);
void receivedErrOutput(TDEProcess *proc, char *buffer, int buflen);
void itemSelected(const TQString&);
void slotSearch();
void slotCancel();
@@ -82,7 +82,7 @@ private:
TQCheckBox *cbCasesensitive, *cbRegex;
TQListBox *lbResult;
KPushButton *btnSearch, *btnClear;
KProcess *childproc;
TDEProcess *childproc;
TQString buf;
TQString errbuf;
KConfig* config;


+ 1
- 1
kate/app/katemain.h View File

@@ -45,7 +45,7 @@ class KFileViewItem;
class KHistoryCombo;
class KLineEdit;
class KListBox;
class KProcess;
class TDEProcess;
class KPushButton;
class KRecentFilesAction;
class KSelectAction;


+ 3
- 3
kate/app/katemdi.cpp View File

@@ -287,7 +287,7 @@ void Sidebar::setSplitter (Splitter *sp)
{
m_splitter = sp;
m_ownSplit = new Splitter ((position() == KMultiTabBar::Top || position() == KMultiTabBar::Bottom) ? Qt::Horizontal : Qt::Vertical, m_splitter);
m_ownSplit->setOpaqueResize( KGlobalSettings::opaqueResize() );
m_ownSplit->setOpaqueResize( TDEGlobalSettings::opaqueResize() );
m_ownSplit->setChildrenCollapsible( false );
m_splitter->setResizeMode( m_ownSplit, TQSplitter::KeepSize );
m_ownSplit->hide ();
@@ -673,7 +673,7 @@ MainWindow::MainWindow (TQWidget* parentWidget, const char* name)
m_sidebars[KMultiTabBar::Left] = new Sidebar (KMultiTabBar::Left, this, hb);

m_hSplitter = new Splitter (Qt::Horizontal, hb);
m_hSplitter->setOpaqueResize( KGlobalSettings::opaqueResize() );
m_hSplitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() );

m_sidebars[KMultiTabBar::Left]->setSplitter (m_hSplitter);

@@ -683,7 +683,7 @@ MainWindow::MainWindow (TQWidget* parentWidget, const char* name)
m_sidebars[KMultiTabBar::Top] = new Sidebar (KMultiTabBar::Top, this, vb);

m_vSplitter = new Splitter (Qt::Vertical, vb);
m_vSplitter->setOpaqueResize( KGlobalSettings::opaqueResize() );
m_vSplitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() );

m_sidebars[KMultiTabBar::Top]->setSplitter (m_vSplitter);



+ 5
- 5
kate/app/katemwmodonhddialog.cpp View File

@@ -212,16 +212,16 @@ void KateMwModOnHdDialog::slotDiff()
if ( KateDocManager::self()->documentInfo( doc )->modifiedOnDiscReason == 3 )
return;

// Start a KProcess that creates a diff
// Start a TDEProcess that creates a diff
KProcIO *p = new KProcIO();
p->setComm( KProcess::All );
p->setComm( TDEProcess::All );
*p << "diff" << "-u" << "-" << doc->url().path();
connect( p, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotPDone(KProcess*)) );
connect( p, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotPDone(TDEProcess*)) );
connect( p, TQT_SIGNAL(readReady(KProcIO*)), this, TQT_SLOT(slotPRead(KProcIO*)) );

setCursor( WaitCursor );

p->start( KProcess::NotifyOnExit, true );
p->start( TDEProcess::NotifyOnExit, true );

uint lastln = doc->numLines();
for ( uint l = 0; l < lastln; l++ )
@@ -247,7 +247,7 @@ void KateMwModOnHdDialog::slotPRead( KProcIO *p)
p->ackRead();
}

void KateMwModOnHdDialog::slotPDone( KProcess *p )
void KateMwModOnHdDialog::slotPDone( TDEProcess *p )
{
setCursor( ArrowCursor );
if( ! m_tmpfile )


+ 2
- 2
kate/app/katemwmodonhddialog.h View File

@@ -26,7 +26,7 @@

typedef TQPtrVector<Kate::Document> DocVector;
class KProcIO;
class KProcess;
class TDEProcess;
/**
* A dialog for handling multiple documents modified on disk
* from within KateMainWindow
@@ -47,7 +47,7 @@ class KateMwModOnHdDialog : public KDialogBase
void slotDiff();
void slotSelectionChanged();
void slotPRead(KProcIO*);
void slotPDone(KProcess*);
void slotPDone(TDEProcess*);

private:
enum Action { Ignore, Overwrite, Reload };


+ 1
- 1
kate/app/katesavemodifieddialog.cpp View File

@@ -48,7 +48,7 @@ public:
STATE state() const { return m_state;}
void setState(enum STATE state) {
m_state=state;
KIconLoader *loader = KGlobal::instance()->iconLoader();
KIconLoader *loader = TDEGlobal::instance()->iconLoader();
switch (state) {
case InitialState:
setPixmap(0,TQPixmap());


+ 3
- 3
kate/app/katesession.cpp View File

@@ -67,7 +67,7 @@ KateSession::KateSession (KateSessionManager *manager, const TQString &fileName,
void KateSession::init ()
{
// given file exists, use it to load some stuff ;)
if (!m_sessionFileRel.isEmpty() && KGlobal::dirs()->exists(sessionFile ()))
if (!m_sessionFileRel.isEmpty() && TDEGlobal::dirs()->exists(sessionFile ()))
{
KSimpleConfig config (sessionFile (), true);

@@ -146,7 +146,7 @@ bool KateSession::create (const TQString &name, bool force)
KMD5 md5 (tname);
m_sessionFileRel = TQString ("%1.katesession").arg (md5.hexDigest().data());

if (!KGlobal::dirs()->exists(sessionFile ()))
if (!TDEGlobal::dirs()->exists(sessionFile ()))
break;
}

@@ -211,7 +211,7 @@ KateSessionManager::KateSessionManager (TQObject *parent)
kdDebug() << "LOCAL SESSION DIR: " << m_sessionsDir << endl;

// create dir if needed
KGlobal::dirs()->makeDir (m_sessionsDir);
TDEGlobal::dirs()->makeDir (m_sessionsDir);
}

KateSessionManager::~KateSessionManager()


+ 2
- 2
kate/app/kateviewspace.cpp View File

@@ -349,8 +349,8 @@ KateVSStatusBar::~KateVSStatusBar ()
void KateVSStatusBar::setStatus( int r, int c, int ovr, bool block, int, const TQString &msg )
{
m_lineColLabel->setText(
i18n(" Line: %1 Col: %2 ").arg(KGlobal::locale()->formatNumber(r+1, 0))
.arg(KGlobal::locale()->formatNumber(c+1, 0)) );
i18n(" Line: %1 Col: %2 ").arg(TDEGlobal::locale()->formatNumber(r+1, 0))
.arg(TDEGlobal::locale()->formatNumber(c+1, 0)) );

if (ovr == 0)
m_insertModeLabel->setText( i18n(" R/O ") );


+ 1
- 1
kate/app/kateviewspacecontainer.cpp View File

@@ -455,7 +455,7 @@ void KateViewSpaceContainer::splitViewSpace( KateViewSpace* vs,

Qt::Orientation o = isHoriz ? Qt::Vertical : Qt::Horizontal;
KateMDI::Splitter* s = new KateMDI::Splitter(o, vs->parentWidget());
s->setOpaqueResize( KGlobalSettings::opaqueResize() );
s->setOpaqueResize( TDEGlobalSettings::opaqueResize() );

if (! isFirstTime) {
// anders: make sure the split' viewspace is always


+ 1
- 1
kate/app/kwritemain.cpp View File

@@ -593,7 +593,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)

TDEApplication a;

KGlobal::locale()->insertCatalogue("katepart");
TDEGlobal::locale()->insertCatalogue("katepart");

DCOPClient *client = kapp->dcopClient();
if (!client->isRegistered())


+ 1
- 1
kate/utils/messageview.h View File

@@ -36,7 +36,7 @@
@section Usage
To use it in the intended way:
@li Create a KProcess (or derived class)
@li Create a TDEProcess (or derived class)
@li As the output of the process arrives, hand it over
using addText(). The view will add it to the end and
make sure it is scrolled to the end.


+ 5
- 5
kcontrol/access/kaccess.cpp View File

@@ -115,14 +115,14 @@ KAccessApp::KAccessApp(bool allowStyles, bool GUIenabled)

int KAccessApp::newInstance()
{
KGlobal::config()->reparseConfiguration();
TDEGlobal::config()->reparseConfiguration();
readSettings();
return 0;
}

void KAccessApp::readSettings()
{
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();

// bell ---------------------------------------------------------------

@@ -790,7 +790,7 @@ void KAccessApp::applyChanges() {
unsigned int enabled = requestedFeatures & ~features;
unsigned int disabled = features & ~requestedFeatures;

KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
config->setGroup("Keyboard");

if (enabled & XkbSlowKeysMask)
@@ -823,7 +823,7 @@ void KAccessApp::yesClicked() {
dialog->deleteLater();
dialog = 0;

KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
config->setGroup("Keyboard");
switch (showModeCombobox->currentItem()) {
case 0:
@@ -854,7 +854,7 @@ void KAccessApp::noClicked() {
dialog = 0;
requestedFeatures = features;

KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
config->setGroup("Keyboard");
switch (showModeCombobox->currentItem()) {
case 0:


+ 1
- 1
kcontrol/access/kcmaccess.cpp View File

@@ -578,7 +578,7 @@ void KAccessConfig::changeFlashScreenColor()

void KAccessConfig::selectSound()
{
TQStringList list = KGlobal::dirs()->findDirs("sound", "");
TQStringList list = TDEGlobal::dirs()->findDirs("sound", "");
TQString start;
if (list.count()>0)
start = list[0];


+ 19
- 19
kcontrol/arts/arts.cpp View File

@@ -57,7 +57,7 @@ extern "C" {

KDE_EXPORT KCModule *create_arts(TQWidget *parent, const char* /*name*/)
{
KGlobal::locale()->insertCatalogue("kcmarts");
TDEGlobal::locale()->insertCatalogue("kcmarts");
return new KArtsModule(parent, "kcmarts" );
}
}
@@ -96,16 +96,16 @@ static bool startArts()
*/
void KArtsModule::initAudioIOList()
{
KProcess* artsd = new KProcess();
TDEProcess* artsd = new TDEProcess();
*artsd << "artsd";
*artsd << "-A";

connect(artsd, TQT_SIGNAL(processExited(KProcess*)),
this, TQT_SLOT(slotArtsdExited(KProcess*)));
connect(artsd, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)),
this, TQT_SLOT(slotProcessArtsdOutput(KProcess*, char*, int)));
connect(artsd, TQT_SIGNAL(processExited(TDEProcess*)),
this, TQT_SLOT(slotArtsdExited(TDEProcess*)));
connect(artsd, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
this, TQT_SLOT(slotProcessArtsdOutput(TDEProcess*, char*, int)));

if (!artsd->start(KProcess::Block, KProcess::Stderr)) {
if (!artsd->start(TDEProcess::Block, TDEProcess::Stderr)) {
KMessageBox::error(0, i18n("Unable to start the sound server to "
"retrieve possible sound I/O methods.\n"
"Only automatic detection will be "
@@ -114,13 +114,13 @@ void KArtsModule::initAudioIOList()
}
}

void KArtsModule::slotArtsdExited(KProcess* proc)
void KArtsModule::slotArtsdExited(TDEProcess* proc)
{
latestProcessStatus = proc->exitStatus();
delete proc;
}

void KArtsModule::slotProcessArtsdOutput(KProcess*, char* buf, int len)
void KArtsModule::slotProcessArtsdOutput(TDEProcess*, char* buf, int len)
{
// XXX(gioele): I suppose this will be called with full lines, am I wrong?

@@ -438,10 +438,10 @@ void KArtsModule::slotTestSound()
if (configChanged && (userSavedChanges() == KMessageBox::Yes) || !artsdIsRunning() )
restartServer();

KProcess test;
TDEProcess test;
test << "artsplay";
test << locate("sound", "KDE_Startup_1.ogg");
test.start(KProcess::DontCare);
test.start(TDEProcess::DontCare);
}

void KArtsModule::defaults()
@@ -538,13 +538,13 @@ bool KArtsModule::realtimeIsPossible()
static bool checked = false;
if (!checked)
{
KProcess* checkProcess = new KProcess();
TDEProcess* checkProcess = new TDEProcess();
*checkProcess << "artswrapper";
*checkProcess << "check";

connect(checkProcess, TQT_SIGNAL(processExited(KProcess*)),
this, TQT_SLOT(slotArtsdExited(KProcess*)));
if (!checkProcess->start(KProcess::Block))
connect(checkProcess, TQT_SIGNAL(processExited(TDEProcess*)),
this, TQT_SLOT(slotArtsdExited(TDEProcess*)));
if (!checkProcess->start(TDEProcess::Block))
{
delete checkProcess;
realtimePossible = false;
@@ -574,10 +574,10 @@ void KArtsModule::restartServer()
DCOPRef("knotify", "qt/knotify").send("quit");

// Shut down artsd
KProcess terminateArts;
TDEProcess terminateArts;
terminateArts << "artsshell";
terminateArts << "terminate";
terminateArts.start(KProcess::Block);
terminateArts.start(TDEProcess::Block);

if (starting)
{
@@ -594,10 +594,10 @@ void KArtsModule::restartServer()

bool KArtsModule::artsdIsRunning()
{
KProcess check;
TDEProcess check;
check << "artsshell";
check << "status";
check.start(KProcess::Block);
check.start(TDEProcess::Block);

return (check.exitStatus() == 0);
}


+ 3
- 3
kcontrol/arts/arts.h View File

@@ -43,7 +43,7 @@
#include "hardwaretab.h"


class KProcess;
class TDEProcess;
class DeviceManager;

class KArtsModule : public KCModule
@@ -67,8 +67,8 @@ private slots:

void slotChanged();
void slotTestSound();
void slotArtsdExited(KProcess* proc);
void slotProcessArtsdOutput(KProcess* p, char* buf, int len);
void slotArtsdExited(TDEProcess* proc);
void slotProcessArtsdOutput(TDEProcess* p, char* buf, int len);
//void slotStartServerChanged();

private:


+ 2
- 2
kcontrol/arts/krichtextlabel.cpp View File

@@ -40,14 +40,14 @@ static TQString qrichtextify( const TQString& text )

KRichTextLabel::KRichTextLabel( const TQString &text , TQWidget *parent, const char *name )
: TQLabel ( parent, name ) {
m_defaultWidth = TQMIN(500, KGlobalSettings::desktopGeometry(this).width()*3/5);
m_defaultWidth = TQMIN(500, TDEGlobalSettings::desktopGeometry(this).width()*3/5);
setAlignment( TQt::WordBreak );
setText(text);
}

KRichTextLabel::KRichTextLabel( TQWidget *parent, const char *name )
: TQLabel ( parent, name ) {
m_defaultWidth = TQMIN(500, KGlobalSettings::desktopGeometry(this).width()*3/5);
m_defaultWidth = TQMIN(500, TDEGlobalSettings::desktopGeometry(this).width()*3/5);
setAlignment( TQt::WordBreak );
}



+ 5
- 5
kcontrol/background/bgdialog.cpp View File

@@ -69,8 +69,8 @@
BGDialog::BGDialog(TQWidget* parent, KConfig* _config, bool _multidesktop)
: BGDialog_UI(parent, "BGDialog")
{
m_pGlobals = new KGlobalBackgroundSettings(_config);
m_pDirs = KGlobal::dirs();
m_pGlobals = new TDEGlobalBackgroundSettings(_config);
m_pDirs = TDEGlobal::dirs();
m_multidesktop = _multidesktop;
m_previewUpdates = true;
@@ -246,7 +246,7 @@ BGDialog::BGDialog(TQWidget* parent, KConfig* _config, bool _multidesktop)
if (m_wallpaperPos == KBackgroundSettings::NoWallpaper)
m_wallpaperPos = KBackgroundSettings::Centred; // Default

if (KGlobal::dirs()->isRestrictedResource("wallpaper"))
if (TDEGlobal::dirs()->isRestrictedResource("wallpaper"))
{
m_urlWallpaperButton->hide();
m_buttonSetupWallpapers->hide();
@@ -407,7 +407,7 @@ void BGDialog::slotIdentifyScreens()
{
TQLabel *screenLabel = new TQLabel(0,"Screen Identify", (WFlags)(WDestructiveClose | WStyle_Customize | WX11BypassWM));

TQFont identifyFont(KGlobalSettings::generalFont());
TQFont identifyFont(TDEGlobalSettings::generalFont());
identifyFont.setPixelSize(100);
screenLabel->setFont(identifyFont);

@@ -1244,7 +1244,7 @@ void BGDialog::slotGetNewStuff()
//FIXME set this to a server when we get one
//should really be in a .rc file but could be either
//kcmshellrc or kcontrolrc
KConfig* config = KGlobal::config();
KConfig* config = TDEGlobal::config();
config->setGroup("KNewStuff");
config->writeEntry( "ProvidersUrl", "http://download.kde.org/khotnewstuff/wallpaper-providers.xml" );
config->writeEntry( "StandardResource", "wallpaper" );


+ 1
- 1
kcontrol/background/bgdialog.h View File

@@ -83,7 +83,7 @@ protected slots:

protected:
void getEScreen();
KGlobalBackgroundSettings *m_pGlobals;
TDEGlobalBackgroundSettings *m_pGlobals;
KStandardDirs *m_pDirs;
bool m_multidesktop;
bool m_useViewports;


+ 4
- 4
kcontrol/background/bgrender.cpp View File

@@ -53,7 +53,7 @@ KBackgroundRenderer::KBackgroundRenderer(int desk, int screen, bool drawBackgrou
m_State = 0;
m_isBusyCursor = false;
m_enableBusyCursor = false;
m_pDirs = KGlobal::dirs();
m_pDirs = TDEGlobal::dirs();
m_rSize = m_Size = drawBackgroundPerScreen ? TDEApplication::desktop()->screenGeometry(screen).size() : TDEApplication::desktop()->geometry().size();
m_pProc = 0L;
m_Tempfile = 0L;
@@ -238,8 +238,8 @@ int KBackgroundRenderer::doBackground(bool quit)
delete m_pProc;
m_pProc = new KShellProcess;
*m_pProc << file;
connect(m_pProc, TQT_SIGNAL(processExited(KProcess *)),
TQT_SLOT(slotBackgroundDone(KProcess *)));
connect(m_pProc, TQT_SIGNAL(processExited(TDEProcess *)),
TQT_SLOT(slotBackgroundDone(TDEProcess *)));
m_pProc->start(KShellProcess::NotifyOnExit);
retval = Wait;
break;
@@ -741,7 +741,7 @@ void KBackgroundRenderer::blend(TQImage& dst, TQRect dr, const TQImage& src, TQP



void KBackgroundRenderer::slotBackgroundDone(KProcess *process)
void KBackgroundRenderer::slotBackgroundDone(TDEProcess *process)
{
Q_ASSERT(process == m_pProc);
m_State |= BackgroundDone;


+ 2
- 2
kcontrol/background/bgrender.h View File

@@ -24,7 +24,7 @@ class TQString;
class TQTimer;

class KConfig;
class KProcess;
class TDEProcess;
class KTempFile;
class KShellProcess;
class KStandardDirs;
@@ -68,7 +68,7 @@ signals:
void programSuccess(int desk); //programSuccess is emitted after imageDone

private slots:
void slotBackgroundDone(KProcess *);
void slotBackgroundDone(TDEProcess *);
void render();
void done();



+ 27
- 27
kcontrol/background/bgsettings.cpp View File

@@ -42,7 +42,7 @@ KBackgroundPattern::KBackgroundPattern(TQString name)
dirty = false;
hashdirty = true;

m_pDirs = KGlobal::dirs();
m_pDirs = TDEGlobal::dirs();
m_pDirs->addResourceType("dtop_pattern", m_pDirs->kde_default("data") +
"kdesktop/patterns");
m_pConfig = 0L;
@@ -182,7 +182,7 @@ int KBackgroundPattern::hash()
/* static */
TQStringList KBackgroundPattern::list()
{
KStandardDirs *dirs = KGlobal::dirs();
KStandardDirs *dirs = TDEGlobal::dirs();
dirs->addResourceType("dtop_pattern", dirs->kde_default("data") +
"kdesktop/patterns");
TQStringList lst = dirs->findAllResources("dtop_pattern", "*.desktop",
@@ -209,7 +209,7 @@ KBackgroundProgram::KBackgroundProgram(TQString name)
dirty = false;
hashdirty = true;

m_pDirs = KGlobal::dirs();
m_pDirs = TDEGlobal::dirs();
m_pDirs->addResourceType("dtop_program", m_pDirs->kde_default("data") +
"kdesktop/programs");
m_pConfig = 0L;
@@ -393,7 +393,7 @@ int KBackgroundProgram::hash()
/* static */
TQStringList KBackgroundProgram::list()
{
KStandardDirs *dirs = KGlobal::dirs();
KStandardDirs *dirs = TDEGlobal::dirs();
dirs->addResourceType("dtop_program", dirs->kde_default("data") +
"kdesktop/programs");
TQStringList lst = dirs->findAllResources("dtop_program", "*.desktop",
@@ -489,7 +489,7 @@ KBackgroundSettings::KBackgroundSettings(int desk, int screen, bool drawBackgrou
ADD_STRING(NoMultiRandom)
#undef ADD_STRING

m_pDirs = KGlobal::dirs();
m_pDirs = TDEGlobal::dirs();

if (!config) {
int screen_number = 0;
@@ -651,7 +651,7 @@ void KBackgroundSettings::setWallpaperMode(int mode)

void KBackgroundSettings::setWallpaperList(TQStringList list)
{
KStandardDirs *d = KGlobal::dirs();
KStandardDirs *d = TDEGlobal::dirs();
if (m_WallpaperList == list)
return;

@@ -1029,7 +1029,7 @@ TQString KBackgroundSettings::fingerprint()
s += TQString("wm:%1;").arg(m_WallpaperMode);
if (m_WallpaperMode != NoWallpaper)
{
TQ_UINT32 rh = KGlobal::dirs()->calcResourceHash("wallpaper", currentWallpaper(), false);
TQ_UINT32 rh = TDEGlobal::dirs()->calcResourceHash("wallpaper", currentWallpaper(), false);
s += TQString("wp:%2:%1;").arg(rh).arg(currentWallpaper());
}
@@ -1063,9 +1063,9 @@ void KBackgroundSettings::setEnabled(const bool enable)
hashdirty = true;
}

/**** KGlobalBackgroundSettings ****/
/**** TDEGlobalBackgroundSettings ****/

KGlobalBackgroundSettings::KGlobalBackgroundSettings(KConfig *_config)
TDEGlobalBackgroundSettings::TDEGlobalBackgroundSettings(KConfig *_config)
{
m_pConfig = _config;

@@ -1073,14 +1073,14 @@ KGlobalBackgroundSettings::KGlobalBackgroundSettings(KConfig *_config)
}


TQString KGlobalBackgroundSettings::deskName(int desk)
TQString TDEGlobalBackgroundSettings::deskName(int desk)
{
return m_Names[desk];
}


/*
void KGlobalBackgroundSettings::setDeskName(int desk, TQString name)
void TDEGlobalBackgroundSettings::setDeskName(int desk, TQString name)
{
if (name == m_Names[desk])
return;
@@ -1090,7 +1090,7 @@ void KGlobalBackgroundSettings::setDeskName(int desk, TQString name)
*/


void KGlobalBackgroundSettings::setCacheSize(int size)
void TDEGlobalBackgroundSettings::setCacheSize(int size)
{
if (size == m_CacheSize)
return;
@@ -1099,7 +1099,7 @@ void KGlobalBackgroundSettings::setCacheSize(int size)
}


void KGlobalBackgroundSettings::setLimitCache(bool limit)
void TDEGlobalBackgroundSettings::setLimitCache(bool limit)
{
if (limit == m_bLimitCache)
return;
@@ -1108,7 +1108,7 @@ void KGlobalBackgroundSettings::setLimitCache(bool limit)
}


bool KGlobalBackgroundSettings::drawBackgroundPerScreen(int desk) const
bool TDEGlobalBackgroundSettings::drawBackgroundPerScreen(int desk) const
{
if ( desk > int(m_bDrawBackgroundPerScreen.size()) )
return _defDrawBackgroundPerScreen;
@@ -1116,7 +1116,7 @@ bool KGlobalBackgroundSettings::drawBackgroundPerScreen(int desk) const
}


void KGlobalBackgroundSettings::setDrawBackgroundPerScreen(int desk, bool perScreen)
void TDEGlobalBackgroundSettings::setDrawBackgroundPerScreen(int desk, bool perScreen)
{
if ( desk >= int(m_bDrawBackgroundPerScreen.size()) )
return;
@@ -1129,7 +1129,7 @@ void KGlobalBackgroundSettings::setDrawBackgroundPerScreen(int desk, bool perScr
}


void KGlobalBackgroundSettings::setCommonScreenBackground(bool common)
void TDEGlobalBackgroundSettings::setCommonScreenBackground(bool common)
{
if (common == m_bCommonScreen)
return;
@@ -1138,7 +1138,7 @@ void KGlobalBackgroundSettings::setCommonScreenBackground(bool common)
}


void KGlobalBackgroundSettings::setCommonDeskBackground(bool common)
void TDEGlobalBackgroundSettings::setCommonDeskBackground(bool common)
{
if (common == m_bCommonDesk)
return;
@@ -1147,7 +1147,7 @@ void KGlobalBackgroundSettings::setCommonDeskBackground(bool common)
}


void KGlobalBackgroundSettings::setDockPanel(bool dock)
void TDEGlobalBackgroundSettings::setDockPanel(bool dock)
{
if (dock == m_bDock)
return;
@@ -1156,7 +1156,7 @@ void KGlobalBackgroundSettings::setDockPanel(bool dock)
}


void KGlobalBackgroundSettings::setExportBackground(bool _export)
void TDEGlobalBackgroundSettings::setExportBackground(bool _export)
{
if (_export == m_bExport)
return;
@@ -1164,7 +1164,7 @@ void KGlobalBackgroundSettings::setExportBackground(bool _export)
m_bExport = _export;
}

void KGlobalBackgroundSettings::setTextColor(TQColor _color)
void TDEGlobalBackgroundSettings::setTextColor(TQColor _color)
{
if (_color == m_TextColor)
return;
@@ -1172,7 +1172,7 @@ void KGlobalBackgroundSettings::setTextColor(TQColor _color)
m_TextColor = _color;
}

void KGlobalBackgroundSettings::setTextBackgroundColor(TQColor _color)
void TDEGlobalBackgroundSettings::setTextBackgroundColor(TQColor _color)
{
if (_color == m_TextBackgroundColor)
return;
@@ -1180,7 +1180,7 @@ void KGlobalBackgroundSettings::setTextBackgroundColor(TQColor _color)
m_TextBackgroundColor = _color;
}

void KGlobalBackgroundSettings::setShadowEnabled(bool enabled)
void TDEGlobalBackgroundSettings::setShadowEnabled(bool enabled)
{
if (enabled == m_shadowEnabled)
return;
@@ -1188,7 +1188,7 @@ void KGlobalBackgroundSettings::setShadowEnabled(bool enabled)
m_shadowEnabled = enabled;
}

void KGlobalBackgroundSettings::setTextLines(int lines)
void TDEGlobalBackgroundSettings::setTextLines(int lines)
{
if (lines == m_textLines)
return;
@@ -1196,7 +1196,7 @@ void KGlobalBackgroundSettings::setTextLines(int lines)
m_textLines = lines;
}

void KGlobalBackgroundSettings::setTextWidth(int width)
void TDEGlobalBackgroundSettings::setTextWidth(int width)
{
if (width == m_textWidth)
return;
@@ -1204,7 +1204,7 @@ void KGlobalBackgroundSettings::setTextWidth(int width)
m_textWidth = width;
}

void KGlobalBackgroundSettings::readSettings()
void TDEGlobalBackgroundSettings::readSettings()
{
m_pConfig->setGroup("Background Common");
m_bCommonScreen = m_pConfig->readBoolEntry("CommonScreen", _defCommonScreen);
@@ -1220,7 +1220,7 @@ void KGlobalBackgroundSettings::readSettings()
for ( int i = 0 ; i < info.numberOfDesktops() ; ++i )
m_bDrawBackgroundPerScreen[i] = m_pConfig->readBoolEntry( TQString("DrawBackgroundPerScreen_%1").arg(i), _defDrawBackgroundPerScreen );

m_TextColor = KGlobalSettings::textColor();
m_TextColor = TDEGlobalSettings::textColor();
m_pConfig->setGroup("FMSettings");
m_TextColor = m_pConfig->readColorEntry("NormalTextColor", &m_TextColor);
m_TextBackgroundColor = m_pConfig->readColorEntry("ItemTextBackground");
@@ -1234,7 +1234,7 @@ void KGlobalBackgroundSettings::readSettings()
dirty = false;
}

void KGlobalBackgroundSettings::writeSettings()
void TDEGlobalBackgroundSettings::writeSettings()
{
if (!dirty)
return;


+ 2
- 2
kcontrol/background/bgsettings.h View File

@@ -302,10 +302,10 @@ public:
/**
* A class to read/modify the global desktop background settings.
*/
class KGlobalBackgroundSettings
class TDEGlobalBackgroundSettings
{
public:
KGlobalBackgroundSettings(KConfig *config);
TDEGlobalBackgroundSettings(KConfig *config);

TQString deskName(int desk);
//void setDeskName(int desk, TQString name);


+ 1
- 1
kcontrol/background/bgwallpaper.cpp View File

@@ -149,7 +149,7 @@ void BGMultiWallpaperDialog::slotAdd()
mimeTypes += "image/svg+xml";
#endif

KFileDialog fileDialog(KGlobal::dirs()->findDirs("wallpaper", "").first(),
KFileDialog fileDialog(TDEGlobal::dirs()->findDirs("wallpaper", "").first(),
mimeTypes.join( " " ), this,
0L, true);



+ 9
- 9
kcontrol/clock/dtime.cpp View File

@@ -195,9 +195,9 @@ void Dtime::serverTimeCheck() {
}

void Dtime::findNTPutility(){
KProcess proc;
TDEProcess proc;
proc << "which" << "ntpdate";
proc.start(KProcess::Block);
proc.start(TDEProcess::Block);
if(proc.exitStatus() == 0) {
ntpUtility = "ntpdate";
kdDebug() << "ntpUtility = " << ntpUtility.latin1() << endl;
@@ -205,7 +205,7 @@ void Dtime::findNTPutility(){
}
proc.clearArguments();
proc << "which" << "rdate";
proc.start(KProcess::Block);
proc.start(TDEProcess::Block);
if(proc.exitStatus() == 0) {
ntpUtility = "rdate";
kdDebug() << "ntpUtility = " << ntpUtility.latin1() << endl;
@@ -289,9 +289,9 @@ void Dtime::save()
timeServer.replace( TQRegExp("\\).*"), "" );
// Would this be better?: s/^.*\(([^)]*)\).*$/\1/
}
KProcess proc;
TDEProcess proc;
proc << ntpUtility << timeServer;
proc.start( KProcess::Block );
proc.start( TDEProcess::Block );
if( proc.exitStatus() != 0 ){
KMessageBox::error( this, i18n(TQString("Unable to contact time server: %1.").arg(timeServer).latin1()));
setDateTimeAuto->setChecked( false );
@@ -303,7 +303,7 @@ void Dtime::save()
}
else {
// User time setting
KProcess c_proc;
TDEProcess c_proc;

// BSD systems reverse year compared to Susv3
#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
@@ -321,7 +321,7 @@ void Dtime::save()
kdDebug() << "Set date " << BufS << endl;

c_proc << "date" << BufS;
c_proc.start( KProcess::Block );
c_proc.start( TDEProcess::Block );
int result = c_proc.exitStatus();
if (result != 0
#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
@@ -333,9 +333,9 @@ void Dtime::save()
}

// try to set hardware clock. We do not care if it fails
KProcess hwc_proc;
TDEProcess hwc_proc;
hwc_proc << "hwclock" << "--systohc";
hwc_proc.start(KProcess::Block);
hwc_proc.start(TDEProcess::Block);
}

// restart time


+ 1
- 1
kcontrol/clock/main.cpp View File

@@ -57,7 +57,7 @@ KclockModule::KclockModule(TQWidget *parent, const char *name, const TQStringLis
" the root password, but feel the system time should be corrected, please contact your system"
" administrator."));

KGlobal::locale()->insertCatalogue("timezones"); // For time zone translations
TDEGlobal::locale()->insertCatalogue("timezones"); // For time zone translations

TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint());



+ 8
- 8
kcontrol/colors/colorscm.cpp View File

@@ -308,7 +308,7 @@ void KColorScheme::load()
}
void KColorScheme::load( bool useDefaults )
{
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
config->setReadDefaults( useDefaults );
config->setGroup("KDE");
sCurrentScheme = config->readEntry("colorScheme");
@@ -335,7 +335,7 @@ void KColorScheme::load( bool useDefaults )

void KColorScheme::save()
{
KConfig *cfg = KGlobal::config();
KConfig *cfg = TDEGlobal::config();
cfg->setGroup( "General" );
cfg->writeEntry("background", cs->back, true, true);
cfg->writeEntry("selectBackground", cs->select, true, true);
@@ -560,7 +560,7 @@ void KColorScheme::slotAdd()
}
else
{
sFile = KGlobal::dirs()->saveLocation("data", "kdisplay/color-schemes/") + sFile + ".kcsrc";
sFile = TDEGlobal::dirs()->saveLocation("data", "kdisplay/color-schemes/") + sFile + ".kcsrc";
KSimpleConfig *config = new KSimpleConfig(sFile);
config->setGroup( "Color Scheme");
config->writeEntry("Name", sName);
@@ -676,11 +676,11 @@ void KColorScheme::slotSelectColor(const TQColor &col)
// of course
if ( selection == CSM_Standard_background &&
color(CSM_Alternate_background) ==
KGlobalSettings::calculateAlternateBackgroundColor(
TDEGlobalSettings::calculateAlternateBackgroundColor(
color(CSM_Standard_background) ) )
{
color(CSM_Alternate_background) =
KGlobalSettings::calculateAlternateBackgroundColor( col );
TDEGlobalSettings::calculateAlternateBackgroundColor( col );
}

color(selection) = col;
@@ -791,7 +791,7 @@ void KColorScheme::readScheme( int index )

if (index == 0) {
// Current scheme
config = KGlobal::config();
config = TDEGlobal::config();
config->setGroup("General");
} else {
// Open scheme file
@@ -818,7 +818,7 @@ void KColorScheme::readScheme( int index )
cs->buttonTxt = config->readColorEntry( "buttonForeground", &black );
cs->link = config->readColorEntry( "linkColor", &link );
cs->visitedLink = config->readColorEntry( "visitedLinkColor", &visitedLink );
TQColor alternate = KGlobalSettings::calculateAlternateBackgroundColor(cs->window);
TQColor alternate = TDEGlobalSettings::calculateAlternateBackgroundColor(cs->window);
cs->alternateBackground = config->readColorEntry( "alternateBackground", &alternate );

if (index == 0)
@@ -860,7 +860,7 @@ void KColorScheme::readSchemeNames()
nSysSchemes = 2;

// Global + local schemes
TQStringList list = KGlobal::dirs()->findAllResources("data",
TQStringList list = TDEGlobal::dirs()->findAllResources("data",
"kdisplay/color-schemes/*.kcsrc", false, true);

// And add them


+ 3
- 3
kcontrol/colors/widgetcanvas.cpp View File

@@ -282,14 +282,14 @@ void WidgetCanvas::drawSampleWidgets()

// Keep in sync with kglobalsettings.

TQFont windowFontGuess(KGlobalSettings::generalFont().family(), 12, TQFont::SansSerif, true);
TQFont windowFontGuess(TDEGlobalSettings::generalFont().family(), 12, TQFont::SansSerif, true);
windowFontGuess.setPixelSize(12);

c->setGroup("WM");
TQFont windowFont = c->readFontEntry("activeFont", &windowFontGuess);

c->setGroup("General");
TQFont defaultMenuFont = KGlobalSettings::menuFont();
TQFont defaultMenuFont = TDEGlobalSettings::menuFont();
TQFont menuFont = c->readFontEntry("menuFont", &defaultMenuFont);

delete c;
@@ -468,7 +468,7 @@ void WidgetCanvas::drawSampleWidgets()
height(), cg, TRUE, 2, &brush);

// Standard text
TQFont fnt = KGlobalSettings::generalFont();
TQFont fnt = TDEGlobalSettings::generalFont();
paint.setFont( fnt );
paint.setPen( windowTxt );
paint.drawText( 140, 127-20, i18n( "Standard text") );


+ 3
- 3
kcontrol/componentchooser/componentchooser.cpp View File

@@ -169,7 +169,7 @@ void CfgEmailClient::selectEmailClient()
TQString client = dlg.text();

// get the preferred Terminal Application
KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") );
KConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") );
TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::fromLatin1("konsole"));
preferredTerminal += TQString::fromLatin1(" -e ");
@@ -198,7 +198,7 @@ void CfgEmailClient::save(KConfig *)
}

// insure proper permissions -- contains sensitive data
TQString cfgName(KGlobal::dirs()->findResource("config", "emails"));
TQString cfgName(TDEGlobal::dirs()->findResource("config", "emails"));
if (!cfgName.isEmpty())
::chmod(TQFile::encodeName(cfgName), 0600);

@@ -386,7 +386,7 @@ ComponentChooser::ComponentChooser(TQWidget *parent, const char *name):
latestEditedService="";

TQStringList dummy;
TQStringList services=KGlobal::dirs()->findAllResources( "data","kcm_componentchooser/*.desktop",false,true,dummy);
TQStringList services=TDEGlobal::dirs()->findAllResources( "data","kcm_componentchooser/*.desktop",false,true,dummy);
for (TQStringList::Iterator it=services.begin();it!=services.end();++it)
{
KSimpleConfig cfg(*it);


+ 1
- 1
kcontrol/componentchooser/kcm_componentchooser.cpp View File

@@ -57,7 +57,7 @@ extern "C"
{
KDE_EXPORT KCModule *create_componentchooser( TQWidget *parent, const char * )
{
KGlobal::locale()->insertCatalogue("kcmcomponentchooser");
TDEGlobal::locale()->insertCatalogue("kcmcomponentchooser");
return new KCMComponentChooser( parent, "kcmcomponentchooser" );
}
}


+ 7
- 7
kcontrol/crypto/crypto.cpp View File

@@ -1227,7 +1227,7 @@ void KCryptoConfig::save()
authcfg->sync();

// insure proper permissions -- contains sensitive data
TQString cfgName(KGlobal::dirs()->findResource("config", "cryptodefaults"));
TQString cfgName(TDEGlobal::dirs()->findResource("config", "cryptodefaults"));
if (!cfgName.isEmpty())
::chmod(TQFile::encodeName(cfgName), 0600);

@@ -1471,7 +1471,7 @@ TQDateTime qdt = x->getExpires();
int rc = kdtd.exec();
if (rc == KDialog::Accepted) {
x->setExpires(kdtd.getDateTime());
untilDate->setText(KGlobal::locale()->formatDateTime(x->getExpires()));
untilDate->setText(TDEGlobal::locale()->formatDateTime(x->getExpires()));
configChanged();
}
}
@@ -1517,8 +1517,8 @@ TQString iss = TQString();

validFrom->setText(cert->getNotBefore());
validUntil->setText(cert->getNotAfter());
untilDate->setText(x ? KGlobal::locale()->formatDateTime(x->getExpires())
: KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime(Qt::UTC)));
untilDate->setText(x ? TDEGlobal::locale()->formatDateTime(x->getExpires())
: TDEGlobal::locale()->formatDateTime(TQDateTime::currentDateTime(Qt::UTC)));
untilDate->setEnabled(x && !x->isPermanent());
pHash->setText(cert->getMD5DigestText());
delete cert;
@@ -2024,11 +2024,11 @@ void KCryptoConfig::slotCAImport() {
void KCryptoConfig::offerImportToKMail( const TQString& certFile )
{
if ( KMessageBox::questionYesNo( this, i18n( "Do you want to make this certificate available to KMail as well?" ), TQString(), i18n("Make Available"), i18n("Do Not Make Available") ) == KMessageBox::Yes ) {
KProcess proc;
TDEProcess proc;
proc << "kleopatra";
proc << "--import-certificate";
proc << certFile;
if ( !proc.start( KProcess::DontCare ) )
if ( !proc.start( TDEProcess::DontCare ) )
KMessageBox::error( this, i18n( "Could not execute Kleopatra. You might have to install or update the tdepim package." ) );
}
}
@@ -2054,7 +2054,7 @@ void KCryptoConfig::slotCARestore() {

// For now, we just rm the existing file and rebuild

TQString path = KGlobal::dirs()->saveLocation("config");
TQString path = TDEGlobal::dirs()->saveLocation("config");

path += "/ksslcalist";



+ 1
- 1
kcontrol/css/kcmcss.cpp View File

@@ -371,7 +371,7 @@ void CSSConfig::slotPreview()
// Show the preview
PreviewDialog *dlg = new PreviewDialog(this, 0, true);
dlg->preview->setPaper(back);
dlg->preview->viewport()->setFont(TQFont(KGlobalSettings::generalFont().family(), bfs));
dlg->preview->viewport()->setFont(TQFont(TDEGlobalSettings::generalFont().family(), bfs));

dlg->exec();



+ 1
- 1
kcontrol/displayconfig/displayconfig.cpp View File

@@ -742,7 +742,7 @@ void KDisplayConfig::setRealResolutionSliderValue(int index) {
KDisplayConfig::KDisplayConfig(TQWidget *parent, const char *name, const TQStringList &)
: KCModule(KDisplayCFactory::instance(), parent, name), iccTab(0), numberOfProfiles(0), numberOfScreens(0), m_randrsimple(0), activeProfileName(""), m_gammaApplyTimer(0)
{
TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices();
TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(deviceChanged(TDEGenericDevice*)));

m_randrsimple = new KRandrSimpleAPI();


+ 3
- 3
kcontrol/dnssd/kcmdnssd.cpp View File

@@ -95,7 +95,7 @@ void KCMDnssd::save()

TQString scaryMessage = i18n("Enabling local network browsing will open a network port (5353) on your computer. If security problems are discovered in the zeroconf server, remote attackers could access your computer as the \"avahi\" user.");

KProcess *proc = new KProcess;
TDEProcess *proc = new TDEProcess;

*proc << "tdesu";

@@ -103,13 +103,13 @@ void KCMDnssd::save()
if (KMessageBox::warningYesNo( this, scaryMessage, i18n("Enable Zeroconf Network Browsing"), KGuiItem(i18n("Enable Browsing")), KGuiItem(i18n("Don't Enable Browsing")) ) == KMessageBox::Yes) {

*proc << "/usr/share/avahi/enable_avahi 1";
proc->start(KProcess::Block);
proc->start(TDEProcess::Block);
} else {
enableZeroconf->setChecked(false);
}
} else {
*proc << "/usr/share/avahi/enable_avahi 0";
proc->start(KProcess::Block);
proc->start(TDEProcess::Block);
}
}
setCursor(TQCursor(Qt::ArrowCursor));


+ 1
- 1
kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp View File

@@ -50,7 +50,7 @@ SearchProviderDialog::SearchProviderDialog(SearchProvider *provider,
connect(m_dlg->leShortcut, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(slotChanged()));

// Data init
TQStringList charsets = KGlobal::charsets()->availableEncodingNames();
TQStringList charsets = TDEGlobal::charsets()->availableEncodingNames();
charsets.prepend(i18n("Default"));
m_dlg->cbCharset->insertStringList(charsets);



+ 5
- 5
kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp View File

@@ -82,11 +82,11 @@ bool LocalDomainURIFilter::isLocalDomainHost( TQString& cmd ) const

m_fullname = TQString::null;

KProcess proc;
TDEProcess proc;
proc << helper << host;
connect( &proc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)),
TQT_SLOT(receiveOutput(KProcess *, char *, int)) );
if( !proc.start( KProcess::NotifyOnExit, KProcess::Stdout ))
connect( &proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
TQT_SLOT(receiveOutput(TDEProcess *, char *, int)) );
if( !proc.start( TDEProcess::NotifyOnExit, TDEProcess::Stdout ))
return last_result = false;

last_host = host;
@@ -101,7 +101,7 @@ bool LocalDomainURIFilter::isLocalDomainHost( TQString& cmd ) const
return last_result;
}

void LocalDomainURIFilter::receiveOutput( KProcess *, char *buf, int )
void LocalDomainURIFilter::receiveOutput( TDEProcess *, char *buf, int )
{
m_fullname = TQFile::decodeName( buf );
}


+ 2
- 2
kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.h View File

@@ -29,7 +29,7 @@
#include <tqregexp.h>

class TDEInstance;
class KProcess;
class TDEProcess;

/*
This filter takes care of hostnames in the local search domain.
@@ -59,7 +59,7 @@ class LocalDomainURIFilter : public KURIFilterPlugin, public DCOPObject
TQRegExp m_hostPortPattern;

private slots:
void receiveOutput( KProcess *, char *, int );
void receiveOutput( TDEProcess *, char *, int );
};

#endif

+ 4
- 4
kcontrol/fonts/fonts.cpp View File

@@ -162,7 +162,7 @@ void FontUseItem::readFont( bool useDefaults )

bool deleteme = false;
if (_rcfile.isEmpty())
config = KGlobal::config();
config = TDEGlobal::config();
else
{
config = new KConfig(_rcfile, true);
@@ -182,7 +182,7 @@ void FontUseItem::writeFont()
KConfigBase *config;

if (_rcfile.isEmpty()) {
config = KGlobal::config();
config = TDEGlobal::config();
config->setGroup(_rcgroup);
config->writeEntry(_rckey, font(), true, true);
} else {
@@ -713,7 +713,7 @@ void KFonts::save()

for ( FontUseItem* i = fontUseList.first(); i; i = fontUseList.next() )
i->writeFont();
KGlobal::config()->sync();
TDEGlobal::config()->sync();

KConfig cfgfonts("kcmfonts");
cfgfonts.setGroup("General");
@@ -729,7 +729,7 @@ void KFonts::save()
proc << "xrdb" << "-quiet" << "-remove" << "-nocpp";
proc.writeStdin( TQCString( "Xft.dpi" ), true );
proc.closeWhenDone();
proc.start( KProcess::Block );
proc.start( TDEProcess::Block );
}

// KDE-1.x support


+ 1
- 1
kcontrol/hwmanager/devicepropsdlg.cpp View File

@@ -312,7 +312,7 @@ DevicePropertiesDialog::DevicePropertiesDialog(TDEGenericDevice* device, TQWidge
mainGrid->addWidget(base, 0, 0);
}

TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices();
TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();

connect(hwdevices, TQT_SIGNAL(hardwareRemoved(TDEGenericDevice*)), this, TQT_SLOT(processHardwareRemoved(TDEGenericDevice*)));
connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(processHardwareUpdated(TDEGenericDevice*)));


+ 4
- 4
kcontrol/hwmanager/hwmanager.cpp View File

@@ -83,7 +83,7 @@ TDEHWManager::TDEHWManager(TQWidget *parent, const char *name, const TQStringLis
setRootOnlyMsg(i18n("<b>Hardware settings are system wide, and therefore require administrator access</b><br>To alter the system's hardware settings, click on the \"Administrator Mode\" button below."));
setUseRootOnlyMsg(true);

TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices();
TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();

connect(base->showByConnection, TQT_SIGNAL(clicked()), TQT_SLOT(changed()));
connect(base->showByConnection, TQT_SIGNAL(clicked()), TQT_SLOT(populateTreeView()));
@@ -139,7 +139,7 @@ void TDEHWManager::populateTreeView()
base->deviceTree->clear();

if (show_by_connection) {
TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices();
TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
TDEGenericHardwareList hwlist = hwdevices->listByDeviceClass(TDEGenericDeviceType::RootSystem);
TDEGenericDevice *hwdevice;
for ( hwdevice = hwlist.first(); hwdevice; hwdevice = hwlist.next() ) {
@@ -152,7 +152,7 @@ void TDEHWManager::populateTreeView()
}
}
else {
TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices();
TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
for (int i=0;i<=TDEGenericDeviceType::Last;i++) {
if (i != TDEGenericDeviceType::Root) {
DeviceIconItem* rootitem = new DeviceIconItem(base->deviceTree, hwdevices->getFriendlyDeviceTypeStringFromType((TDEGenericDeviceType::TDEGenericDeviceType)i), hwdevices->getDeviceTypeIconFromType((TDEGenericDeviceType::TDEGenericDeviceType)i, base->deviceTree->iconSize()), 0);
@@ -172,7 +172,7 @@ void TDEHWManager::populateTreeView()

void TDEHWManager::populateTreeViewLeaf(DeviceIconItem *parent, bool show_by_connection, TQString selected_syspath) {
if (show_by_connection) {
TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices();
TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
TDEGenericHardwareList hwlist = hwdevices->listAllPhysicalDevices();
TDEGenericDevice *hwdevice;
for ( hwdevice = hwlist.first(); hwdevice; hwdevice = hwlist.next() ) {


+ 5
- 5
kcontrol/icons/icons.cpp View File

@@ -135,8 +135,8 @@ TQPushButton *KIconConfig::addPreviewIcon(int i, const TQString &str, TQWidget *

void KIconConfig::init()
{
mpLoader = KGlobal::iconLoader();
mpConfig = KGlobal::config();
mpLoader = TDEGlobal::iconLoader();
mpConfig = TDEGlobal::config();
mpEffect = new KIconEffect;
mpTheme = mpLoader->theme();
mUsage = 0;
@@ -289,7 +289,7 @@ void KIconConfig::read()
mpKickerConfig->setGroup("General");
mQuickLaunchSize = mpKickerConfig->readNumEntry("panelIconWidth", KIcon::SizeLarge);

KConfigGroup g( KGlobal::config(), "KDE" );
KConfigGroup g( TDEGlobal::config(), "KDE" );
mpRoundedCheck->setChecked(g.readBoolEntry("IconUseRoundedRect", KDE_DEFAULT_ICONTEXTROUNDED));
mpActiveEffectCheck->setChecked(g.readBoolEntry("ShowKonqIconActivationEffect", KDE_DEFAULT_KONQ_ACTIVATION_EFFECT));
}
@@ -410,7 +410,7 @@ void KIconConfig::load()

void KIconConfig::load( bool useDefaults )
{
mpConfig = KGlobal::config();
mpConfig = TDEGlobal::config();
mpConfig->setReadDefaults( useDefaults );
read();
apply();
@@ -473,7 +473,7 @@ void KIconConfig::save()
mpKickerConfig->setGroup("General");
mpKickerConfig->writeEntry("panelIconWidth", mQuickLaunchSize);

KConfigGroup g( KGlobal::config(), "KDE" );
KConfigGroup g( TDEGlobal::config(), "KDE" );
g.writeEntry("IconUseRoundedRect", mpRoundedCheck->isChecked(), true, true);
g.writeEntry("ShowKonqIconActivationEffect", mpActiveEffectCheck->isChecked(), true, true);



+ 2
- 2
kcontrol/icons/iconthemes.cpp View File

@@ -191,7 +191,7 @@ void IconThemesConfig::installNewTheme()

KIO::NetAccess::removeTempFile(themeTmpFile);

KGlobal::instance()->newIconLoader();
TDEGlobal::instance()->newIconLoader();
loadThemes();

TQListViewItem *item=iconThemeItem(KIconTheme::current());
@@ -302,7 +302,7 @@ void IconThemesConfig::removeSelectedTheme()
unlink(TQFile::encodeName(icontheme.dir()+"/index.desktop").data());
KIO::del(KURL( icontheme.dir() ));

KGlobal::instance()->newIconLoader();
TDEGlobal::instance()->newIconLoader();

loadThemes();



+ 6
- 6
kcontrol/info/info.cpp View File

@@ -73,7 +73,7 @@ static bool sorting_allowed; /* is sorting allowed by user ? */

static const TQString Value( int val, int numbers=1 )
{
return KGlobal::locale()->formatNumber(val, 0).rightJustify(numbers);
return TDEGlobal::locale()->formatNumber(val, 0).rightJustify(numbers);
}

static const TQString HexStr(unsigned long val, int digits )
@@ -189,8 +189,8 @@ static TQListViewItem* XServer_fill_screen_info( TQListViewItem *lBox, TQListVie
Value((int)DisplayCells(dpy, scr)));
last = new TQListViewItem(item, last, i18n("Preallocated Pixels"),
i18n("Black %1, White %2")
.arg(KGlobal::locale()->formatNumber(BlackPixel(dpy,scr), 0))
.arg(KGlobal::locale()->formatNumber(WhitePixel(dpy,scr), 0)));
.arg(TDEGlobal::locale()->formatNumber(BlackPixel(dpy,scr), 0))
.arg(TDEGlobal::locale()->formatNumber(WhitePixel(dpy,scr), 0)));

TQString YES(i18n("Yes"));
TQString NO(i18n("No"));
@@ -239,7 +239,7 @@ static const TQString ByteString( unsigned long n )
return i18n("1 Byte"); // singular form: "1 Byte" (yes, it's "1", not "%1"!)

return i18n("%1 Bytes") // plural form: "%1 Bytes"
.arg(KGlobal::locale()->formatNumber(n,0));
.arg(TDEGlobal::locale()->formatNumber(n,0));
}

static bool GetInfo_XServer_Generic( TQListView *lBox )
@@ -370,7 +370,7 @@ void KInfoListWidget::load()

/* is the user allowed to use sorting ? */
lBox->header()->setClickEnabled(sorting_allowed);
lBox->header()->setFont(KGlobalSettings::generalFont());
lBox->header()->setFont(TDEGlobalSettings::generalFont());
lBox->setShowSortIndicator(sorting_allowed);

if (ok)
@@ -420,7 +420,7 @@ KInfoListWidget::KInfoListWidget(const TQString &_title, TQWidget *parent, const
lBox = new TQListView(widgetStack);
widgetStack->addWidget(lBox, 0);
lBox->setMinimumSize(200,120);
lBox->setFont(KGlobalSettings::generalFont()); /* default font */
lBox->setFont(TDEGlobalSettings::generalFont()); /* default font */
lBox->setAllColumnsShowFocus(true);
TQWhatsThis::add( lBox, i18n( "This list displays system information on the selected category." ) );
NoInfoText = new TQLabel(widgetStack);


+ 1
- 1
kcontrol/info/info_linux.cpp View File

@@ -140,7 +140,7 @@ bool GetInfo_CPU(TQListView * lBox)

bool GetInfo_IRQ(TQListView * lBox)
{
lBox->setFont(KGlobalSettings::fixedFont());
lBox->setFont(TDEGlobalSettings::fixedFont());
return GetInfo_ReadfromFile(lBox, INFO_IRQ, 0);
}



+ 4
- 4
kcontrol/info/memory.cpp View File

@@ -80,11 +80,11 @@ static TQString formatted_unit(t_memsize value)
{
if (value > (1024 * 1024))
if (value > (1024 * 1024 * 1024))
return i18n("%1 GB").arg(KGlobal::locale()->formatNumber(value / (1024 * 1024 * 1024.0), 2));
return i18n("%1 GB").arg(TDEGlobal::locale()->formatNumber(value / (1024 * 1024 * 1024.0), 2));
else
return i18n("%1 MB").arg(KGlobal::locale()->formatNumber(value / (1024 * 1024.0), 2));
return i18n("%1 MB").arg(TDEGlobal::locale()->formatNumber(value / (1024 * 1024.0), 2));
else
return i18n("%1 KB").arg(KGlobal::locale()->formatNumber(value / 1024.0, 2));
return i18n("%1 KB").arg(TDEGlobal::locale()->formatNumber(value / 1024.0, 2));
}

KMemoryWidget::KMemoryWidget(TQWidget * parent, const char *name)
@@ -368,7 +368,7 @@ void KMemoryWidget::update_Values()
label->clear();
else
label->setText(i18n("%1 bytes =").
arg(KGlobal::locale()->
arg(TDEGlobal::locale()->
formatNumber(Memory_Info[i], 0)));
}



+ 4
- 4
kcontrol/input/core/themepage.cpp View File

@@ -178,7 +178,7 @@ void ThemePage::fixCursorFile()
//
// Run mkfontdir to update fonts.dir in that dir.

KGlobal::dirs()->addResourceType( "font", "share/fonts/" );
TDEGlobal::dirs()->addResourceType( "font", "share/fonts/" );
KIO::mkdir( KURL::fromPathOrURL(TQDir::homeDirPath() + "/.fonts/kde-override") );
TQString overrideDir = TQDir::homeDirPath() + "/.fonts/kde-override/";

@@ -200,12 +200,12 @@ void ThemePage::fixCursorFile()
KIO::NetAccess::file_copy( source, installedFont, -1, true );
}

TQString cmd =