Browse Source

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

tags/r14.0.0
Timothy Pearson 6 years ago
parent
commit
6adb71382c
100 changed files with 333 additions and 333 deletions
  1. 1
    1
      kcoloredit/palette.cpp
  2. 1
    1
      kdvi/dviFile.cpp
  3. 6
    6
      kdvi/dviRenderer.cpp
  4. 4
    4
      kdvi/dviRenderer.h
  5. 16
    16
      kdvi/dviRenderer_export.cpp
  6. 1
    1
      kdvi/dviRenderer_prescan.cpp
  7. 1
    1
      kdvi/fontEncoding.cpp
  8. 2
    2
      kdvi/fontMap.cpp
  9. 4
    4
      kdvi/fontpool.cpp
  10. 2
    2
      kdvi/fontpool.h
  11. 2
    2
      kdvi/psgs.cpp
  12. 1
    1
      kfaxview/libkfaximage/kfaximage.cpp
  13. 1
    1
      kgamma/kcmkgamma/kgamma.cpp
  14. 2
    2
      kgamma/kcmkgamma/kgamma.h
  15. 5
    5
      kghostview/kgv_view.cpp
  16. 1
    1
      kghostview/kgvconfigdialog.cpp
  17. 10
    10
      kghostview/kgvdocument.cpp
  18. 1
    1
      kghostview/kgvdocument.h
  19. 11
    11
      kghostview/kgvshell.cpp
  20. 14
    14
      kghostview/kpswidget.cpp
  21. 5
    5
      kghostview/kpswidget.h
  22. 1
    1
      kghostview/logwindow.cpp
  23. 1
    1
      kiconedit/kiconconfig.cpp
  24. 1
    1
      kiconedit/knew.cpp
  25. 5
    5
      kmrml/kmrml/kcontrol/indexcleaner.cpp
  26. 3
    3
      kmrml/kmrml/kcontrol/indexcleaner.h
  27. 6
    6
      kmrml/kmrml/kcontrol/indexer.cpp
  28. 2
    2
      kmrml/kmrml/kcontrol/indexer.h
  29. 1
    1
      kmrml/kmrml/kcontrol/indextest.cpp
  30. 2
    2
      kmrml/kmrml/kcontrol/kcmkmrml.cpp
  31. 1
    1
      kmrml/kmrml/kcontrol/mainpage.cpp
  32. 2
    2
      kmrml/kmrml/lib/kmrml_config.cpp
  33. 2
    2
      kmrml/kmrml/mrml.cpp
  34. 1
    1
      kmrml/kmrml/mrml_part.cpp
  35. 2
    2
      kmrml/kmrml/mrml_view.cpp
  36. 9
    9
      kmrml/kmrml/server/watcher.cpp
  37. 3
    3
      kmrml/kmrml/server/watcher.h
  38. 1
    1
      kolourpaint/kpdocumentsaveoptions.cpp
  39. 4
    4
      kolourpaint/kpdocumentsaveoptionswidget.cpp
  40. 1
    1
      kolourpaint/kpmainwindow_file.cpp
  41. 1
    1
      kolourpaint/kpmainwindow_help.cpp
  42. 2
    2
      kolourpaint/pixmapfx/kpeffectflatten.cpp
  43. 1
    1
      kolourpaint/pixmapfx/kppixmapfx.cpp
  44. 1
    1
      kolourpaint/tools/kptoolresizescale.cpp
  45. 2
    2
      kolourpaint/widgets/kptooltoolbar.cpp
  46. 5
    5
      kooka/img_saver.cpp
  47. 2
    2
      kooka/kocrbase.cpp
  48. 2
    2
      kooka/kocrgocr.cpp
  49. 3
    3
      kooka/kocrkadmos.cpp
  50. 7
    7
      kooka/kocrocrad.cpp
  51. 3
    3
      kooka/kocrocrad.h
  52. 4
    4
      kooka/kooka.cpp
  53. 2
    2
      kooka/kookapref.cpp
  54. 4
    4
      kooka/kookaview.cpp
  55. 24
    24
      kooka/ksaneocr.cpp
  56. 8
    8
      kooka/ksaneocr.h
  57. 2
    2
      kooka/main.cpp
  58. 3
    3
      kooka/scanpackager.cpp
  59. 2
    2
      kooka/thumbview.cpp
  60. 1
    1
      kpdf/core/generator_pdf/generator_pdf.cpp
  61. 3
    3
      kpdf/part.cpp
  62. 9
    9
      kpdf/shell/shell.cpp
  63. 3
    3
      kpdf/ui/pageview.cpp
  64. 1
    1
      kpdf/ui/presentationwidget.cpp
  65. 1
    1
      kpdf/ui/propertiesdialog.cpp
  66. 1
    1
      kpovmodeler/pmcommentedit.cpp
  67. 1
    1
      kpovmodeler/pmdialogview.cpp
  68. 3
    3
      kpovmodeler/pmdockwidget.cpp
  69. 1
    1
      kpovmodeler/pmlibrarymanager.cpp
  70. 2
    2
      kpovmodeler/pmpart.h
  71. 1
    1
      kpovmodeler/pmpovrayoutputwidget.cpp
  72. 12
    12
      kpovmodeler/pmpovrayrenderwidget.cpp
  73. 6
    6
      kpovmodeler/pmpovrayrenderwidget.h
  74. 1
    1
      kpovmodeler/pmpovraywidget.cpp
  75. 1
    1
      kpovmodeler/pmrawedit.cpp
  76. 5
    5
      kpovmodeler/pmshell.cpp
  77. 2
    2
      kpovmodeler/pmtreeview.cpp
  78. 6
    6
      kruler/klineal.cpp
  79. 3
    3
      ksnapshot/ksnapshot.cpp
  80. 1
    1
      ksnapshot/ksnapshot.h
  81. 1
    1
      ksnapshot/regiongrabber.cpp
  82. 1
    1
      ksvg/impl/SVGTestsImpl.cc
  83. 1
    1
      ksvg/plugin/ksvg_factory.cpp
  84. 1
    1
      kuickshow/src/filecache.cpp
  85. 4
    4
      kuickshow/src/filefinder.cpp
  86. 6
    6
      kuickshow/src/filewidget.cpp
  87. 5
    5
      kuickshow/src/imagewindow.cpp
  88. 1
    1
      kuickshow/src/kuickconfigdlg.cpp
  89. 2
    2
      kuickshow/src/kuickdata.cpp
  90. 4
    4
      kuickshow/src/kuickshow.cpp
  91. 1
    1
      kuickshow/src/printing.cpp
  92. 3
    3
      kview/config/kviewconfmodules.cpp
  93. 13
    13
      kview/kview.cpp
  94. 1
    1
      kview/kviewviewer/kviewkonqextension.cpp
  95. 1
    1
      kview/kviewviewer/kviewviewer.cpp
  96. 1
    1
      kview/modules/presenter/kviewpresenter.cpp
  97. 2
    2
      kview/modules/scale/kfloatspinbox.cpp
  98. 2
    2
      kviewshell/documentWidget.cpp
  99. 2
    2
      kviewshell/kviewpart.cpp
  100. 0
    0
      kviewshell/kviewshell.cpp

+ 1
- 1
kcoloredit/palette.cpp View File

@@ -47,7 +47,7 @@ void Palette::init() {

TQStringList Palette::kdePalettes() {
TQStringList paletteList;
KGlobal::dirs()->findAllResources("config", palettesDir + "/*", false, true, paletteList);
TDEGlobal::dirs()->findAllResources("config", palettesDir + "/*", false, true, paletteList);
return paletteList;
}


+ 1
- 1
kdvi/dviFile.cpp View File

@@ -377,7 +377,7 @@ TQString dvifile::convertPDFtoPS(const TQString &PDFFilename)
// Use pdf2ps to do the conversion
KProcIO proc;
proc << "pdf2ps" << PDFFilename << convertedFileName;
if (proc.start(KProcess::Block) == false)
if (proc.start(TDEProcess::Block) == false)
convertedFileName = TQString(); // Indicates that conversion failed, won't try again.
if (!TQFile::exists(convertedFileName))
convertedFileName = TQString(); // Indicates that conversion failed, won't try again.

+ 6
- 6
kdvi/dviRenderer.cpp View File

@@ -767,8 +767,8 @@ void dviRenderer::handleSRCLink(const TQString &linkText, TQMouseEvent *e, Docum
// henceforth dimiss the output of the older programm. "If it
// hasn't failed until now, we don't care."
if (proc != 0) {
tqApp->disconnect(proc, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), 0, 0);
tqApp->disconnect(proc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), 0, 0);
tqApp->disconnect(proc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), 0, 0);
tqApp->disconnect(proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), 0, 0);
proc = 0;
}
@@ -778,9 +778,9 @@ void dviRenderer::handleSRCLink(const TQString &linkText, TQMouseEvent *e, Docum
kdError(4300) << "Could not allocate ShellProcess for the editor command." << endl;
return;
}
tqApp->connect(proc, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), this, TQT_SLOT(dvips_output_receiver(KProcess *, char *, int)));
tqApp->connect(proc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), this, TQT_SLOT(dvips_output_receiver(KProcess *, char *, int)));
tqApp->connect(proc, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(editorCommand_terminated(KProcess *)));
tqApp->connect(proc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), this, TQT_SLOT(dvips_output_receiver(TDEProcess *, char *, int)));
tqApp->connect(proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), this, TQT_SLOT(dvips_output_receiver(TDEProcess *, char *, int)));
tqApp->connect(proc, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(editorCommand_terminated(TDEProcess *)));
// Merge the editor-specific editor message here.
export_errorString = i18n("<qt>The external program<br><br><tt><strong>%1</strong></tt><br/><br/>which was used to call the editor "
"for inverse search, reported an error. You might wish to look at the <strong>document info "
@@ -797,7 +797,7 @@ void dviRenderer::handleSRCLink(const TQString &linkText, TQMouseEvent *e, Docum
proc->clearArguments();
*proc << command;
proc->closeStdin();
if (proc->start(KProcess::NotifyOnExit, KProcess::AllOutput) == false) {
if (proc->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false) {
kdError(4300) << "Editor failed to start" << endl;
return;
}

+ 4
- 4
kdvi/dviRenderer.h View File

@@ -30,7 +30,7 @@ class infoDialog;
class KAction;
class KDVIMultiPage;
class KPrinter;
class KProcess;
class TDEProcess;
class KProgressDialog;
class KShellProcess;
class PreBookmark;
@@ -145,9 +145,9 @@ public slots:
virtual void getText(RenderedDocumentPage* page);

/** Slots used in conjunction with external programs */
void dvips_output_receiver(KProcess *, char *buffer, int buflen);
void dvips_terminated(KProcess *);
void editorCommand_terminated(KProcess *);
void dvips_output_receiver(TDEProcess *, char *buffer, int buflen);
void dvips_terminated(TDEProcess *);
void editorCommand_terminated(TDEProcess *);

signals:
/** Passed through to the top-level kpart. */

+ 16
- 16
kdvi/dviRenderer_export.cpp View File

@@ -61,8 +61,8 @@ void dviRenderer::exportPDF()
// has been called meanwhile. See also the exportPS method.
if (proc != 0) {
// Make sure all further output of the programm is ignored
tqApp->disconnect(proc, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), 0, 0);
tqApp->disconnect(proc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), 0, 0);
tqApp->disconnect(proc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), 0, 0);
tqApp->disconnect(proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), 0, 0);
proc = 0;
}

@@ -130,9 +130,9 @@ void dviRenderer::exportPDF()
}
tqApp->disconnect( this, TQT_SIGNAL(mySignal()), 0, 0 );

tqApp->connect(proc, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), this, TQT_SLOT(dvips_output_receiver(KProcess *, char *, int)));
tqApp->connect(proc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), this, TQT_SLOT(dvips_output_receiver(KProcess *, char *, int)));
tqApp->connect(proc, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(dvips_terminated(KProcess *)));
tqApp->connect(proc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), this, TQT_SLOT(dvips_output_receiver(TDEProcess *, char *, int)));
tqApp->connect(proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), this, TQT_SLOT(dvips_output_receiver(TDEProcess *, char *, int)));
tqApp->connect(proc, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(dvips_terminated(TDEProcess *)));

export_errorString = i18n("<qt>The external program 'dvipdf', which was used to export the file, reported an error. "
"You might wish to look at the <strong>document info dialog</strong> which you will "
@@ -145,7 +145,7 @@ void dviRenderer::exportPDF()
*proc << TQString("-o %1").arg(KShellProcess::quote(fileName));
*proc << KShellProcess::quote(dviFile->filename);
proc->closeStdin();
if (proc->start(KProcess::NotifyOnExit, KProcess::AllOutput) == false) {
if (proc->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false) {
kdError(4300) << "dvipdfm failed to start" << endl;
return;
}
@@ -167,8 +167,8 @@ void dviRenderer::exportPS(const TQString& fname, const TQString& options, KPrin
// enough to ignore the exit status of the editor if another command
// has been called meanwhile. See also the exportPDF method.
if (proc != 0) {
tqApp->disconnect(proc, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), 0, 0);
tqApp->disconnect(proc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), 0, 0);
tqApp->disconnect(proc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), 0, 0);
tqApp->disconnect(proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), 0, 0);
proc = 0;
}

@@ -294,9 +294,9 @@ void dviRenderer::exportPS(const TQString& fname, const TQString& options, KPrin
return;
}
tqApp->connect(proc, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), this, TQT_SLOT(dvips_output_receiver(KProcess *, char *, int)));
tqApp->connect(proc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), this, TQT_SLOT(dvips_output_receiver(KProcess *, char *, int)));
tqApp->connect(proc, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(dvips_terminated(KProcess *)));
tqApp->connect(proc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), this, TQT_SLOT(dvips_output_receiver(TDEProcess *, char *, int)));
tqApp->connect(proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), this, TQT_SLOT(dvips_output_receiver(TDEProcess *, char *, int)));
tqApp->connect(proc, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(dvips_terminated(TDEProcess *)));
export_errorString = i18n("<qt>The external program 'dvips', which was used to export the file, reported an error. "
"You might wish to look at the <strong>document info dialog</strong> which you will "
"find in the File-Menu for a precise error report.</qt>") ;
@@ -312,7 +312,7 @@ void dviRenderer::exportPS(const TQString& fname, const TQString& options, KPrin
*proc << TQString("%1").arg(KShellProcess::quote(sourceFileName));
*proc << TQString("-o %1").arg(KShellProcess::quote(fileName));
proc->closeStdin();
if (proc->start(KProcess::NotifyOnExit, KProcess::Stderr) == false) {
if (proc->start(TDEProcess::NotifyOnExit, TDEProcess::Stderr) == false) {
kdError(4300) << "dvips failed to start" << endl;
return;
}
@@ -320,7 +320,7 @@ void dviRenderer::exportPS(const TQString& fname, const TQString& options, KPrin
}


void dviRenderer::dvips_output_receiver(KProcess *, char *buffer, int buflen)
void dviRenderer::dvips_output_receiver(TDEProcess *, char *buffer, int buflen)
{
// Paranoia.
if (buflen < 0)
@@ -333,7 +333,7 @@ void dviRenderer::dvips_output_receiver(KProcess *, char *buffer, int buflen)
}


void dviRenderer::dvips_terminated(KProcess *sproc)
void dviRenderer::dvips_terminated(TDEProcess *sproc)
{
// Give an error message from the message string. However, if the
// sproc is not the "current external process of interest", i.e. not
@@ -351,7 +351,7 @@ void dviRenderer::dvips_terminated(KProcess *sproc)
}


void dviRenderer::editorCommand_terminated(KProcess *sproc)
void dviRenderer::editorCommand_terminated(TDEProcess *sproc)
{
// Give an error message from the message string. However, if the
// sproc is not the "current external process of interest", i.e. not
@@ -372,7 +372,7 @@ void dviRenderer::editorCommand_terminated(KProcess *sproc)

void dviRenderer::abortExternalProgramm()
{
delete proc; // Deleting the KProcess kills the child.
delete proc; // Deleting the TDEProcess kills the child.
proc = 0;
if (export_tmpFileName.isEmpty() != true) {

+ 1
- 1
kdvi/dviRenderer_prescan.cpp View File

@@ -292,7 +292,7 @@ void dviRenderer::prescan_ParsePSHeaderSpecial(const TQString& cp)
// Otherwise, use kpsewhich to find the eps file.
KProcIO proc;
proc << "kpsewhich" << cp;
proc.start(KProcess::Block);
proc.start(TDEProcess::Block);
proc.readln(_file);
}

+ 1
- 1
kdvi/fontEncoding.cpp View File

@@ -28,7 +28,7 @@ fontEncoding::fontEncoding(const TQString &encName)
KProcIO proc;
TQString encFileName;
proc << "kpsewhich" << encName;
if (proc.start(KProcess::Block) == false) {
if (proc.start(TDEProcess::Block) == false) {
kdError(4300) << "fontEncoding::fontEncoding(...): kpsewhich could not be started." << endl;
return;
}

+ 2
- 2
kdvi/fontMap.cpp View File

@@ -33,7 +33,7 @@ fontMap::fontMap()
// teTeX 3.0 format first.
KProcIO proc;
proc << "kpsewhich" << "--format=map" << "ps2pk.map";
if (proc.start(KProcess::Block) == false) {
if (proc.start(TDEProcess::Block) == false) {
kdError(4700) << "fontMap::fontMap(): kpsewhich could not be started." << endl;
return;
}
@@ -45,7 +45,7 @@ fontMap::fontMap()
// Map file not found? Then we try the teTeX < 3.0 way of finding
// the file.
proc << "kpsewhich" << "--format=dvips config" << "ps2pk.map";
if (proc.start(KProcess::Block) == false) {
if (proc.start(TDEProcess::Block) == false) {
kdError(4700) << "fontMap::fontMap(): kpsewhich could not be started." << endl;
return;
}

+ 4
- 4
kdvi/fontpool.cpp View File

@@ -304,8 +304,8 @@ void fontPool::locateFonts(bool makePK, bool locateTFMonly, bool *virtualFontsFo
// If PK fonts are generated, the kpsewhich command will re-route
// the output of MetaFont into its stderr. Here we make sure this
// output is intercepted and parsed.
tqApp->connect(&kpsewhichIO, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)),
this, TQT_SLOT(mf_output_receiver(KProcess *, char *, int)));
tqApp->connect(&kpsewhichIO, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
this, TQT_SLOT(mf_output_receiver(TDEProcess *, char *, int)));
kpsewhichIO.setUseShell(true);
@@ -357,7 +357,7 @@ void fontPool::locateFonts(bool makePK, bool locateTFMonly, bool *virtualFontsFo
kpsewhichIO << shellProcessCmdLine;
TQString importanceOfKPSEWHICH = i18n("<p>KDVI relies on the <b>kpsewhich</b> program to locate font files "
"on your hard disc and to generate PK fonts, if necessary.</p>");
if (kpsewhichIO.start(KProcess::NotifyOnExit, false) == false) {
if (kpsewhichIO.start(TDEProcess::NotifyOnExit, false) == false) {
TQString msg = i18n( "<p>The shell process for the kpsewhich program could not "
"be started. Consequently, some font files could not be found, "
"and your document might by unreadable. If this error is reproducable "
@@ -544,7 +544,7 @@ void fontPool::release_fonts()
}


void fontPool::mf_output_receiver(KProcess *, char *buffer, int buflen)
void fontPool::mf_output_receiver(TDEProcess *, char *buffer, int buflen)
{
// Paranoia.
if (buflen < 0)

+ 2
- 2
kdvi/fontpool.h View File

@@ -20,7 +20,7 @@
#include FT_FREETYPE_H
#endif

class KProcess;
class TDEProcess;
class KShellProcess;


@@ -210,7 +210,7 @@ private slots:
// transmitted to the fontpool via this slot. This method calles
// suitable methods in the fontProgres Dialog, and collects the
// output of MetaFontt int the "MetafontOutput" member
void mf_output_receiver(KProcess *, char *, int);
void mf_output_receiver(TDEProcess *, char *, int);
};

#endif //ifndef _FONTPOOL_H

+ 2
- 2
kdvi/psgs.cpp View File

@@ -224,7 +224,7 @@ void ghostscript_interface::gs_generate_graphics_file(const PageNumber& page, co
#endif

proc << argus;
if (proc.start(KProcess::Block) == false) {
if (proc.start(TDEProcess::Block) == false) {
// Starting ghostscript did not work.
// TODO: Issue error message, switch PS support off.
kdError(4300) << "ghostview could not be started" << endl;
@@ -331,7 +331,7 @@ TQString ghostscript_interface::locateEPSfile(const TQString &filename, const KU
TQString EPSfilename;
KProcIO proc;
proc << "kpsewhich" << filename;
proc.start(KProcess::Block);
proc.start(TDEProcess::Block);
proc.readln(EPSfilename);

return EPSfilename.stripWhiteSpace();

+ 1
- 1
kfaxview/libkfaximage/kfaximage.cpp View File

@@ -41,7 +41,7 @@ static const char bigTIFF[] = "\x4d\x4d\x00\x2a";
KFaxImage::KFaxImage( const TQString &filename, TQObject *parent, const char *name )
: TQObject(parent,name)
{
KGlobal::locale()->insertCatalogue( TQString::fromLatin1("libkfaximage") );
TDEGlobal::locale()->insertCatalogue( TQString::fromLatin1("libkfaximage") );
loadImage(filename);
}


+ 1
- 1
kgamma/kcmkgamma/kgamma.cpp View File

@@ -82,7 +82,7 @@ KGamma::KGamma(TQWidget *parent, const char *name, const TQStringList&)
}
xv->setScreen(currentScreen);

rootProcess = new KProcess;
rootProcess = new TDEProcess;
setupUI();
saved = false;


+ 2
- 2
kgamma/kcmkgamma/kgamma.h View File

@@ -23,7 +23,7 @@ class GammaCtrl;
class TQCheckBox;
class TQComboBox;
class XVidExtWrap;
class KProcess;
class TDEProcess;

class KGamma: public KCModule
{
@@ -71,7 +71,7 @@ class KGamma: public KCModule
GammaCtrl *gctrl, *rgctrl, *ggctrl, *bgctrl;
TQCheckBox *xf86cfgbox, *syncbox;
TQComboBox *screenselect;
KProcess *rootProcess;
TDEProcess *rootProcess;
XVidExtWrap *xv;
};


+ 5
- 5
kghostview/kgv_view.cpp View File

@@ -264,8 +264,8 @@ KGVPart::KGVPart( TQWidget* parentWidget, const char*,
for ( TQValueList<double>::iterator first = mags.begin(), last = mags.end();
first != last;
++first ) {
TQString str = TQString( "%1%" ).arg( KGlobal::locale()->formatNumber( *first * 100.0, 2 ));
str.remove( KGlobal::locale()->decimalSymbol() + "00" );
TQString str = TQString( "%1%" ).arg( TDEGlobal::locale()->formatNumber( *first * 100.0, 2 ));
str.remove( TDEGlobal::locale()->decimalSymbol() + "00" );
zooms << str;
if ( *first == 1.0 ) idx = cur;
++cur;
@@ -600,8 +600,8 @@ void KGVPart::updateZoomActions()
}

// Show percentage that isn't predefined
TQString str = TQString( "%1%" ).arg( KGlobal::locale()->formatNumber( zoom, 2 ));
str.remove( KGlobal::locale()->decimalSymbol() + "00" );
TQString str = TQString( "%1%" ).arg( TDEGlobal::locale()->formatNumber( zoom, 2 ));
str.remove( TDEGlobal::locale()->decimalSymbol() + "00" );
items.insert( items.at(idx), 1, str );
_zoomTo->setItems( items );
_zoomTo->setCurrentItem( idx );
@@ -902,7 +902,7 @@ void KGVPart::slotZoom( const TQString& nz )
TQString z = nz;
double zoom;
z.remove( z.find( '%' ), 1 );
zoom = KGlobal::locale()->readNumber( z ) / 100;
zoom = TDEGlobal::locale()->readNumber( z ) / 100;
kdDebug( 4500 ) << "ZOOM = " << nz << ", setting zoom = " << zoom << endl;

DisplayOptions options = miniWidget()->displayOptions();

+ 1
- 1
kghostview/kgvconfigdialog.cpp View File

@@ -46,7 +46,7 @@ namespace {
TQString getGSVersion( TQString fullPathToExec )
{
TQString res;
TQString chkVersion = KProcess::quote(fullPathToExec) + " --version";
TQString chkVersion = TDEProcess::quote(fullPathToExec) + " --version";
FILE* p = popen( TQFile::encodeName(chkVersion), "r" );
if( p ) {
// FIXME: a badly configured interpreter can hang us

+ 10
- 10
kghostview/kgvdocument.cpp View File

@@ -345,7 +345,7 @@ bool KGVDocument::convertFromPDF( const TQString& saveFileName,
{
// TODO -- timeout/fail on this conversion (it can hang on a bad pdf)
// TODO -- use output from gs (leave out -q) to drive a progress bar
KProcess process;
TDEProcess process;
process << _interpreterPath
<< "-q"
<< "-dNOPAUSE"
@@ -367,7 +367,7 @@ bool KGVDocument::convertFromPDF( const TQString& saveFileName,
for ( ; it != args.end() ; ++it )
kdDebug(4500) << ( *it ) << endl;*/

if( !process.start( KProcess::Block ) )
if( !process.start( TDEProcess::Block ) )
{
kdError() << "convertFromPDF: Couldn't start gs process" << endl;
// TODO -- error message (gs not found?)
@@ -771,7 +771,7 @@ bool KGVDocument::psCopyDoc( const TQString& inputFile,
void KGVDocument::runPdf2ps( const TQString& pdfName,
const TQString& dscName )
{
KProcess process;
TDEProcess process;
process << _interpreterPath
<< "-dNODISPLAY"
<< "-dQUIET"
@@ -786,14 +786,14 @@ e=%1" ).arg( dscName )
<< "-c"
<< "quit";

connect( &process, TQT_SIGNAL( processExited( KProcess* ) ),
this, TQT_SLOT( pdf2psExited( KProcess* ) ) );
connect( &process, TQT_SIGNAL( processExited( TDEProcess* ) ),
this, TQT_SLOT( pdf2psExited( TDEProcess* ) ) );

kdDebug(4500) << "KGVDocument: pdf2ps started" << endl;
process.start( KProcess::NotifyOnExit );
process.start( TDEProcess::NotifyOnExit );
}

void KGVDocument::pdf2psExited( KProcess* process )
void KGVDocument::pdf2psExited( TDEProcess* process )
{
kdDebug(4500) << "KGVDocument: pdf2ps exited" << endl;
@@ -816,7 +816,7 @@ void Pdf2dsc::run( const TQString& pdfName, const TQString& dscName )
{
kill();

_process = new KProcess;
_process = new TDEProcess;
*_process << _ghostscriptPath
<< "-dSAFER"
<< "-dPARANOIDSAFER"
@@ -832,11 +832,11 @@ void Pdf2dsc::run( const TQString& pdfName, const TQString& dscName )
<< "-c"
<< "quit";

connect( _process, TQT_SIGNAL( processExited( KProcess* ) ),
connect( _process, TQT_SIGNAL( processExited( TDEProcess* ) ),
this, TQT_SLOT( processExited() ) );

kdDebug(4500) << "Pdf2dsc: started" << endl;
_process->start( KProcess::NotifyOnExit );
_process->start( TDEProcess::NotifyOnExit );
}

void Pdf2dsc::kill()

+ 1
- 1
kghostview/kgvdocument.h View File

@@ -176,7 +176,7 @@ protected slots:
void processExited();

private:
KProcess* _process;
TDEProcess* _process;
TQString _ghostscriptPath;
};


+ 11
- 11
kghostview/kgvshell.cpp View File

@@ -193,7 +193,7 @@ KGVShell::saveProperties( KConfig* config )
void
KGVShell::readSettings()
{
recent->loadEntries( KGlobal::config() );
recent->loadEntries( TDEGlobal::config() );
TQStringList items = recent->items();

// Code copied from kviewshell.cpp:
@@ -210,10 +210,10 @@ KGVShell::readSettings()
}
}

applyMainWindowSettings(KGlobal::config(), "MainWindow");
applyMainWindowSettings(TDEGlobal::config(), "MainWindow");

KGlobal::config()->setDesktopGroup();
bool fullScreen = KGlobal::config()->readBoolEntry( "FullScreen", false );
TDEGlobal::config()->setDesktopGroup();
bool fullScreen = TDEGlobal::config()->readBoolEntry( "FullScreen", false );
setFullScreen( fullScreen );
_showMenuBarAction->setChecked( menuBar()->isVisible() );
}
@@ -221,14 +221,14 @@ KGVShell::readSettings()
void
KGVShell::writeSettings()
{
saveMainWindowSettings(KGlobal::config(), "MainWindow");
saveMainWindowSettings(TDEGlobal::config(), "MainWindow");

recent->saveEntries( KGlobal::config() );
recent->saveEntries( TDEGlobal::config() );

KGlobal::config()->setDesktopGroup();
KGlobal::config()->writeEntry( "FullScreen", m_fullScreenAction->isChecked());
TDEGlobal::config()->setDesktopGroup();
TDEGlobal::config()->writeEntry( "FullScreen", m_fullScreenAction->isChecked());

KGlobal::config()->sync();
TDEGlobal::config()->sync();
}

void
@@ -350,7 +350,7 @@ void KGVShell::slotUpdateFullScreen()

void KGVShell::slotConfigureToolbars()
{
saveMainWindowSettings( KGlobal::config(), "MainWindow" );
saveMainWindowSettings( TDEGlobal::config(), "MainWindow" );
KEditToolbar dlg( factory() );
connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(slotNewToolbarConfig()));
dlg.exec();
@@ -358,7 +358,7 @@ void KGVShell::slotConfigureToolbars()

void KGVShell::slotNewToolbarConfig()
{
applyMainWindowSettings( KGlobal::config(), "MainWindow" );
applyMainWindowSettings( TDEGlobal::config(), "MainWindow" );
}

void KGVShell::slotRMBClick()

+ 14
- 14
kghostview/kpswidget.cpp View File

@@ -342,7 +342,7 @@ bool KPSWidget::startInterpreter()
{
setupWidget();

_process = new KProcess;
_process = new TDEProcess;
if ( _doubleBuffer ) _process->setEnvironment( "GHOSTVIEW", TQString( "%1 %2" ).arg( winId() ).arg( _backgroundPixmap.handle() ) );
else _process->setEnvironment( "GHOSTVIEW", TQString::number( winId() ) );

@@ -358,21 +358,21 @@ bool KPSWidget::startInterpreter()
else
*_process << _fileName << "-c" << "quit";

connect( _process, TQT_SIGNAL( processExited( KProcess* ) ),
this, TQT_SLOT( slotProcessExited( KProcess* ) ) );
connect( _process, TQT_SIGNAL( receivedStdout( KProcess*, char*, int ) ),
this, TQT_SLOT( gs_output( KProcess*, char*, int ) ) );
connect( _process, TQT_SIGNAL( receivedStderr( KProcess*, char*, int ) ),
this, TQT_SLOT( gs_output( KProcess*, char*, int ) ) );
connect( _process, TQT_SIGNAL( wroteStdin( KProcess*) ),
this, TQT_SLOT( gs_input( KProcess* ) ) );
connect( _process, TQT_SIGNAL( processExited( TDEProcess* ) ),
this, TQT_SLOT( slotProcessExited( TDEProcess* ) ) );
connect( _process, TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ),
this, TQT_SLOT( gs_output( TDEProcess*, char*, int ) ) );
connect( _process, TQT_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ),
this, TQT_SLOT( gs_output( TDEProcess*, char*, int ) ) );
connect( _process, TQT_SIGNAL( wroteStdin( TDEProcess*) ),
this, TQT_SLOT( gs_input( TDEProcess* ) ) );

kapp->flushX();

// Finally fire up the interpreter.
kdDebug(4500) << "KPSWidget: starting interpreter" << endl;
if( _process->start( KProcess::NotifyOnExit,
_usePipe ? KProcess::All : KProcess::AllOutput ) )
if( _process->start( TDEProcess::NotifyOnExit,
_usePipe ? TDEProcess::All : TDEProcess::AllOutput ) )
{
_interpreterBusy = true;
setCursor( waitCursor );
@@ -412,7 +412,7 @@ void KPSWidget::interpreterFailed()
stopInterpreter();
}

void KPSWidget::slotProcessExited( KProcess* process )
void KPSWidget::slotProcessExited( TDEProcess* process )
{
kdDebug(4500) << "KPSWidget: process exited" << endl;

@@ -430,12 +430,12 @@ void KPSWidget::slotProcessExited( KProcess* process )
}
}

void KPSWidget::gs_output( KProcess*, char* buffer, int len )
void KPSWidget::gs_output( TDEProcess*, char* buffer, int len )
{
emit output( buffer, len );
}

void KPSWidget::gs_input( KProcess* process )
void KPSWidget::gs_input( TDEProcess* process )
{
kdDebug(4500) << "KPSWidget::gs_input" << endl;


+ 5
- 5
kghostview/kpswidget.h View File

@@ -30,7 +30,7 @@

#include <X11/X.h>

class KProcess;
class TDEProcess;

class KGVConfigDialog;
class MessagesDialog;
@@ -201,10 +201,10 @@ protected:
void setPalette( Configuration::EnumPalette::type );

protected slots:
void gs_input( KProcess* );
void gs_output( KProcess*, char* buffer, int len );
void gs_input( TDEProcess* );
void gs_output( TDEProcess*, char* buffer, int len );
void interpreterFailed();
void slotProcessExited( KProcess* );
void slotProcessExited( TDEProcess* );
private:
Window _gsWindow; // Destination of ghostscript messages.
@@ -246,7 +246,7 @@ private:
*/
bool _widgetDirty;

KProcess* _process;
TDEProcess* _process;
char* _buffer;
std::queue<Record> _inputQueue;

+ 1
- 1
kghostview/logwindow.cpp View File

@@ -43,7 +43,7 @@ LogWindow::LogWindow( const TQString& caption,
_logView->setTextFormat( TQt::PlainText );
_logView->setReadOnly( true );
_logView->setWordWrap( TQTextEdit::NoWrap );
_logView->setFont( KGlobalSettings::fixedFont() );
_logView->setFont( TDEGlobalSettings::fixedFont() );
_logView->setMinimumWidth( 80 * fontMetrics().width( " " ) );

connect( this, TQT_SIGNAL( user1Clicked() ), TQT_SLOT( clear() ) );

+ 1
- 1
kiconedit/kiconconfig.cpp View File

@@ -48,7 +48,7 @@
// little helper:
static inline TQPixmap loadIcon( const char * name )
{
return KGlobal::instance()->iconLoader()
return TDEGlobal::instance()->iconLoader()
->loadIcon( TQString::fromLatin1(name), KIcon::NoGroup, KIcon::SizeMedium );
}


+ 1
- 1
kiconedit/knew.cpp View File

@@ -37,7 +37,7 @@ KIconTemplateContainer* KIconTemplateContainer::instance = 0;

void createStandardTemplates(KIconTemplateContainer *list)
{
KIconLoader *kil = KGlobal::iconLoader();
KIconLoader *kil = TDEGlobal::iconLoader();

KIconTemplate it;
it.path = kil->iconPath("standard", KIcon::User);

+ 5
- 5
kmrml/kmrml/kcontrol/indexcleaner.cpp View File

@@ -8,7 +8,7 @@
#if TDE_VERSION < 306
#define QUOTE( x ) x
#else
#define QUOTE( x ) KProcess::quote( x )
#define QUOTE( x ) TDEProcess::quote( x )
#endif

using namespace KMrmlConfig;
@@ -39,7 +39,7 @@ void IndexCleaner::start()
startNext();
}

void IndexCleaner::slotExited( KProcess *proc )
void IndexCleaner::slotExited( TDEProcess *proc )
{
emit advance( m_stepSize );

@@ -63,11 +63,11 @@ void IndexCleaner::startNext()
#if TDE_VERSION < 306
m_process = new KShellProcess();
#else
m_process = new KProcess();
m_process = new TDEProcess();
m_process->setUseShell( true );
#endif
connect( m_process, TQT_SIGNAL( processExited( KProcess * )),
TQT_SLOT( slotExited( KProcess * ) ));
connect( m_process, TQT_SIGNAL( processExited( TDEProcess * )),
TQT_SLOT( slotExited( TDEProcess * ) ));

TQString cmd = m_config->removeCollectionCommandLine();


+ 3
- 3
kmrml/kmrml/kcontrol/indexcleaner.h View File

@@ -11,7 +11,7 @@
#include <tqobject.h>
#include <tqstringlist.h>

class KProcess;
class TDEProcess;

namespace KMrml
{
@@ -37,7 +37,7 @@ namespace KMrmlConfig
void finished();

private slots:
void slotExited( KProcess * );
void slotExited( TDEProcess * );

private:
int m_stepSize;
@@ -45,7 +45,7 @@ namespace KMrmlConfig

TQStringList m_dirs;
const KMrml::Config *m_config;
KProcess *m_process;
TDEProcess *m_process;
};

}

+ 6
- 6
kmrml/kmrml/kcontrol/indexer.cpp View File

@@ -30,7 +30,7 @@
#if TDE_VERSION < 306
#define QUOTE( x ) x
#else
#define QUOTE( x ) KProcess::quote( x )
#define QUOTE( x ) TDEProcess::quote( x )
#endif

using namespace KMrmlConfig;
@@ -46,8 +46,8 @@ Indexer::Indexer( const KMrml::Config* config,
m_process->setUseShell( true );
#endif
m_process->setEnvironment( "LC_ALL", "C" );
connect( m_process, TQT_SIGNAL( processExited( KProcess * )),
TQT_SLOT( processFinished( KProcess * )));
connect( m_process, TQT_SIGNAL( processExited( TDEProcess * )),
TQT_SLOT( processFinished( TDEProcess * )));
connect( m_process, TQT_SIGNAL( readReady( KProcIO * )),
TQT_SLOT( slotCanRead( KProcIO * )) );
}
@@ -67,7 +67,7 @@ void Indexer::startIndexing( const TQStringList& dirs )
processNext();
}

void Indexer::processFinished( KProcess *proc )
void Indexer::processFinished( TDEProcess *proc )
{
// still more directories to index?
if ( !m_dirs.isEmpty() )
@@ -118,9 +118,9 @@ void Indexer::processNext()

void Indexer::slotCanRead( KProcIO *proc )
{
static const TQString& sprogress = KGlobal::staticQString("PROGRESS: ");
static const TQString& sprogress = TDEGlobal::staticQString("PROGRESS: ");
static const TQString& r1 = /* PROGRESS: 1 of 6 done (15%) */
KGlobal::staticQString( "(\\d+) of (\\d+) done \\((\\d+)%\\)" );
TDEGlobal::staticQString( "(\\d+) of (\\d+) done \\((\\d+)%\\)" );

TQString line;
int bytes = -1;

+ 2
- 2
kmrml/kmrml/kcontrol/indexer.h View File

@@ -23,7 +23,7 @@

#include <kmrml_config.h>

class KProcess;
class TDEProcess;
class KProcIO;

namespace KMrmlConfig
@@ -48,7 +48,7 @@ namespace KMrmlConfig

private slots:
void slotCanRead( KProcIO * );
void processFinished( KProcess * );
void processFinished( TDEProcess * );

private:
void processNext();

+ 1
- 1
kmrml/kmrml/kcontrol/indextest.cpp View File

@@ -10,7 +10,7 @@ using namespace KMrmlConfig;

IndexTest::IndexTest()
{
KMrml::Config *config = new KMrml::Config( KGlobal::config() );
KMrml::Config *config = new KMrml::Config( TDEGlobal::config() );
Indexer *indexer = new Indexer( *config, this );
connect( indexer, TQT_SIGNAL( finished( bool )), TQT_SLOT( slotFinished( bool )));
connect( indexer, TQT_SIGNAL( progress( int, const TQString& )),

+ 2
- 2
kmrml/kmrml/kcontrol/kcmkmrml.cpp View File

@@ -75,8 +75,8 @@ KCMKMrml::~KCMKMrml()

void KCMKMrml::checkGiftInstallation()
{
TQString giftExe = KGlobal::dirs()->findExe( "gift" );
TQString giftAddCollectionExe = KGlobal::dirs()->findExe( "gift-add-collection.pl" );
TQString giftExe = TDEGlobal::dirs()->findExe( "gift" );
TQString giftAddCollectionExe = TDEGlobal::dirs()->findExe( "gift-add-collection.pl" );

if ( giftExe.isEmpty() || giftAddCollectionExe.isEmpty() )
{

+ 1
- 1
kmrml/kmrml/kcontrol/mainpage.cpp View File

@@ -73,7 +73,7 @@ MainPage::MainPage( TQWidget *parent, const char *name )
#if TDE_VERSION >= 306
KURLRequester *requester = new KURLRequester( this, "dir requester" );
requester->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly );
requester->setURL( KGlobalSettings::documentPath() );
requester->setURL( TDEGlobalSettings::documentPath() );
connect( requester, TQT_SIGNAL( openFileDialog( KURLRequester * )),
TQT_SLOT( slotRequesterClicked( KURLRequester * )));


+ 2
- 2
kmrml/kmrml/lib/kmrml_config.cpp View File

@@ -32,7 +32,7 @@
#if TDE_VERSION < 307
#define QUOTE( x ) x
#else
#define QUOTE( x ) KProcess::quote( x )
#define QUOTE( x ) TDEProcess::quote( x )
#endif

using namespace KMrml;
@@ -251,7 +251,7 @@ TQString Config::mrmldCommandline() const

TQString Config::mrmldDataDir()
{
TQString dir = KGlobal::dirs()->saveLocation( "data",
TQString dir = TDEGlobal::dirs()->saveLocation( "data",
"kmrml/mrmld-data/" );
if ( dir.isEmpty() ) // fallback
dir = TQDir::homeDirPath() + "/";

+ 2
- 2
kmrml/kmrml/mrml.cpp View File

@@ -40,7 +40,7 @@ extern "C" {
{
KLocale::setMainCatalogue("tdelibs");
TDEInstance instance( "kio_mrml" );
KGlobal::locale()->insertCatalogue( "kmrml" );
TDEGlobal::locale()->insertCatalogue( "kmrml" );

kdDebug() << "Starting MRML " << getpid() << endl;

@@ -62,7 +62,7 @@ const int Mrml::bufsize = 8192;

Mrml::Mrml( const TQCString& pool_socket, const TQCString& app_socket )
: TCPSlaveBase( 12789, "mrml", pool_socket, app_socket ),
m_config( KGlobal::config() )
m_config( TDEGlobal::config() )
{
MrmlShared::ref();
}

+ 1
- 1
kmrml/kmrml/mrml_part.cpp View File

@@ -85,7 +85,7 @@ TDEInstance * PartFactory::instance()
{
if ( !s_instance ) {
s_instance = new TDEInstance( "kmrml" );
KGlobal::locale()->insertCatalogue( "kmrml" );
TDEGlobal::locale()->insertCatalogue( "kmrml" );
}
return s_instance;
}

+ 2
- 2
kmrml/kmrml/mrml_view.cpp View File

@@ -405,7 +405,7 @@ void MrmlViewItem::mouseMoveEvent( TQMouseEvent *e )

if ( (e->state() & Qt::LeftButton) && !pressedPos.isNull() ) {
TQPoint dist = e->pos() - pressedPos;
if ( dist.manhattanLength() > KGlobalSettings::dndEventDelay() ) {
if ( dist.manhattanLength() > TDEGlobalSettings::dndEventDelay() ) {
// start drag here
KURL::List urls;
// ### support multiple files?
@@ -421,7 +421,7 @@ void MrmlViewItem::mouseReleaseEvent( TQMouseEvent *e )
{
if ( hitsPixmap( e->pos() )) {
TQPoint dist = e->pos() - pressedPos;
if ( dist.manhattanLength() < KGlobalSettings::dndEventDelay() ) {
if ( dist.manhattanLength() < TDEGlobalSettings::dndEventDelay() ) {
emit view()->activated( m_url, e->button() );
}
}

+ 9
- 9
kmrml/kmrml/server/watcher.cpp View File

@@ -75,7 +75,7 @@ bool Watcher::requireDaemon( const TQCString& clientAppId,
daemon->apps.append( clientAppId );

#if TDE_VERSION >= 306
daemon->process = new KProcess();
daemon->process = new TDEProcess();
daemon->process->setUseShell( true );
#else
daemon->process = new KShellProcess();
@@ -84,8 +84,8 @@ bool Watcher::requireDaemon( const TQCString& clientAppId,
daemon->process->setEnvironment( "LANG", "C" );
daemon->process->setEnvironment( "LANGUAGE", "C" );
*daemon->process << commandline;
connect( daemon->process, TQT_SIGNAL( processExited( KProcess * ) ),
TQT_SLOT( slotProcExited( KProcess * )));
connect( daemon->process, TQT_SIGNAL( processExited( TDEProcess * ) ),
TQT_SLOT( slotProcExited( TDEProcess * )));
return startDaemon( daemon );
}
}
@@ -128,7 +128,7 @@ TQStringList Watcher::runningDaemons() const
return result;
}

void Watcher::slotProcExited( KProcess *proc )
void Watcher::slotProcExited( TDEProcess *proc )
{
DaemonData *daemon = findDaemonFromProcess( proc );

@@ -166,7 +166,7 @@ void Watcher::slotProcExited( KProcess *proc )

bool Watcher::startDaemon( DaemonData *daemon )
{
if ( daemon->process->start( KProcess::NotifyOnExit ) )
if ( daemon->process->start( TDEProcess::NotifyOnExit ) )
return true;

else
@@ -194,8 +194,8 @@ void Watcher::slotTimeout()
{
if ( daemon->apps.isEmpty() )
{
// the daemon and KProcess might get deleted by killing the
// KProcess (through slotProcExited()), so don't dereference
// the daemon and TDEProcess might get deleted by killing the
// TDEProcess (through slotProcExited()), so don't dereference
// daemon after proc->kill()
TQString key = daemon->daemonKey;

@@ -208,7 +208,7 @@ void Watcher::slotTimeout()
}
}

DaemonData * Watcher::findDaemonFromProcess( KProcess *proc )
DaemonData * Watcher::findDaemonFromProcess( TDEProcess *proc )
{
DaemonData *daemon;
TQDictIterator<DaemonData> it( m_daemons );
@@ -265,7 +265,7 @@ void Watcher::emitFailure( DaemonData *daemon )
if ( daemon )
{
daemonDied( daemon->daemonKey, daemon->process->pid() );
m_daemons.remove( daemon->daemonKey ); // deletes daemon + KProcess
m_daemons.remove( daemon->daemonKey ); // deletes daemon + TDEProcess
}
}


+ 3
- 3
kmrml/kmrml/server/watcher.h View File

@@ -54,7 +54,7 @@ namespace KMrml
uint timeout;
TQStrList apps;
int restartOnFailure;
KProcess *process;
TDEProcess *process;
TQTimer *timer;
};

@@ -90,14 +90,14 @@ namespace KMrml

private:
void unrequireDaemon( DaemonData *daemon, const TQCString& clientAppId);
DaemonData *findDaemonFromProcess( KProcess *proc );
DaemonData *findDaemonFromProcess( TDEProcess *proc );
DaemonData *findDaemonFromTimer( TQTimer *timer );

void emitExited( DaemonData *daemon );
void emitFailure( DaemonData *daemon );

private slots:
void slotProcExited( KProcess *proc );
void slotProcExited( TDEProcess *proc );
void slotAppUnregistered( const TQCString& appId );

TQDict<DaemonData> m_daemons;

+ 1
- 1
kolourpaint/kpdocumentsaveoptions.cpp View File

@@ -371,7 +371,7 @@ static TQStringList mimeTypesSupportingProperty (const TQString &property,
{
TQStringList mimeTypeList;

KConfigGroupSaver cfgGroupSaver (KGlobal::config (),
KConfigGroupSaver cfgGroupSaver (TDEGlobal::config (),
kpSettingsGroupMimeTypeProperties);
KConfigBase *cfg = cfgGroupSaver.config ();


+ 4
- 4
kolourpaint/kpdocumentsaveoptionswidget.cpp View File

@@ -157,7 +157,7 @@ void kpDocumentSaveOptionsPreviewDialog::setFilePixmapAndSize (const TQPixmap &p
const TQString alternateText6 = i18n ("%1B (%2%)");
const TQString alternateText7 = i18n ("%1B (approx. %2%)");
m_fileSizeLabel->setText (i18n ("%1 bytes (approx. %2%)")
.arg (KGlobal::locale ()->formatLong (m_fileSize))
.arg (TDEGlobal::locale ()->formatLong (m_fileSize))
.arg (percent));
}

@@ -742,7 +742,7 @@ void kpDocumentSaveOptionsWidget::showPreview (bool yes)
this, TQT_SLOT (hidePreview ()));


KConfigGroupSaver cfgGroupSaver (KGlobal::config (), kpSettingsGroupPreviewSave);
KConfigGroupSaver cfgGroupSaver (TDEGlobal::config (), kpSettingsGroupPreviewSave);
KConfigBase *cfg = cfgGroupSaver.config ();

if (cfg->hasKey (kpSettingPreviewSaveUpdateDelay))
@@ -769,7 +769,7 @@ void kpDocumentSaveOptionsWidget::showPreview (bool yes)
#if DEBUG_KP_DOCUMENT_SAVE_OPTIONS_WIDGET
kdDebug () << "\tread cfg preview dialog last rel geometry" << endl;
#endif
KConfigGroupSaver cfgGroupSaver (KGlobal::config (), kpSettingsGroupPreviewSave);
KConfigGroupSaver cfgGroupSaver (TDEGlobal::config (), kpSettingsGroupPreviewSave);
KConfigBase *cfg = cfgGroupSaver.config ();

m_previewDialogLastRelativeGeometry = cfg->readRectEntry (
@@ -845,7 +845,7 @@ void kpDocumentSaveOptionsWidget::showPreview (bool yes)
{
m_updatePreviewDialogLastRelativeGeometryTimer->stop ();

KConfigGroupSaver cfgGroupSaver (KGlobal::config (), kpSettingsGroupPreviewSave);
KConfigGroupSaver cfgGroupSaver (TDEGlobal::config (), kpSettingsGroupPreviewSave);
KConfigBase *cfg = cfgGroupSaver.config ();

cfg->writeEntry (kpSettingPreviewSaveGeometry, m_previewDialogLastRelativeGeometry);

+ 1
- 1
kolourpaint/kpmainwindow_file.cpp View File

@@ -997,7 +997,7 @@ static bool shouldPrintImageCenteredOnPage ()
#endif
bool ret;

KConfigGroupSaver cfgGroupSaver (KGlobal::config (),
KConfigGroupSaver cfgGroupSaver (TDEGlobal::config (),
kpSettingsGroupGeneral);
KConfigBase *cfg = cfgGroupSaver.config ();


+ 1
- 1
kolourpaint/kpmainwindow_help.cpp View File

@@ -73,7 +73,7 @@ void kpMainWindow::enableHelpMenuDocumentActions (bool /*enable*/)
// SYNC: tdebase/twin/twinbindings.cpp
static TQString printScreenShortcutString ()
{
KConfigGroupSaver cfgGroupSaver (KGlobal::config (), "Global Shortcuts");
KConfigGroupSaver cfgGroupSaver (TDEGlobal::config (), "Global Shortcuts");
KConfigBase *cfg = cfgGroupSaver.config ();

// TODO: i18n() entry name? twinbindings.cpp seems to but it doesn't

+ 2
- 2
kolourpaint/pixmapfx/kpeffectflatten.cpp View File

@@ -137,7 +137,7 @@ kpEffectFlattenWidget::kpEffectFlattenWidget (bool actOnSelection,
{
if (!s_lastColor1.isValid () || !s_lastColor2.isValid ())
{
KConfigGroupSaver cfgGroupSaver (KGlobal::config (), kpSettingsGroupFlattenEffect);
KConfigGroupSaver cfgGroupSaver (TDEGlobal::config (), kpSettingsGroupFlattenEffect);
KConfigBase *cfg = cfgGroupSaver.config ();

s_lastColor1 = cfg->readColorEntry (kpSettingFlattenEffectColor1);
@@ -183,7 +183,7 @@ kpEffectFlattenWidget::~kpEffectFlattenWidget ()
s_lastColor2 = color2 ();


KConfigGroupSaver cfgGroupSaver (KGlobal::config (), kpSettingsGroupFlattenEffect);
KConfigGroupSaver cfgGroupSaver (TDEGlobal::config (), kpSettingsGroupFlattenEffect);
KConfigBase *cfg = cfgGroupSaver.config ();

cfg->writeEntry (kpSettingFlattenEffectColor1, s_lastColor1);

+ 1
- 1
kolourpaint/pixmapfx/kppixmapfx.cpp View File

@@ -492,7 +492,7 @@ TQPixmap kpPixmapFX::convertToPixmapAsLosslessAsPossible (const TQImage &image,

int configDitherIfNumColorsGreaterThan = 323;

KConfigGroupSaver cfgGroupSaver (KGlobal::config (),
KConfigGroupSaver cfgGroupSaver (TDEGlobal::config (),
kpSettingsGroupGeneral);
KConfigBase *cfg = cfgGroupSaver.config ();


+ 1
- 1
kolourpaint/tools/kptoolresizescale.cpp View File

@@ -604,7 +604,7 @@ static TQIconSet toolButtonIconSet (const TQString &iconName)
// No "disabled" pixmap is generated by UserIconSet() so generate it
// ourselves:

TQPixmap disabledIcon = KGlobal::iconLoader ()->iconEffect ()->apply (
TQPixmap disabledIcon = TDEGlobal::iconLoader ()->iconEffect ()->apply (
UserIcon (iconName),
KIcon::Toolbar, KIcon::DisabledState);


+ 2
- 2
kolourpaint/widgets/kptooltoolbar.cpp View File

@@ -175,7 +175,7 @@ int kpToolToolBar::defaultIconSize ()
#endif


KConfigGroupSaver cfgGroupSaver (KGlobal::config (),
KConfigGroupSaver cfgGroupSaver (TDEGlobal::config (),
kpSettingsGroupTools);
KConfigBase *cfg = cfgGroupSaver.config ();

@@ -200,7 +200,7 @@ int kpToolToolBar::defaultIconSize ()
if (m_defaultIconSize <= 0)
{
// Adapt according to screen geometry
const TQRect desktopSize = KGlobalSettings::desktopGeometry (this);
const TQRect desktopSize = TDEGlobalSettings::desktopGeometry (this);
#if DEBUG_KP_TOOL_TOOL_BAR
kdDebug () << "\tadapting to screen size=" << desktopSize << endl;
#endif

+ 5
- 5
kooka/img_saver.cpp View File

@@ -335,7 +335,7 @@ ImgSaveStat ImgSaver::saveImage( TQImage *image )
kdDebug(28000) << "saveImage: Directory is " << directory << endl;
TQString filename = createFilename( format );

KConfig *konf = KGlobal::config ();
KConfig *konf = TDEGlobal::config ();
konf->setGroup( OP_FILE_GROUP );

if( konf->readBoolEntry( OP_ASK_FILENAME, false ) )
@@ -425,7 +425,7 @@ ImgSaveStat ImgSaver::saveImage( TQImage *image, const KURL& filename, const TQS
TQString ImgSaver::findFormat( picType type )
{
TQString format;
KConfig *konf = KGlobal::config ();
KConfig *konf = TDEGlobal::config ();
konf->setGroup( OP_FILE_GROUP );

if( type == PT_THUMBNAIL )
@@ -552,7 +552,7 @@ bool ImgSaver::isRememberedFormat( picType type, TQString format ) const

TQString ImgSaver::getFormatForType( picType type ) const
{
KConfig *konf = KGlobal::config ();
KConfig *konf = TDEGlobal::config ();
TQ_CHECK_PTR( konf );
konf->setGroup( OP_FILE_GROUP );

@@ -582,7 +582,7 @@ TQString ImgSaver::getFormatForType( picType type ) const

void ImgSaver::storeFormatForType( picType type, TQString format, bool ask )
{
KConfig *konf = KGlobal::config ();
KConfig *konf = TDEGlobal::config ();
TQ_CHECK_PTR( konf );
konf->setGroup( OP_FILE_GROUP );

@@ -691,7 +691,7 @@ ImgSaveStat ImgSaver::save( TQImage *image, const TQString &filename,
void ImgSaver::readConfig( void )
{

KConfig *konf = KGlobal::config ();
KConfig *konf = TDEGlobal::config ();
TQ_CHECK_PTR( konf );
konf->setGroup( OP_FILE_GROUP );
ask_for_format = konf->readBoolEntry( OP_FILE_ASK_FORMAT, true );

+ 2
- 2
kooka/kocrbase.cpp View File

@@ -81,7 +81,7 @@ KOCRBase::KOCRBase( TQWidget *parent, KSpellConfig *spellConfig,
kdDebug(28000) << "OCR Base Dialog!" << endl;
// Layout-Boxes

KConfig *konf = KGlobal::config ();
KConfig *konf = TDEGlobal::config ();
KConfigGroupSaver gs( konf, CFG_OCR_KSPELL );
m_userWantsSpellCheck = konf->readBoolEntry(CFG_WANT_KSPELL, true);

@@ -359,7 +359,7 @@ void KOCRBase::slWantSpellcheck( bool wantIt )
}
m_userWantsSpellCheck = wantIt;

KConfig *konf = KGlobal::config ();
KConfig *konf = TDEGlobal::config ();
KConfigGroupSaver gs( konf, CFG_OCR_KSPELL );
konf->writeEntry( CFG_WANT_KSPELL, wantIt );
}

+ 2
- 2
kooka/kocrgocr.cpp View File

@@ -93,7 +93,7 @@ EngineError KGOCRDialog::setupGui()
TQVBox *page = ocrPage();
TQ_CHECK_PTR( page );

KConfig *conf = KGlobal::config ();
KConfig *conf = TDEGlobal::config ();
conf->setGroup( CFG_GROUP_OCR_DIA );

//Qt::Horizontal line
@@ -179,7 +179,7 @@ KGOCRDialog::~KGOCRDialog()

void KGOCRDialog::writeConfig( void )
{
KConfig *conf = KGlobal::config ();
KConfig *conf = TDEGlobal::config ();
conf->setGroup( CFG_GROUP_OCR_DIA );

conf->writeEntry( CFG_GOCR_BINARY, TQString(getOCRCmd()));

+ 3
- 3
kooka/kocrkadmos.cpp View File

@@ -100,7 +100,7 @@ EngineError KadmosDialog::findClassifiers()
{
findClassifierPath();

KLocale *locale = KGlobal::locale();
KLocale *locale = TDEGlobal::locale();
TQStringList allCountries = locale->allLanguagesTwoAlpha ();
for ( TQStringList::Iterator it = allCountries.begin();
it != allCountries.end(); ++it )
@@ -236,7 +236,7 @@ EngineError KadmosDialog::findClassifierPath()
KStandardDirs stdDir;
EngineError err = ENG_OK;

KConfig *conf = KGlobal::config ();
KConfig *conf = TDEGlobal::config ();
KConfigGroupSaver gs( conf, CFG_GROUP_KADMOS );

m_customClassifierPath = conf->readPathEntry( CFG_KADMOS_CLASSIFIER_PATH );
@@ -341,7 +341,7 @@ void KadmosDialog::slFontChanged( int id )
{
m_cbLang->clear();

KConfig *conf = KGlobal::config ();
KConfig *conf = TDEGlobal::config ();
KConfigGroupSaver gs( conf, CFG_GROUP_KADMOS );



+ 7
- 7
kooka/kocrocrad.cpp View File

@@ -104,7 +104,7 @@ EngineError ocradDialog::setupGui()
TQVBox *page = ocrPage();
TQ_CHECK_PTR( page );

KConfig *conf = KGlobal::config ();
KConfig *conf = TDEGlobal::config ();
conf->setGroup( CFG_GROUP_OCR_DIA );

//Qt::Horizontal line
@@ -177,7 +177,7 @@ ocradDialog::~ocradDialog()

void ocradDialog::writeConfig( void )
{
KConfig *conf = KGlobal::config ();
KConfig *conf = TDEGlobal::config ();
conf->setGroup( CFG_GROUP_OCR_DIA );

conf->writeEntry( CFG_OCRAD_BINARY, TQString(getOCRCmd()));
@@ -207,22 +207,22 @@ void ocradDialog::version( const TQString& exe )
{
if( m_proc ) delete m_proc;

m_proc = new KProcess;
m_proc = new TDEProcess;

kdDebug(28000) << "Using " << exe << " as command" << endl;
*m_proc << exe;
*m_proc << TQString("-V");

connect( m_proc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int )),
this, TQT_SLOT(slReceiveStdIn(KProcess *, char *, int )));
connect( m_proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int )),
this, TQT_SLOT(slReceiveStdIn(TDEProcess *, char *, int )));

if( ! m_proc->start( KProcess::NotifyOnExit, KProcess::Stdout ) )
if( ! m_proc->start( TDEProcess::NotifyOnExit, TDEProcess::Stdout ) )
{
slReceiveStdIn( 0, (char*) "unknown", 7 );
}
}

void ocradDialog::slReceiveStdIn( KProcess*, char *buffer, int buflen)
void ocradDialog::slReceiveStdIn( TDEProcess*, char *buffer, int buflen)
{
TQString vstr = TQString::fromUtf8(buffer, buflen);


+ 3
- 3
kooka/kocrocrad.h View File

@@ -48,7 +48,7 @@

class KSpellConfig;
class KURLRequester;
class KProcess;
class TDEProcess;
class TQLabel;
class TQComboBox;

@@ -92,7 +92,7 @@ private:
void version( const TQString& exe );

private slots:
void slReceiveStdIn( KProcess *proc, char *buffer, int buflen);
void slReceiveStdIn( TDEProcess *proc, char *buffer, int buflen);

private:

@@ -100,7 +100,7 @@ private:
KURLRequester *m_orfUrlRequester;
TQComboBox *m_layoutMode;
TQLabel *m_binaryLabel;
KProcess *m_proc;
TDEProcess *m_proc;
int m_version;
};


+ 4
- 4
kooka/kooka.cpp View File

@@ -75,7 +75,7 @@ Kooka::Kooka( const TQCString& deviceToUse)
setXMLFile( "kookaui.rc", true );

setAcceptDrops(false); // Waba: Not (yet?) supported
KConfig *konf = KGlobal::config ();
KConfig *konf = TDEGlobal::config ();
readDockConfig ( konf, DOCK_SIZES );

// then, setup our actions
@@ -109,7 +109,7 @@ void Kooka::createMyGUI( KParts::Part *part )

Kooka::~Kooka()
{
KConfig *konf = KGlobal::config ();
KConfig *konf = TDEGlobal::config ();
m_view->slCloseScanDevice();
writeDockConfig ( konf, DOCK_SIZES );
delete m_printer;
@@ -385,7 +385,7 @@ void Kooka::optionsShowPreviewer()
void Kooka::optionsConfigureToolbars()
{
// use the standard toolbar editor
saveMainWindowSettings(KGlobal::config(), autoSaveGroup());
saveMainWindowSettings(TDEGlobal::config(), autoSaveGroup());
KEditToolbar dlg(factory());
connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_SLOT(newToolbarConfig()));
dlg.exec();
@@ -394,7 +394,7 @@ void Kooka::optionsConfigureToolbars()
void Kooka::newToolbarConfig()
{
// OK/Apply pressed in the toolbar editor
applyMainWindowSettings(KGlobal::config(), autoSaveGroup());
applyMainWindowSettings(TDEGlobal::config(), autoSaveGroup());
}

void Kooka::optionsPreferences()

+ 2
- 2
kooka/kookapref.cpp View File

@@ -62,7 +62,7 @@ KookaPreferences::KookaPreferences()
// this is the base class for your preferences dialog. it is now
// a Treelist dialog.. but there are a number of other
// possibilities (including Tab, Swallow, and just Plain)
konf = KGlobal::config ();
konf = TDEGlobal::config ();

setupStartupPage();
setupSaveFormatPage();
@@ -200,7 +200,7 @@ TQString KookaPreferences::tryFindBinary( const TQString& bin, const TQString& c
{

/* First check the config files for an entry */
KConfig *cfg = KGlobal::config();
KConfig *cfg = TDEGlobal::config();
cfg->setGroup(CFG_GROUP_OCR_DIA);
TQString res = cfg->readPathEntry( configKey /* CFG_GOCR_BINARY */, "notFound" );


+ 4
- 4
kooka/kookaview.cpp View File

@@ -96,7 +96,7 @@ KookaView::KookaView( KParts::DockMainWindow *parent, const TQCString& deviceToU
m_mainWindow(parent),
m_ocrResEdit(0)
{
KIconLoader *loader = KGlobal::iconLoader();
KIconLoader *loader = TDEGlobal::iconLoader();
scan_params = 0L;
preview_canvas = 0L;

@@ -294,7 +294,7 @@ KookaView::KookaView( KParts::DockMainWindow *parent, const TQCString& deviceToU

KookaView::~KookaView()
{
saveProperties( KGlobal::config () );
saveProperties( TDEGlobal::config () );
delete preview_canvas;

kdDebug(28000)<< "Finished saving config data" << endl;
@@ -438,7 +438,7 @@ void KookaView::loadStartupImage( void )
kdDebug( 28000) << "Starting to load startup image" << endl;

/* Now set the configured stuff */
KConfig *konf = KGlobal::config ();
KConfig *konf = TDEGlobal::config ();
if( konf )
{
konf->setGroup(GROUP_STARTUP);
@@ -555,7 +555,7 @@ void KookaView::startOCR( KookaImage *img )
{
if( ocrFabric == 0L )
{
ocrFabric = new KSANEOCR( m_mainDock, KGlobal::config() );
ocrFabric = new KSANEOCR( m_mainDock, TDEGlobal::config() );
ocrFabric->setImageCanvas( img_canvas );

connect( ocrFabric, TQT_SIGNAL( newOCRResultText( const TQString& )),

+ 24
- 24
kooka/ksaneocr.cpp View File

@@ -85,7 +85,7 @@ KSANEOCR::KSANEOCR( TQWidget*, KConfig *cfg ):
m_applyFilter(false),
m_unlinkORF(true)
{
KConfig *konf = KGlobal::config ();
KConfig *konf = TDEGlobal::config ();
m_ocrEngine = OCRAD;
m_img = 0L;
m_tmpFile = 0L;
@@ -393,7 +393,7 @@ void KSANEOCR::startOCRAD( )
daemon = 0;
}

daemon = new KProcess;
daemon = new TDEProcess;
TQ_CHECK_PTR(daemon);

*daemon << cmd;
@@ -403,7 +403,7 @@ void KSANEOCR::startOCRAD( )
*daemon << TQString("-l");
*daemon << TQString::number( ocrDia->layoutDetectionMode());

KConfig *konf = KGlobal::config ();
KConfig *konf = TDEGlobal::config ();
KConfigGroupSaver( konf, CFG_GROUP_OCRAD );

TQString format = konf->readEntry( CFG_OCRAD_FORMAT, "utf8");
@@ -425,14 +425,14 @@ void KSANEOCR::startOCRAD( )

m_ocrResultText = "";

connect(daemon, TQT_SIGNAL(processExited(KProcess *)),
this, TQT_SLOT( ocradExited(KProcess*)));
connect(daemon, TQT_SIGNAL(receivedStdout(KProcess *, char*, int)),
this, TQT_SLOT( ocradStdIn(KProcess*, char*, int)));
connect(daemon, TQT_SIGNAL(receivedStderr(KProcess *, char*, int)),
this, TQT_SLOT( ocradStdErr(KProcess*, char*, int)));
connect(daemon, TQT_SIGNAL(processExited(TDEProcess *)),
this, TQT_SLOT( ocradExited(TDEProcess*)));
connect(daemon, TQT_SIGNAL(receivedStdout(TDEProcess *, char*, int)),
this, TQT_SLOT( ocradStdIn(TDEProcess*, char*, int)));
connect(daemon, TQT_SIGNAL(receivedStderr(TDEProcess *, char*, int)),
this, TQT_SLOT( ocradStdErr(TDEProcess*, char*, int)));

if (!daemon->start(KProcess::NotifyOnExit, KProcess::All))
if (!daemon->start(TDEProcess::NotifyOnExit, TDEProcess::All))
{
kdDebug(28000) << "Error starting ocrad-daemon!" << endl;
}
@@ -445,7 +445,7 @@ void KSANEOCR::startOCRAD( )
}


void KSANEOCR::ocradExited(KProcess* )
void KSANEOCR::ocradExited(TDEProcess* )
{
kdDebug(28000) << "ocrad exit " << endl;
TQString err;
@@ -462,14 +462,14 @@ void KSANEOCR::ocradExited(KProcess* )

}

void KSANEOCR::ocradStdErr(KProcess*, char* buffer, int buflen)
void KSANEOCR::ocradStdErr(TDEProcess*, char* buffer, int buflen)
{
TQString errorBuffer = TQString::fromLocal8Bit(buffer, buflen);
kdDebug(28000) << "ocrad says on stderr: " << errorBuffer << endl;

}

void KSANEOCR::ocradStdIn(KProcess*, char* buffer, int buflen)
void KSANEOCR::ocradStdIn(TDEProcess*, char* buffer, int buflen)
{
TQString errorBuffer = TQString::fromLocal8Bit(buffer, buflen);
kdDebug(28000) << "ocrad says on stdin: " << errorBuffer << endl;
@@ -531,16 +531,16 @@ void KSANEOCR::startOCRProcess( void )
daemon = 0;
}

daemon = new KProcess;
daemon = new TDEProcess;
TQ_CHECK_PTR(daemon);
m_ocrResultText = "";

connect(daemon, TQT_SIGNAL(processExited(KProcess *)),
this, TQT_SLOT( gocrExited(KProcess*)));
connect(daemon, TQT_SIGNAL(receivedStdout(KProcess *, char*, int)),
this, TQT_SLOT( gocrStdIn(KProcess*, char*, int)));
connect(daemon, TQT_SIGNAL(receivedStderr(KProcess *, char*, int)),
this, TQT_SLOT( gocrStdErr(KProcess*, char*, int)));
connect(daemon, TQT_SIGNAL(processExited(TDEProcess *)),
this, TQT_SLOT( gocrExited(TDEProcess*)));
connect(daemon, TQT_SIGNAL(receivedStdout(TDEProcess *, char*, int)),
this, TQT_SLOT( gocrStdIn(TDEProcess*, char*, int)));
connect(daemon, TQT_SIGNAL(receivedStderr(TDEProcess *, char*, int)),
this, TQT_SLOT( gocrStdErr(TDEProcess*, char*, int)));

TQString opt;
*daemon << TQFile::encodeName(cmd).data();
@@ -570,7 +570,7 @@ void KSANEOCR::startOCRProcess( void )

m_ocrCurrLine = 0; // Important in gocrStdIn to store the results

if (!daemon->start(KProcess::NotifyOnExit, KProcess::All))
if (!daemon->start(TDEProcess::NotifyOnExit, TDEProcess::All))
{
kdDebug(28000) << "Error starting daemon!" << endl;
}
@@ -715,7 +715,7 @@ void KSANEOCR::slotKadmosResult()
/*
*
*/
void KSANEOCR::gocrExited(KProcess* d)
void KSANEOCR::gocrExited(TDEProcess* d)
{
kdDebug(28000) << "daemonExited start !" << endl;

@@ -1051,7 +1051,7 @@ void KSANEOCR::cleanUpFiles( void )
}


void KSANEOCR::gocrStdErr(KProcess*, char* buffer, int buflen)
void KSANEOCR::gocrStdErr(TDEProcess*, char* buffer, int buflen)
{
TQString errorBuffer = TQString::fromLocal8Bit(buffer, buflen);
kdDebug(28000) << "gocr says: " << errorBuffer << endl;
@@ -1059,7 +1059,7 @@ void KSANEOCR::gocrStdErr(KProcess*, char* buffer, int buflen)
}


void KSANEOCR::gocrStdIn(KProcess*, char* buffer, int buflen)
void KSANEOCR::gocrStdIn(TDEProcess*, char* buffer, int buflen)
{
TQString aux = TQString::fromLocal8Bit(buffer, buflen);


+ 8
- 8
kooka/ksaneocr.h View File

@@ -52,7 +52,7 @@
class KOCRBase;
class KookaImage;
class KTempFile;
class KProcess;
class TDEProcess;
class TQRect;
class TQPixmap;
class TQStringList;
@@ -222,13 +222,13 @@ private slots:

void slotKadmosResult();
void startOCRProcess( void );
void gocrStdIn(KProcess*, char* buffer, int buflen);
void gocrStdErr(KProcess*, char* buffer, int buflen);
void gocrExited(KProcess*);
void gocrStdIn(TDEProcess*, char* buffer, int buflen);
void gocrStdErr(TDEProcess*, char* buffer, int buflen);
void gocrExited(TDEProcess*);

void ocradStdIn(KProcess*, char* buffer, int buflen);
void ocradStdErr(KProcess*, char* buffer, int buflen);
void ocradExited(KProcess*);
void ocradStdIn(TDEProcess*, char* buffer, int buflen);
void ocradStdErr(TDEProcess*, char* buffer, int buflen);
void ocradExited(TDEProcess*);

/*
* reads orf files from a file and fills the result structures
@@ -241,7 +241,7 @@ private:


KOCRBase *m_ocrProcessDia;
KProcess *daemon;
TDEProcess *daemon;
bool visibleOCRRunning;
KTempFile *m_tmpFile;


+ 2
- 2
kooka/main.cpp View File

@@ -85,9 +85,9 @@ int main( int argc, char *argv[] )
TDECmdLineArgs::addCmdLineOptions( options ); // Add my own options.

TDEApplication app;
KGlobal::locale()->insertCatalogue("libkscan");
TDEGlobal::locale()->insertCatalogue("libkscan");
KImageIO::registerFormats();
KIconLoader *loader = KGlobal::iconLoader();
KIconLoader *loader = TDEGlobal::iconLoader();

TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
TQCString devToUse = args->getOption( "d" );

+ 3
- 3
kooka/scanpackager.cpp View File

@@ -117,7 +117,7 @@ ScanPackager::ScanPackager( TQWidget *parent ) : KFileTreeView( parent )
m_currImportDir = m_currCopyDir;

/* Preload frequently used icons */
KIconLoader *loader = KGlobal::iconLoader();
KIconLoader *loader = TDEGlobal::iconLoader();
m_floppyPixmap = loader->loadIcon( "3floppy_unmount", KIcon::Small );
m_grayPixmap = loader->loadIcon( "palette_gray", KIcon::Small );
m_bwPixmap = loader->loadIcon( "palette_lineart", KIcon::Small );
@@ -145,7 +145,7 @@ void ScanPackager::openRoots()

KFileTreeBranch* ScanPackager::openRoot( const KURL& root, bool )
{
KIconLoader *loader = KGlobal::iconLoader();
KIconLoader *loader = TDEGlobal::iconLoader();

/* working on the global branch. FIXME */
m_defaultBranch = addBranch( root, i18n("Kooka Gallery"),
@@ -581,7 +581,7 @@ void ScanPackager::loadImageForItem( KFileTreeViewItem *item )
kdDebug(28000) << "subImage-count: " << img->subImagesCount() << endl;
if( img->subImagesCount() > 1 )
{
KIconLoader *loader = KGlobal::iconLoader();
KIconLoader *loader = TDEGlobal::iconLoader();
kdDebug(28000) << "SubImages existing!" << endl;

/* Start at the image with index 1, that makes one less than are actually in the

+ 2
- 2
kooka/thumbview.cpp View File

@@ -86,7 +86,7 @@ ThumbView::~ThumbView()

bool ThumbView::readSettings()
{
KConfig *cfg = KGlobal::config();
KConfig *cfg = TDEGlobal::config();
cfg->setGroup( THUMB_GROUP );
bool dirty = false;

@@ -481,7 +481,7 @@ void ThumbView::clear()

void ThumbView::saveConfig()
{
KConfig *cfg = KGlobal::config();
KConfig *cfg = TDEGlobal::config();
cfg->setGroup( THUMB_GROUP );

cfg->writeEntry( MARGIN_COLOR1, m_marginColor1 );

+ 1
- 1
kpdf/core/generator_pdf/generator_pdf.cpp View File

@@ -842,7 +842,7 @@ TQString PDFGenerator::getDocumentDate( const TQString & data ) const
TQDate d( year, mon, day ); //CHECK: it was mon-1, Jan->0 (??)
TQTime t( hour, min, sec );
if ( d.isValid() && t.isValid() )
result = KGlobal::locale()->formatDateTime( TQDateTime(d, t), false, true );
result = TDEGlobal::locale()->formatDateTime( TQDateTime(d, t), false, true );
else
result = s;
}

+ 3
- 3
kpdf/part.cpp View File

@@ -127,7 +127,7 @@ Part::Part(TQWidget *parentWidget, const char *widgetName,
connect(this, TQT_SIGNAL(canceled(const TQString &)), this, TQT_SLOT(emitWindowCaption()));
// load catalog for translation
KGlobal::locale()->insertCatalogue("kpdf");
TDEGlobal::locale()->insertCatalogue("kpdf");

// create browser extension (for printing when embedded into browser)
m_bExtension = new BrowserExtension(this);
@@ -428,11 +428,11 @@ bool Part::openFile()
tf.close();
m_temporaryLocalFile = tf.name();

KProcess *p = new KProcess;
TDEProcess *p = new TDEProcess;
*p << app;
*p << m_file << m_temporaryLocalFile;
m_pageView->showText(i18n("Converting from ps to pdf..."), 0);
connect(p, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(psTransformEnded()));
connect(p, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(psTransformEnded()));
p -> start();
return true;
}

+ 9
- 9
kpdf/shell/shell.cpp View File

@@ -92,7 +92,7 @@ void Shell::init()
connect( m_part, TQT_SIGNAL( enablePrintAction(bool) ), m_printAction, TQT_SLOT( setEnabled(bool)));
readSettings();
if (!KGlobal::config()->hasGroup("MainWindow"))
if (!TDEGlobal::config()->hasGroup("MainWindow"))
{
KMainWindowInterface kmwi(this);
kmwi.maximize();
@@ -127,21 +127,21 @@ void Shell::openURL( const KURL & url )

void Shell::readSettings()
{
m_recent->loadEntries( KGlobal::config() );
m_recent->loadEntries( TDEGlobal::config() );
m_recent->setEnabled( true ); // force enabling
m_recent->setToolTip( i18n("Click to open a file\nClick and hold to open a recent file") );

KGlobal::config()->setDesktopGroup();
bool fullScreen = KGlobal::config()->readBoolEntry( "FullScreen", false );
TDEGlobal::config()->setDesktopGroup();
bool fullScreen = TDEGlobal::config()->readBoolEntry( "FullScreen", false );
setFullScreen( fullScreen );
}

void Shell::writeSettings()
{
m_recent->saveEntries( KGlobal::config() );
KGlobal::config()->setDesktopGroup();
KGlobal::config()->writeEntry( "FullScreen", m_fullScreenAction->isChecked());
KGlobal::config()->sync();
m_recent->saveEntries( TDEGlobal::config() );
TDEGlobal::config()->setDesktopGroup();
TDEGlobal::config()->writeEntry( "FullScreen", m_fullScreenAction->isChecked());
TDEGlobal::config()->sync();
}

void Shell::setupActions()
@@ -204,7 +204,7 @@ Shell::optionsConfigureToolbars()
void
Shell::applyNewToolbarConfig()
{
applyMainWindowSettings(KGlobal::config(), "MainWindow");
applyMainWindowSettings(TDEGlobal::config(), "MainWindow");
}

void Shell::slotQuit()

+ 3
- 3
kpdf/ui/pageview.cpp View File

@@ -1513,7 +1513,7 @@ void PageView::updateZoom( ZoomMode newZoomMode )
{
case ZoomFixed:{ //ZoomFixed case
TQString z = d->aZoom->currentText();
newFactor = KGlobal::locale()->readNumber( z.remove( z.find( '%' ), 1 ) ) / 100.0;
newFactor = TDEGlobal::locale()->readNumber( z.remove( z.find( '%' ), 1 ) ) / 100.0;
}break;
case ZoomIn:
newFactor += (newFactor > 0.99) ? ( newFactor > 1.99 ? 0.5 : 0.2 ) : 0.1;
@@ -1597,8 +1597,8 @@ void PageView::updateZoomText()
inserted = true;
if ( !inserted )
selIdx++;
TQString localValue( KGlobal::locale()->formatNumber( value * 100.0, 2 ) );
localValue.remove( KGlobal::locale()->decimalSymbol() + double_oh );
TQString localValue( TDEGlobal::locale()->formatNumber( value * 100.0, 2 ) );
localValue.remove( TDEGlobal::locale()->decimalSymbol() + double_oh );
translated << TQString( "%1%" ).arg( localValue );
}
d->aZoom->setItems( translated );

+ 1
- 1
kpdf/ui/presentationwidget.cpp View File

@@ -299,7 +299,7 @@ void PresentationWidget::paintEvent( TQPaintEvent * pe )
{
if (m_width == -1)
{
TQRect d = KGlobalSettings::desktopGeometry(this);
TQRect d = TDEGlobalSettings::desktopGeometry(this);
m_width = d.width();
m_height = d.height();


+ 1
- 1
kpdf/ui/propertiesdialog.cpp View File

@@ -88,7 +88,7 @@ PropertiesDialog::PropertiesDialog(TQWidget *parent, KPDFDocument *doc)
width = TQMAX( width, page2Layout->sizeHint().width() + marginHint() + spacingHint() + 31 );
}
// stay inside the 2/3 of the screen width
TQRect screenContainer = KGlobalSettings::desktopGeometry( this );
TQRect screenContainer = TDEGlobalSettings::desktopGeometry( this );
width = TQMIN( width, 2*screenContainer.width()/3 );
resize(width, 1);
}

+ 1
- 1
kpovmodeler/pmcommentedit.cpp View File

@@ -36,7 +36,7 @@ void PMCommentEdit::createTopWidgets( )
m_pEdit = new TQMultiLineEdit( this );
m_pEdit->setTextFormat( TQt::PlainText );
m_pEdit->setWordWrap( TQTextEdit::NoWrap );
m_pEdit->setFont( KGlobalSettings::fixedFont( ) );
m_pEdit->setFont( TDEGlobalSettings::fixedFont( ) );
topLayout( )->addWidget( m_pEdit, 2 );
connect( m_pEdit, TQT_SIGNAL( textChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );

+ 1
- 1
kpovmodeler/pmdialogview.cpp View File

@@ -281,7 +281,7 @@ void PMDialogView::slotHelp( )
{
// Instead of calling invokeBrowser run konqueror directly.
// invokeBrowser was ignoring html anchors.
url = "konqueror " + KProcess::quote(url);
url = "konqueror " + TDEProcess::quote(url);
KRun::runCommand( url );
}
}

+ 3
- 3
kpovmodeler/pmdockwidget.cpp View File

@@ -179,7 +179,7 @@ void PMDockMainWindow::createGUI( Part * part )

if( !d->m_bShellGUIActivated )
{
loadPlugins( TQT_TQOBJECT(this), this, KGlobal::instance() );
loadPlugins( TQT_TQOBJECT(this), this, TDEGlobal::instance() );
createShellGUI();
d->m_bShellGUIActivated = true;
}
@@ -2003,7 +2003,7 @@ void PMDockManager::readConfig(TQDomElement &base)
void PMDockManager::writeConfig( KConfig* c, TQString group )
{
//debug("BEGIN Write Config");
if ( !c ) c = KGlobal::config();
if ( !c ) c = TDEGlobal::config();
if ( group.isEmpty() ) group = "dock_setting_default";

c->setGroup( group );
@@ -2121,7 +2121,7 @@ void PMDockManager::writeConfig( KConfig* c, TQString group )
#include <tqmessagebox.h>
void PMDockManager::readConfig( KConfig* c, TQString group )
{
if ( !c ) c = KGlobal::config();
if ( !c ) c = TDEGlobal::config();
if ( group.isEmpty() ) group = "dock_setting_default";

c->setGroup( group );

+ 1
- 1
kpovmodeler/pmlibrarymanager.cpp View File

@@ -82,7 +82,7 @@ void PMLibraryManager::scanLibraries( )
TQStringList libraryDirectories;
// Search for sub directories in /usr/share/kpovmodeler/library
libraryDirectories = KGlobal::dirs( )->findDirs( "data", "kpovmodeler/library" );
libraryDirectories = TDEGlobal::dirs( )->findDirs( "data", "kpovmodeler/library" );

for( TQStringList::Iterator i = libraryDirectories.begin( ); i != libraryDirectories.end( ); ++i )
{

+ 2
- 2
kpovmodeler/pmpart.h View File

@@ -62,7 +62,7 @@ class KSelectAction;
class PMComboAction;
class PMSpinBoxAction;
class PMLabelAction;
class KProcess;
class TDEProcess;

/**
* The part for kpovmodeler (povray document)
@@ -1032,7 +1032,7 @@ public:
PMBrowserExtension( PMPart* parent )
: KParts::BrowserExtension( parent, "PMBrowserExtension" )
{
KGlobal::locale()->insertCatalogue("kpovmodeler");
TDEGlobal::locale()->insertCatalogue("kpovmodeler");
}

virtual ~PMBrowserExtension( )

+ 1
- 1
kpovmodeler/pmpovrayoutputwidget.cpp View File

@@ -37,7 +37,7 @@ PMPovrayOutputWidget::PMPovrayOutputWidget( TQWidget* parent, const char* name )

m_pTextView = new TQTextEdit( this );
topLayout->addWidget( m_pTextView, 1 );
m_pTextView->setFont( KGlobalSettings::fixedFont( ) );
m_pTextView->setFont( TDEGlobalSettings::fixedFont( ) );
m_pTextView->setTextFormat( TQt::PlainText );
m_pTextView->setReadOnly( true );


+ 12
- 12
kpovmodeler/pmpovrayrenderwidget.cpp View File

@@ -86,13 +86,13 @@ bool PMPovrayRenderWidget::render( const TQByteArray& scene,
dstr->writeRawBytes( scene.data( ), scene.size( ) );
m_pTempFile->close( );

m_pProcess = new KProcess( );
connect( m_pProcess, TQT_SIGNAL( receivedStdout( KProcess*, char*, int ) ),
TQT_SLOT( slotPovrayImage( KProcess*, char*, int ) ) );
connect( m_pProcess, TQT_SIGNAL( receivedStderr( KProcess*, char*, int ) ),
TQT_SLOT( slotPovrayMessage( KProcess*, char*, int ) ) );
connect( m_pProcess, TQT_SIGNAL( processExited( KProcess* ) ),
TQT_SLOT( slotRenderingFinished( KProcess* ) ) );
m_pProcess = new TDEProcess( );
connect( m_pProcess, TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ),
TQT_SLOT( slotPovrayImage( TDEProcess*, char*, int ) ) );
connect( m_pProcess, TQT_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ),
TQT_SLOT( slotPovrayMessage( TDEProcess*, char*, int ) ) );
connect( m_pProcess, TQT_SIGNAL( processExited( TDEProcess* ) ),
TQT_SLOT( slotRenderingFinished( TDEProcess* ) ) );

*m_pProcess << s_povrayCommand;

@@ -136,7 +136,7 @@ bool PMPovrayRenderWidget::render( const TQByteArray& scene,
m_bPixmapUpToDate = false;
repaint( );

if( !m_pProcess->start( KProcess::NotifyOnExit, KProcess::AllOutput ) )
if( !m_pProcess->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) )
{
KMessageBox::error( this, i18n( "Couldn't call povray.\n"
"Please check your installation "
@@ -179,7 +179,7 @@ void PMPovrayRenderWidget::resumeRendering( )
}
}

void PMPovrayRenderWidget::slotPovrayMessage( KProcess*,
void PMPovrayRenderWidget::slotPovrayMessage( TDEProcess*,
char* buffer, int buflen )
{
TQString str;
@@ -188,7 +188,7 @@ void PMPovrayRenderWidget::slotPovrayMessage( KProcess*,
emit povrayMessage( str );
}

void PMPovrayRenderWidget::slotPovrayImage( KProcess*, char* buffer, int buflen )
void PMPovrayRenderWidget::slotPovrayImage( TDEProcess*, char* buffer, int buflen )
{
int index = 0;
int i;
@@ -349,7 +349,7 @@ void PMPovrayRenderWidget::setPixel( int x, int y, uint c )
}

/**
void PMPovrayRenderWidget::slotWroteStdin( KProcess* )
void PMPovrayRenderWidget::slotWroteStdin( TDEProcess* )
{
if( m_pProcess )
m_pProcess->closeStdin( );
@@ -357,7 +357,7 @@ void PMPovrayRenderWidget::slotWroteStdin( KProcess* )
}
*/

void PMPovrayRenderWidget::slotRenderingFinished( KProcess* )
void PMPovrayRenderWidget::slotRenderingFinished( TDEProcess* )
{
if( m_pProcess->normalExit( ) )
emit( finished( m_pProcess->exitStatus( ) ) );

+ 6
- 6
kpovmodeler/pmpovrayrenderwidget.h View File

@@ -31,7 +31,7 @@
#include "pmrendermode.h"
#include "pmdragwidget.h"

class KProcess;
class TDEProcess;
class KConfig;
class KURL;
class KTempFile;
@@ -130,19 +130,19 @@ protected slots:
/**
* Receive povray messages