Browse Source

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

tags/r14.0.0
Timothy Pearson 7 years ago
parent
commit
5b8ab14946
100 changed files with 231 additions and 231 deletions
  1. +1
    -1
      chalk/chalkcolor/kis_abstract_colorspace.cc
  2. +9
    -9
      chalk/core/kis_meta_registry.cc
  3. +1
    -1
      chalk/core/kis_thread_pool.cc
  4. +2
    -2
      chalk/core/tiles/kis_tilemanager.cc
  5. +2
    -2
      chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc
  6. +3
    -3
      chalk/plugins/viewplugins/screenshot/ksnapshot.cpp
  7. +1
    -1
      chalk/plugins/viewplugins/screenshot/ksnapshot.h
  8. +1
    -1
      chalk/plugins/viewplugins/screenshot/regiongrabber.cpp
  9. +1
    -1
      chalk/plugins/viewplugins/screenshot/screenshot.cpp
  10. +2
    -2
      chalk/ui/kis_config.cc
  11. +1
    -1
      chalk/ui/kis_controlframe.cc
  12. +1
    -1
      chalk/ui/kis_custom_brush.cc
  13. +1
    -1
      chalk/ui/kis_custom_palette.cc
  14. +1
    -1
      chalk/ui/kis_custom_pattern.cc
  15. +4
    -4
      chalk/ui/kis_previewwidget.cc
  16. +1
    -1
      chalk/ui/kis_view.cc
  17. +8
    -8
      filters/chalk/raw/kis_raw_import.cpp
  18. +4
    -4
      filters/chalk/raw/kis_raw_import.h
  19. +2
    -2
      filters/generic_wrapper/generic_filter.cc
  20. +1
    -1
      filters/karbon/ai/aiimport.cc
  21. +1
    -1
      filters/karbon/eps/epsexport.cc
  22. +3
    -3
      filters/karbon/eps/epsimport.cc
  23. +1
    -1
      filters/kivio/imageexport/kivio_imageexport.cpp
  24. +3
    -3
      filters/kspread/csv/csvdialog.cpp
  25. +3
    -3
      filters/kspread/csv/csvexportdialog.cpp
  26. +1
    -1
      filters/kspread/gnumeric/gnumericexport.cc
  27. +1
    -1
      filters/kspread/gnumeric/gnumericimport.cc
  28. +2
    -2
      filters/kspread/html/exportdialog.cc
  29. +1
    -1
      filters/kspread/opencalc/opencalcexport.cc
  30. +1
    -1
      filters/kspread/opencalc/opencalcimport.cc
  31. +1
    -1
      filters/kword/abiword/ImportStyle.cc
  32. +1
    -1
      filters/kword/abiword/abiwordexport.cc
  33. +1
    -1
      filters/kword/abiword/abiwordimport.cc
  34. +3
    -3
      filters/kword/ascii/ExportDialog.cc
  35. +3
    -3
      filters/kword/ascii/ImportDialog.cc
  36. +1
    -1
      filters/kword/ascii/asciiexport.cc
  37. +1
    -1
      filters/kword/ascii/asciiimport.cc
  38. +3
    -3
      filters/kword/html/export/ExportDialog.cc
  39. +3
    -3
      filters/kword/mswrite/ImportDialog.cc
  40. +1
    -1
      filters/kword/mswrite/mswriteexport.cc
  41. +1
    -1
      filters/kword/mswrite/mswriteimport.cc
  42. +1
    -1
      filters/kword/pdf/pdfimport.cpp
  43. +7
    -7
      filters/kword/rtf/export/ExportFilter.cc
  44. +1
    -1
      filters/olefilters/olefilter.cc
  45. +2
    -2
      filters/xsltfilter/export/xsltexportdia.cc
  46. +2
    -2
      filters/xsltfilter/import/xsltimportdia.cc
  47. +1
    -1
      karbon/dockers/vdocumentdocker.cc
  48. +1
    -1
      karbon/karbon_part.cc
  49. +1
    -1
      karbon/karbon_resourceserver.cc
  50. +1
    -1
      karbon/karbon_view.cc
  51. +1
    -1
      karbon/render/vkopainter.cc
  52. +2
    -2
      karbon/tools/vtexttool.cc
  53. +3
    -3
      kchart/csvimportdialog.cc
  54. +2
    -2
      kchart/kchartBackgroundPixmapConfigPage.cc
  55. +2
    -2
      kchart/kchart_part.cc
  56. +3
    -3
      kchart/kchart_view.cc
  57. +5
    -5
      kdgantt/KDGanttViewSubwidgets.cpp
  58. +5
    -5
      kexi/3rdparty/kolibs/koGlobal.cc
  59. +1
    -1
      kexi/3rdparty/kolibs/koGlobal.h
  60. +1
    -1
      kexi/3rdparty/kolibs/koPageLayout.cpp
  61. +2
    -2
      kexi/3rdparty/kolibs/koUnit.cc
  62. +3
    -3
      kexi/3rdparty/kolibs/koUnitWidgets.cc
  63. +1
    -1
      kexi/core/kexi.cpp
  64. +4
    -4
      kexi/core/kexidbconnectionset.cpp
  65. +3
    -3
      kexi/core/kexidbshortcutfile.cpp
  66. +1
    -1
      kexi/core/kexidbshortcutfile.h
  67. +1
    -1
      kexi/core/kexitemplateloader.cpp
  68. +1
    -1
      kexi/doc/dev/TODO-Kexi-js
  69. +4
    -4
      kexi/formeditor/formmanager.cpp
  70. +1
    -1
      kexi/formeditor/test/main.cpp
  71. +2
    -2
      kexi/kexidb/drivermanager.cpp
  72. +2
    -2
      kexi/kexidb/utils.cpp
  73. +12
    -12
      kexi/main/keximainwindowimpl.cpp
  74. +1
    -1
      kexi/main/kexinewstuff.cpp
  75. +5
    -5
      kexi/main/printing/kexisimpleprintingengine.cpp
  76. +1
    -1
      kexi/main/printing/kexisimpleprintingpagesetup.cpp
  77. +1
    -1
      kexi/main/startup/KexiConnSelector.cpp
  78. +6
    -6
      kexi/main/startup/KexiNewProjectWizard.cpp
  79. +1
    -1
      kexi/main/startup/KexiProjectSelector.cpp
  80. +9
    -9
      kexi/main/startup/KexiStartupDialog.cpp
  81. +6
    -6
      kexi/main/startup/KexiStartupFileDialog_win.cpp
  82. +7
    -7
      kexi/main/startup/KexiStartup_p.cpp
  83. +4
    -4
      kexi/main/startup/KexiStartup_p.h
  84. +1
    -1
      kexi/migration/importwizard.cpp
  85. +2
    -2
      kexi/migration/migratemanager.cpp
  86. +3
    -3
      kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
  87. +1
    -1
      kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp
  88. +1
    -1
      kexi/plugins/macros/kexipart/keximacroerror.cpp
  89. +1
    -1
      kexi/plugins/queries/kexiquerydesignerguieditor.cpp
  90. +3
    -3
      kexi/plugins/queries/kexiquerydesignersqlhistory.cpp
  91. +1
    -1
      kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp
  92. +1
    -1
      kexi/tests/newapi/main.cpp
  93. +1
    -1
      kexi/tests/tableview/main.cpp
  94. +1
    -1
      kexi/widget/kexibrowser.cpp
  95. +7
    -7
      kexi/widget/kexicharencodingcombobox.cpp
  96. +1
    -1
      kexi/widget/kexidatasourcecombobox.cpp
  97. +1
    -1
      kexi/widget/kexidswelcome.cpp
  98. +1
    -1
      kexi/widget/kexifieldcombobox.cpp
  99. +1
    -1
      kexi/widget/kexiprjtypeselector.cpp
  100. +1
    -1
      kexi/widget/kexismalltoolbutton.cpp

+ 1
- 1
chalk/chalkcolor/kis_abstract_colorspace.cc View File

@@ -719,7 +719,7 @@ cmsHTRANSFORM KisAbstractColorSpace::createTransform(KisColorSpace * dstColorSpa
KisProfile * dstProfile,
TQ_INT32 renderingIntent)
{
KConfig * cfg = KGlobal::config();
KConfig * cfg = TDEGlobal::config();
bool bpCompensation = cfg->readBoolEntry("useBlackPointCompensation", false);

int flags = 0;


+ 9
- 9
chalk/core/kis_meta_registry.cc View File

@@ -33,20 +33,20 @@ KisMetaRegistry::KisMetaRegistry()
{
// Create the colorspaces and load the profiles

KGlobal::instance()->dirs()->addResourceType("kis_profiles",
TDEGlobal::instance()->dirs()->addResourceType("kis_profiles",
KStandardDirs::kde_default("data") + "chalk/profiles/");
// Add those things here as well, since we are not yet using KisDoc's KisFactory instance (which inits these as well)
KGlobal::instance()->dirs()->addResourceType("kis_profiles", KStandardDirs::kde_default("data") + "chalk/profiles/");
KGlobal::instance()->dirs()->addResourceDir("kis_profiles", "/usr/share/color/icc");
KGlobal::instance()->dirs()->addResourceDir("kis_profiles", TQDir::homeDirPath() + TQString("/.icc/"));
KGlobal::instance()->dirs()->addResourceDir("kis_profiles", TQDir::homeDirPath() + TQString("/.color/icc/"));
TDEGlobal::instance()->dirs()->addResourceType("kis_profiles", KStandardDirs::kde_default("data") + "chalk/profiles/");
TDEGlobal::instance()->dirs()->addResourceDir("kis_profiles", "/usr/share/color/icc");
TDEGlobal::instance()->dirs()->addResourceDir("kis_profiles", TQDir::homeDirPath() + TQString("/.icc/"));
TDEGlobal::instance()->dirs()->addResourceDir("kis_profiles", TQDir::homeDirPath() + TQString("/.color/icc/"));

TQStringList profileFilenames;
profileFilenames += KGlobal::instance()->dirs()->findAllResources("kis_profiles", "*.icm", true /* recursive */);
profileFilenames += KGlobal::instance()->dirs()->findAllResources("kis_profiles", "*.ICM", true);
profileFilenames += KGlobal::instance()->dirs()->findAllResources("kis_profiles", "*.ICC", true);
profileFilenames += KGlobal::instance()->dirs()->findAllResources("kis_profiles", "*.icc", true);
profileFilenames += TDEGlobal::instance()->dirs()->findAllResources("kis_profiles", "*.icm", true /* recursive */);
profileFilenames += TDEGlobal::instance()->dirs()->findAllResources("kis_profiles", "*.ICM", true);
profileFilenames += TDEGlobal::instance()->dirs()->findAllResources("kis_profiles", "*.ICC", true);
profileFilenames += TDEGlobal::instance()->dirs()->findAllResources("kis_profiles", "*.icc", true);
// Set lcms to return NUll/false etc from failing calls, rather than aborting the app.
cmsErrorAction(LCMS_ERROR_SHOW);



+ 1
- 1
chalk/core/kis_thread_pool.cc View File

@@ -29,7 +29,7 @@ KisThreadPool::KisThreadPool()

KisThreadPool::m_singleton = this;

KConfig * cfg = KGlobal::config();
KConfig * cfg = TDEGlobal::config();
cfg->setGroup("");
m_maxThreads = cfg->readNumEntry("maxthreads", 10);
m_numberOfRunningThreads = 0;


+ 2
- 2
chalk/core/tiles/kis_tilemanager.cc View File

@@ -64,7 +64,7 @@ KisTileManager::KisTileManager() {
}
m_currentInMem = 0;

KConfig * cfg = KGlobal::config();
KConfig * cfg = TDEGlobal::config();
cfg->setGroup("");
m_maxInMem = cfg->readNumEntry("maxtilesinmem", 4000);
m_swappiness = cfg->readNumEntry("swappiness", 100);
@@ -533,7 +533,7 @@ void KisTileManager::reclaimTileToPool(TQ_UINT8* data, TQ_INT32 pixelSize) {
}

void KisTileManager::configChanged() {
KConfig * cfg = KGlobal::config();
KConfig * cfg = TDEGlobal::config();
cfg->setGroup("");
m_maxInMem = cfg->readNumEntry("maxtilesinmem", 4000);
m_swappiness = cfg->readNumEntry("swappiness", 100);


+ 2
- 2
chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc View File

@@ -48,7 +48,7 @@ DlgDropshadow::DlgDropshadow( const TQString & /*imageCS*/,
setMainWidget(m_page);
resize(m_page->sizeHint());

KConfig * cfg = KGlobal::config();
KConfig * cfg = TDEGlobal::config();
m_page->xOffsetSpinBox->setValue( cfg->readNumEntry("dropshadow_x", 8) );
m_page->yOffsetSpinBox->setValue( cfg->readNumEntry("dropshadow_y", 8) );
m_page->blurRadiusSpinBox->setValue( cfg->readNumEntry("dropshadow_blurRadius", 5) );
@@ -103,7 +103,7 @@ bool DlgDropshadow::allowResizingChecked()

void DlgDropshadow::okClicked()
{
KConfig * cfg = KGlobal::config();
KConfig * cfg = TDEGlobal::config();
cfg->writeEntry("dropshadow_x", m_page->xOffsetSpinBox->value());
cfg->writeEntry("dropshadow_y", m_page->yOffsetSpinBox->value());
cfg->writeEntry("dropshadow_blurRadius", m_page->blurRadiusSpinBox->value());


+ 3
- 3
chalk/plugins/viewplugins/screenshot/ksnapshot.cpp View File

@@ -91,7 +91,7 @@ KSnapshot::KSnapshot(TQWidget *parent, const char *name)
grabber->releaseMouse();
grabber->hide();

KConfig *conf=KGlobal::config();
KConfig *conf=TDEGlobal::config();
conf->setGroup("GENERAL");
mainWidget->setDelay(conf->readNumEntry("delay",0));
mainWidget->setMode( conf->readNumEntry( "mode", 0 ) );
@@ -467,7 +467,7 @@ void KSnapshot::slotMovePointer(int x, int y)
void KSnapshot::exit()
{

KConfig *conf=KGlobal::config();
KConfig *conf=TDEGlobal::config();
conf->setGroup("GENERAL");
conf->writeEntry("delay",mainWidget->delay());
conf->writeEntry("mode",mainWidget->mode());
@@ -482,7 +482,7 @@ void KSnapshot::exit()
void KSnapshot::slotOk()
{

KConfig *conf=KGlobal::config();
KConfig *conf=TDEGlobal::config();
conf->setGroup("GENERAL");
conf->writeEntry("delay",mainWidget->delay());
conf->writeEntry("mode",mainWidget->mode());


+ 1
- 1
chalk/plugins/viewplugins/screenshot/ksnapshot.h View File

@@ -60,7 +60,7 @@ protected:
void mouseMoveEvent(TQMouseEvent * e)
{
if (mClickPt != TQPoint(0, 0) &&
(e->pos() - mClickPt).manhattanLength() > KGlobalSettings::dndEventDelay())
(e->pos() - mClickPt).manhattanLength() > TDEGlobalSettings::dndEventDelay())
{
mClickPt = TQPoint(0, 0);
emit startDrag();


+ 1
- 1
chalk/plugins/viewplugins/screenshot/regiongrabber.cpp View File

@@ -57,7 +57,7 @@ void SizeTip::positionTip( const TQRect &rect )

if ( rect.intersects( tipRect ) )
{
TQRect deskR = KGlobalSettings::desktopGeometry( TQPoint( 0, 0 ) );
TQRect deskR = TDEGlobalSettings::desktopGeometry( TQPoint( 0, 0 ) );

tipRect.moveCenter( TQPoint( deskR.width()/2, deskR.height()/2 ) );
if ( !rect.contains( tipRect, true ) && rect.intersects( tipRect ) )


+ 1
- 1
chalk/plugins/viewplugins/screenshot/screenshot.cpp View File

@@ -44,7 +44,7 @@ K_EXPORT_COMPONENT_FACTORY( chalkscreenshot, KGenericFactory<Screenshot>( "chalk
Screenshot::Screenshot(TQObject *parent, const char *name, const TQStringList &)
: KParts::Plugin(parent, name)
{
KGlobal::locale()->insertCatalogue("kscreenshot_plugin");
TDEGlobal::locale()->insertCatalogue("kscreenshot_plugin");
setInstance(KGenericFactory<Screenshot>::instance());
setXMLFile(locate("data","chalkplugins/screenshot-chalk.rc"), true);
KImageIO::registerFormats();


+ 2
- 2
chalk/ui/kis_config.cc View File

@@ -44,7 +44,7 @@ namespace {
KisConfig::KisConfig()
{

m_cfg = KGlobal::config();
m_cfg = TDEGlobal::config();
if (!m_cfg) {
// Allow unit tests to test parts of the code without having to run the
// full application.
@@ -330,7 +330,7 @@ float KisConfig::dockerFontSize()

float KisConfig::getDefaultDockerFontSize()
{
float ps = TQMIN(9, KGlobalSettings::generalFont().pointSize() * 0.8);
float ps = TQMIN(9, TDEGlobalSettings::generalFont().pointSize() * 0.8);
if (ps < 6) ps = 6;
return ps;
}


+ 1
- 1
chalk/ui/kis_controlframe.cc View File

@@ -96,7 +96,7 @@ KisControlFrame::KisControlFrame( KMainWindow * /*window*/, KisView * view, cons
{

KisConfig cfg;
m_font = KGlobalSettings::generalFont();
m_font = TDEGlobalSettings::generalFont();
m_font.setPointSize((int)cfg.dockerFontSize());

m_brushWidget = new KisIconWidget(view, "brushes");


+ 1
- 1
chalk/ui/kis_custom_brush.cc View File

@@ -82,7 +82,7 @@ void KisCustomBrush::slotExport() {
void KisCustomBrush::slotAddPredefined() {
// Save in the directory that is likely to be: ~/.trinity/share/apps/chalk/brushes
// a unique file with this brushname
TQString dir = KGlobal::dirs()->saveLocation("data", "chalk/brushes");
TQString dir = TDEGlobal::dirs()->saveLocation("data", "chalk/brushes");
TQString extension;

if (style->currentItem() == 0) {


+ 1
- 1
chalk/ui/kis_custom_palette.cc View File

@@ -121,7 +121,7 @@ void KisCustomPalette::slotAddPredefined() {
if (!m_editMode) {
// Save in the directory that is likely to be: ~/.trinity/share/apps/chalk/palettes
// a unique file with this palettename
TQString dir = KGlobal::dirs()->saveLocation("data", "chalk/palettes");
TQString dir = TDEGlobal::dirs()->saveLocation("data", "chalk/palettes");
TQString extension;

extension = ".gpl";


+ 1
- 1
chalk/ui/kis_custom_pattern.cc View File

@@ -80,7 +80,7 @@ void KisCustomPattern::slotAddPredefined() {

// Save in the directory that is likely to be: ~/.trinity/share/apps/chalk/patterns
// a unique file with this pattern name
TQString dir = KGlobal::dirs()->saveLocation("data", "chalk/patterns");
TQString dir = TDEGlobal::dirs()->saveLocation("data", "chalk/patterns");
TQString extension;

KTempFile file(dir, ".pat");


+ 4
- 4
chalk/ui/kis_previewwidget.cc View File

@@ -85,17 +85,17 @@ KisPreviewWidget::KisPreviewWidget( TQWidget* parent, const char* name )
, m_firstFilter(true)
, m_firstZoom(true)
{
btnZoomIn->setIconSet(KGlobal::instance()->iconLoader()->loadIconSet( "viewmag+", KIcon::MainToolbar, 16 ));
btnZoomIn->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "viewmag+", KIcon::MainToolbar, 16 ));
connect(btnZoomIn, TQT_SIGNAL(clicked()), this, TQT_SLOT(zoomIn()));
btnZoomOut->setIconSet(KGlobal::instance()->iconLoader()->loadIconSet( "viewmag-", KIcon::MainToolbar, 16 ));
btnZoomOut->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "viewmag-", KIcon::MainToolbar, 16 ));
connect(btnZoomOut, TQT_SIGNAL(clicked()), this, TQT_SLOT(zoomOut()));
btnUpdate->setIconSet(KGlobal::instance()->iconLoader()->loadIconSet( "reload", KIcon::MainToolbar, 16 ));
btnUpdate->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "reload", KIcon::MainToolbar, 16 ));
connect(btnUpdate, TQT_SIGNAL(clicked()), this, TQT_SLOT(forceUpdate()));

connect(radioBtnPreview, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setPreviewDisplayed(bool)));

connect(checkBoxAutoUpdate, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSetAutoUpdate(bool)));
btnZoomOneToOne->setIconSet(KGlobal::instance()->iconLoader()->loadIconSet( "viewmag1", KIcon::MainToolbar, 16 ));
btnZoomOneToOne->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "viewmag1", KIcon::MainToolbar, 16 ));
connect(btnZoomOneToOne, TQT_SIGNAL(clicked()), this, TQT_SLOT(zoomOneToOne()));

m_progress = new KisLabelProgress(frmProgress);


+ 1
- 1
chalk/ui/kis_view.cc View File

@@ -868,7 +868,7 @@ void KisView::resizeEvent(TQResizeEvent *)
}
}

int fontheight = TQFontMetrics(KGlobalSettings::generalFont()).height() * 3;
int fontheight = TQFontMetrics(TDEGlobalSettings::generalFont()).height() * 3;
m_vScroll->setPageStep(drawH);
m_vScroll->setLineStep(fontheight);
m_hScroll->setPageStep(drawW);


+ 8
- 8
filters/chalk/raw/kis_raw_import.cpp View File

@@ -134,7 +134,7 @@ KoFilter::ConversionStatus KisRawImport::convert(const TQCString& from, const TQ
m_dialog->setCursor(TQt::ArrowCursor);
TQApplication::setOverrideCursor(TQt::ArrowCursor);

KConfig * cfg = KGlobal::config();
KConfig * cfg = TDEGlobal::config();
cfg->setGroup("rawimport");
m_page->radioGray->setChecked(cfg->readBoolEntry("gray", false));
@@ -413,7 +413,7 @@ void KisRawImport::getImageData( TQStringList arguments )
delete m_data;

kdDebug(41008) << "getImageData " << arguments.join(" ") << "\n";
KProcess process (this);
TDEProcess process (this);
m_data = new TQByteArray(0);

for (TQStringList::iterator it = arguments.begin(); it != arguments.end(); ++it) {
@@ -421,14 +421,14 @@ void KisRawImport::getImageData( TQStringList arguments )
}

process.setUseShell(true);
connect(&process, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), this, TQT_SLOT(slotReceivedStdout(KProcess *, char *, int)));
connect(&process, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), this, TQT_SLOT(slotReceivedStderr(KProcess *, char *, int)));
connect(&process, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(slotProcessDone()));
connect(&process, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), this, TQT_SLOT(slotReceivedStdout(TDEProcess *, char *, int)));
connect(&process, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), this, TQT_SLOT(slotReceivedStderr(TDEProcess *, char *, int)));
connect(&process, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotProcessDone()));


kdDebug(41008) << "Starting process\n";

if (!process.start(KProcess::NotifyOnExit, KProcess::AllOutput)) {
if (!process.start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput)) {
KMessageBox::error( 0, i18n("Cannot convert RAW files because the dcraw executable could not be started."));
}
while (process.isRunning()) {
@@ -453,7 +453,7 @@ void KisRawImport::slotProcessDone()
kdDebug(41008) << "process done!\n";
}

void KisRawImport::slotReceivedStdout(KProcess *, char *buffer, int buflen)
void KisRawImport::slotReceivedStdout(TDEProcess *, char *buffer, int buflen)
{
//kdDebug(41008) << "stdout received " << buflen << " bytes on stdout.\n";
//kdDebug(41008) << TQString::fromAscii(buffer, buflen) << "\n";
@@ -462,7 +462,7 @@ void KisRawImport::slotReceivedStdout(KProcess *, char *buffer, int buflen)
memcpy(m_data->data() + oldSize, buffer, buflen);
}

void KisRawImport::slotReceivedStderr(KProcess *, char *buffer, int buflen)
void KisRawImport::slotReceivedStderr(TDEProcess *, char *buffer, int buflen)
{
TQByteArray b(buflen);
memcpy(b.data(), buffer, buflen);


+ 4
- 4
filters/chalk/raw/kis_raw_import.h View File

@@ -22,7 +22,7 @@

#include <KoFilter.h>

class KProcess;
class TDEProcess;
class KDialogBase;
class WdgRawImport;
class KisProfile;
@@ -45,8 +45,8 @@ private slots:
void slotUpdatePreview();
void slotFillCmbProfiles();
void slotProcessDone();
void slotReceivedStdout(KProcess *proc, char *buffer, int buflen);
void slotReceivedStderr(KProcess *proc, char *buffer, int buflen);
void slotReceivedStdout(TDEProcess *proc, char *buffer, int buflen);
void slotReceivedStderr(TDEProcess *proc, char *buffer, int buflen);
void incrementProgress();

private:
@@ -62,7 +62,7 @@ private:
KDialogBase * m_dialog;
WdgRawImport * m_page;
KisProfile * m_monitorProfile;
KProcess * m_process;
TDEProcess * m_process;
TQProgressDialog* m_progress;
bool m_err; // Set to true when slotReceivedStderr is called
};


+ 2
- 2
filters/generic_wrapper/generic_filter.cc View File

@@ -97,8 +97,8 @@ KoFilter::ConversionStatus GenericFilter::doImport()
}
else
{
TQString exec = m_exec + " " + KProcess::quote(m_chain->inputFile()) + " "
+ KProcess::quote(m_chain->outputFile());
TQString exec = m_exec + " " + TDEProcess::quote(m_chain->inputFile()) + " "
+ TDEProcess::quote(m_chain->outputFile());
system(TQFile::encodeName(exec));

kdDebug() << "Executing: " << exec << endl;


+ 1
- 1
filters/karbon/ai/aiimport.cc View File

@@ -41,7 +41,7 @@ public:
protected:
virtual void setupTranslations( void )
{
KGlobal::locale()->insertCatalogue( "kofficefilters" );
TDEGlobal::locale()->insertCatalogue( "kofficefilters" );
}
};



+ 1
- 1
filters/karbon/eps/epsexport.cc View File

@@ -74,7 +74,7 @@ public:
protected:
virtual void setupTranslations( void )
{
KGlobal::locale()->insertCatalogue( "kofficefilters" );
TDEGlobal::locale()->insertCatalogue( "kofficefilters" );
}
};



+ 3
- 3
filters/karbon/eps/epsimport.cc View File

@@ -42,7 +42,7 @@ public:
protected:
virtual void setupTranslations( void )
{
KGlobal::locale()->insertCatalogue( "kofficefilters" );
TDEGlobal::locale()->insertCatalogue( "kofficefilters" );
}
};

@@ -98,11 +98,11 @@ EpsImport::convert( const TQCString& from, const TQCString& to )
// Build ghostscript call to convert ps/eps -> ai:
TQString command(
"gs -q -P- -dBATCH -dNOPAUSE -dSAFER -dPARANOIDSAFER -dNODISPLAY ps2ai.ps ");
command += KProcess::quote(input);
command += TDEProcess::quote(input);
command += " | ";
command += sedFilter;
command += " > ";
command += KProcess::quote(m_chain->outputFile());
command += TDEProcess::quote(m_chain->outputFile());

tqDebug ("command to execute is (%s)", TQFile::encodeName(command).data());



+ 1
- 1
filters/kivio/imageexport/kivio_imageexport.cpp View File

@@ -52,7 +52,7 @@ namespace Kivio
ImageExport::ImageExport(KoFilter *, const char *, const TQStringList&)
: KoFilter()
{
KGlobal::locale()->insertCatalogue("kofficefilters");
TDEGlobal::locale()->insertCatalogue("kofficefilters");
}

KoFilter::ConversionStatus ImageExport::convert(const TQCString& from, const TQCString& to)


+ 3
- 3
filters/kspread/csv/csvdialog.cpp View File

@@ -62,7 +62,7 @@ CSVDialog::CSVDialog(TQWidget* parent, TQByteArray& fileArray, const TQString /*
TQStringList encodings;
encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).arg( "UTF-8" );
encodings << i18n( "Descriptive encoding name", "Locale ( %1 )" ).arg( TQTextCodec::codecForLocale()->name() );
encodings += KGlobal::charsets()->descriptiveEncodingNames();
encodings += TDEGlobal::charsets()->descriptiveEncodingNames();
// Add a few non-standard encodings, which might be useful for text files
const TQString description(i18n("Descriptive encoding name","Other ( %1 )"));
encodings << description.arg("Apple Roman"); // Apple
@@ -591,7 +591,7 @@ void CSVDialog::ignoreDuplicatesChanged(int)

TQTextCodec* CSVDialog::getCodec(void) const
{
const TQString strCodec( KGlobal::charsets()->encodingForName( m_dialog->comboBoxEncoding->currentText() ) );
const TQString strCodec( TDEGlobal::charsets()->encodingForName( m_dialog->comboBoxEncoding->currentText() ) );
kdDebug(30502) << "Encoding: " << strCodec << endl;

bool ok = false;
@@ -604,7 +604,7 @@ TQTextCodec* CSVDialog::getCodec(void) const
}
else
{
codec = KGlobal::charsets()->codecForName( strCodec, ok );
codec = TDEGlobal::charsets()->codecForName( strCodec, ok );
}

// Still nothing?


+ 3
- 3
filters/kspread/csv/csvexportdialog.cpp View File

@@ -59,7 +59,7 @@ CSVExportDialog::CSVExportDialog( TQWidget * parent )
TQStringList encodings;
encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).arg( "UTF-8" );
encodings << i18n( "Descriptive encoding name", "Locale ( %1 )" ).arg( TQTextCodec::codecForLocale()->name() );
encodings += KGlobal::charsets()->descriptiveEncodingNames();
encodings += TDEGlobal::charsets()->descriptiveEncodingNames();
// Add a few non-standard encodings, which might be useful for text files
const TQString description(i18n("Descriptive encoding name","Other ( %1 )"));
encodings << description.arg("Apple Roman"); // Apple
@@ -284,7 +284,7 @@ bool CSVExportDialog::exportSelectionOnly() const

TQTextCodec* CSVExportDialog::getCodec(void) const
{
const TQString strCodec( KGlobal::charsets()->encodingForName( m_dialog->comboBoxEncoding->currentText() ) );
const TQString strCodec( TDEGlobal::charsets()->encodingForName( m_dialog->comboBoxEncoding->currentText() ) );
kdDebug(30502) << "Encoding: " << strCodec << endl;

bool ok = false;
@@ -297,7 +297,7 @@ TQTextCodec* CSVExportDialog::getCodec(void) const
}
else
{
codec = KGlobal::charsets()->codecForName( strCodec, ok );
codec = TDEGlobal::charsets()->codecForName( strCodec, ok );
}

// Still nothing?


+ 1
- 1
filters/kspread/gnumeric/gnumericexport.cc View File

@@ -997,7 +997,7 @@ KoFilter::ConversionStatus GNUMERICExport::convert( const TQCString& from, const
addAttributeItem(gnumeric_doc, attributes, "4", "WorkbookView::show_horizontal_scrollbar", ksdoc->showHorizontalScrollBar());
addAttributeItem(gnumeric_doc, attributes, "4", "WorkbookView::show_vertical_scrollbar", ksdoc->showVerticalScrollBar());
addAttributeItem(gnumeric_doc, attributes, "4", "WorkbookView::show_notebook_tabs", ksdoc->showTabBar());
if (ksdoc->completionMode() == KGlobalSettings::CompletionAuto)
if (ksdoc->completionMode() == TDEGlobalSettings::CompletionAuto)
addAttributeItem(gnumeric_doc, attributes, "4", "WorkbookView::do_auto_completion", "true");
else
addAttributeItem(gnumeric_doc, attributes, "4", "WorkbookView::do_auto_completion", "false");


+ 1
- 1
filters/kspread/gnumeric/gnumericimport.cc View File

@@ -277,7 +277,7 @@ void set_document_attributes( Doc * ksdoc, TQDomElement * docElem)
}
else if ( gmr_name.toElement().text() == "WorkbookView::do_auto_completion")
{
ksdoc->setCompletionMode( KGlobalSettings::CompletionAuto);
ksdoc->setCompletionMode( TDEGlobalSettings::CompletionAuto);
}
else if ( gmr_name.toElement().text() == "WorkbookView::is_protected")
{


+ 2
- 2
filters/kspread/html/exportdialog.cc View File

@@ -44,7 +44,7 @@ ExportDialog::ExportDialog( TQWidget *parent, const char *name )
m_mainwidget->mSheets, TQT_SLOT( clearSelection() ) );

m_mainwidget->mEncodingBox->insertItem( i18n( "Recommended: UTF-8" ) );
m_mainwidget->mEncodingBox->insertItem( i18n( "Locale (%1)" ).arg( KGlobal::locale()->codecForEncoding()->name() ) );
m_mainwidget->mEncodingBox->insertItem( i18n( "Locale (%1)" ).arg( TDEGlobal::locale()->codecForEncoding()->name() ) );

m_mainwidget->mCustomURL->setMode( KFile::ExistingOnly );

@@ -64,7 +64,7 @@ ExportDialog::~ExportDialog()
TQTextCodec *ExportDialog::encoding() const
{
if( m_mainwidget->mEncodingBox->currentItem() == 1 ) // locale selected
return KGlobal::locale()->codecForEncoding();
return TDEGlobal::locale()->codecForEncoding();

return TQTextCodec::codecForName( "utf8" ); // utf8 is default
}


+ 1
- 1
filters/kspread/opencalc/opencalcexport.cc View File

@@ -65,7 +65,7 @@ public:
protected:
virtual void setupTranslations( void )
{
KGlobal::locale()->insertCatalogue( "kofficefilters" );
TDEGlobal::locale()->insertCatalogue( "kofficefilters" );
}
};



+ 1
- 1
filters/kspread/opencalc/opencalcimport.cc View File

@@ -65,7 +65,7 @@ public:
protected:
virtual void setupTranslations( void )
{
KGlobal::locale()->insertCatalogue( "kofficefilters" );
TDEGlobal::locale()->insertCatalogue( "kofficefilters" );
}
};



+ 1
- 1
filters/kword/abiword/ImportStyle.cc View File

@@ -119,7 +119,7 @@ void StyleDataMap::defineDefaultStyles(void)
defineNewStyle("Heading 2",2,strHeading+"font-size: 14pt");
defineNewStyle("Heading 3",3,strHeading+"font-size: 12pt");
defineNewStyle("Block Text",-1,"margin-left: 1in; margin-right: 1in; margin-bottom: 6pt");
TQFontInfo fixedInfo(KGlobalSettings::fixedFont());
TQFontInfo fixedInfo(TDEGlobalSettings::fixedFont());
TQString strPlainText=TQString("font-family: %1")
.arg(fixedInfo.family()); // TODO: should be "Courier New"
kdDebug(30506) << "Plain Text: " << strPlainText << endl;


+ 1
- 1
filters/kword/abiword/abiwordexport.cc View File

@@ -61,7 +61,7 @@ public:
protected:
virtual void setupTranslations( void )
{
KGlobal::locale()->insertCatalogue( "kofficefilters" );
TDEGlobal::locale()->insertCatalogue( "kofficefilters" );
}
};



+ 1
- 1
filters/kword/abiword/abiwordimport.cc View File

@@ -55,7 +55,7 @@ public:
protected:
virtual void setupTranslations( void )
{
KGlobal::locale()->insertCatalogue( "kofficefilters" );
TDEGlobal::locale()->insertCatalogue( "kofficefilters" );
}
};



+ 3
- 3
filters/kword/ascii/ExportDialog.cc View File

@@ -43,7 +43,7 @@ AsciiExportDialog :: AsciiExportDialog(TQWidget* parent)
TQStringList encodings;
encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).arg( "UTF-8" );
encodings << i18n( "Descriptive encoding name", "Locale ( %1 )" ).arg( TQTextCodec::codecForLocale()->name() );
encodings += KGlobal::charsets()->descriptiveEncodingNames();
encodings += TDEGlobal::charsets()->descriptiveEncodingNames();
// Add a few non-standard encodings, which might be useful for text files
const TQString description(i18n("Descriptive encoding name","Other ( %1 )"));
encodings << description.arg("Apple Roman"); // Apple
@@ -63,7 +63,7 @@ AsciiExportDialog :: ~AsciiExportDialog(void)

TQTextCodec* AsciiExportDialog::getCodec(void) const
{
const TQString strCodec( KGlobal::charsets()->encodingForName( m_dialog->comboBoxEncoding->currentText() ) );
const TQString strCodec( TDEGlobal::charsets()->encodingForName( m_dialog->comboBoxEncoding->currentText() ) );
kdDebug(30502) << "Encoding: " << strCodec << endl;

bool ok = false;
@@ -76,7 +76,7 @@ TQTextCodec* AsciiExportDialog::getCodec(void) const
}
else
{
codec = KGlobal::charsets()->codecForName( strCodec, ok );
codec = TDEGlobal::charsets()->codecForName( strCodec, ok );
}

// Still nothing?


+ 3
- 3
filters/kword/ascii/ImportDialog.cc View File

@@ -43,7 +43,7 @@ AsciiImportDialog :: AsciiImportDialog(TQWidget* parent)
TQStringList encodings;
encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).arg( "UTF-8" );
encodings << i18n( "Descriptive encoding name", "Locale ( %1 )" ).arg( TQTextCodec::codecForLocale()->name() );
encodings += KGlobal::charsets()->descriptiveEncodingNames();
encodings += TDEGlobal::charsets()->descriptiveEncodingNames();
// Add a few non-standard encodings, which might be useful for text files
const TQString description(i18n("Descriptive encoding name","Other ( %1 )"));
encodings << description.arg("Apple Roman"); // Apple
@@ -62,7 +62,7 @@ AsciiImportDialog :: ~AsciiImportDialog(void)

TQTextCodec* AsciiImportDialog::getCodec(void) const
{
const TQString strCodec( KGlobal::charsets()->encodingForName( m_dialog->comboBoxEncoding->currentText() ) );
const TQString strCodec( TDEGlobal::charsets()->encodingForName( m_dialog->comboBoxEncoding->currentText() ) );
kdDebug(30502) << "Encoding: " << strCodec << endl;

bool ok = false;
@@ -75,7 +75,7 @@ TQTextCodec* AsciiImportDialog::getCodec(void) const
}
else
{
codec = KGlobal::charsets()->codecForName( strCodec, ok );
codec = TDEGlobal::charsets()->codecForName( strCodec, ok );
}

// Still nothing?


+ 1
- 1
filters/kword/ascii/asciiexport.cc View File

@@ -56,7 +56,7 @@ public:
protected:
virtual void setupTranslations(void)
{
KGlobal::locale()->insertCatalogue("kofficefilters");
TDEGlobal::locale()->insertCatalogue("kofficefilters");
}
};



+ 1
- 1
filters/kword/ascii/asciiimport.cc View File

@@ -56,7 +56,7 @@ public:
protected:
virtual void setupTranslations( void )
{
KGlobal::locale()->insertCatalogue( "kofficefilters" );
TDEGlobal::locale()->insertCatalogue( "kofficefilters" );
}
};



+ 3
- 3
filters/kword/html/export/ExportDialog.cc View File

@@ -48,7 +48,7 @@ HtmlExportDialog :: HtmlExportDialog(TQWidget* parent)

encodingList += i18n( "Descriptive encoding name", "Recommended ( %1 )" ).arg( "UTF-8" );
encodingList += i18n( "Descriptive encoding name", "Locale ( %1 )" ).arg( TQTextCodec::codecForLocale()->name() );
encodingList += KGlobal::charsets()->descriptiveEncodingNames();
encodingList += TDEGlobal::charsets()->descriptiveEncodingNames();

m_dialog->comboBoxEncoding->insertStringList( encodingList );

@@ -84,7 +84,7 @@ bool HtmlExportDialog::isXHtml(void) const

TQTextCodec* HtmlExportDialog::getCodec(void) const
{
const TQString strCodec( KGlobal::charsets()->encodingForName( m_dialog->comboBoxEncoding->currentText() ) );
const TQString strCodec( TDEGlobal::charsets()->encodingForName( m_dialog->comboBoxEncoding->currentText() ) );
kdDebug(30503) << "Encoding: " << strCodec << endl;

bool ok = false;
@@ -97,7 +97,7 @@ TQTextCodec* HtmlExportDialog::getCodec(void) const
}
else
{
codec = KGlobal::charsets()->codecForName( strCodec, ok );
codec = TDEGlobal::charsets()->codecForName( strCodec, ok );
}

// Still nothing?


+ 3
- 3
filters/kword/mswrite/ImportDialog.cc View File

@@ -41,8 +41,8 @@ MSWriteImportDialog :: MSWriteImportDialog(TQWidget* parent)
{
kapp->restoreOverrideCursor();

m_dialog->comboBoxEncoding->insertStringList(KGlobal::charsets()->availableEncodingNames());
//m_dialog->comboBoxEncoding->insertStringList(KGlobal::charsets()->descriptiveEncodingNames());
m_dialog->comboBoxEncoding->insertStringList(TDEGlobal::charsets()->availableEncodingNames());
//m_dialog->comboBoxEncoding->insertStringList(TDEGlobal::charsets()->descriptiveEncodingNames());

resize(size()); // Is this right?

@@ -83,7 +83,7 @@ TQTextCodec* MSWriteImportDialog::getCodec(void) const
{
// We do not use TQTextCodec::codecForName here
// because we fear subtle problems
codec=KGlobal::charsets()->codecForName(strCodec);
codec=TDEGlobal::charsets()->codecForName(strCodec);
}
}



+ 1
- 1
filters/kword/mswrite/mswriteexport.cc View File

@@ -55,7 +55,7 @@ public:
protected:
virtual void setupTranslations (void)
{
KGlobal::locale()->insertCatalogue ("kofficefilters");
TDEGlobal::locale()->insertCatalogue ("kofficefilters");
}
};



+ 1
- 1
filters/kword/mswrite/mswriteimport.cc View File

@@ -53,7 +53,7 @@ public:
protected:
virtual void setupTranslations (void)
{
KGlobal::locale()->insertCatalogue ("kofficefilters");
TDEGlobal::locale()->insertCatalogue ("kofficefilters");
}
};



+ 1
- 1
filters/kword/pdf/pdfimport.cpp View File

@@ -45,7 +45,7 @@ class PdfImportFactory : KGenericFactory<PdfImport, KoFilter>

protected:
virtual void setupTranslations() {
KGlobal::locale()->insertCatalogue("kofficefilters");
TDEGlobal::locale()->insertCatalogue("kofficefilters");
}
};



+ 7
- 7
filters/kword/rtf/export/ExportFilter.cc View File

@@ -585,23 +585,23 @@ TQString RTFWorker::ProcessParagraphData ( const TQString &paraText,
if (key == "locale" )
{
if (0==(*paraFormatDataIt).variable.m_type)
key = KGlobal::locale()->dateFormat();
key = TDEGlobal::locale()->dateFormat();
else
key = KGlobal::locale()->timeFormat();
key = TDEGlobal::locale()->timeFormat();
}
else if ( key == "localeshort" )
key = KGlobal::locale()->dateFormatShort();
key = TDEGlobal::locale()->dateFormatShort();
else if ( key == "localedatetime" )
{
key = KGlobal::locale()->dateFormat();
key = TDEGlobal::locale()->dateFormat();
key += ' ';
key += KGlobal::locale()->timeFormat();
key += TDEGlobal::locale()->timeFormat();
}
else if ( key == "localedatetimeshort" )
{
key = KGlobal::locale()->dateFormat();
key = TDEGlobal::locale()->dateFormat();
key += ' ';
key += KGlobal::locale()->timeFormat();
key += TDEGlobal::locale()->timeFormat();
}

kdDebug(30515) << "Locale date in KLocale format: " << key << endl;


+ 1
- 1
filters/olefilters/olefilter.cc View File

@@ -49,7 +49,7 @@ public:
protected:
virtual void setupTranslations( void )
{
KGlobal::locale()->insertCatalogue( "kofficefilters" );
TDEGlobal::locale()->insertCatalogue( "kofficefilters" );
}
};



+ 2
- 2
filters/xsltfilter/export/xsltexportdia.cc View File

@@ -77,12 +77,12 @@ XSLTExportDia::XSLTExportDia(KoStoreDevice* in, const TQCString &format, TQWidge
}

/* Common xslt files box */
TQString appName = (const char*) KGlobal::instance()->instanceName();
TQString appName = (const char*) TDEGlobal::instance()->instanceName();
kdDebug() << "app name = " << appName << endl;

TQString filenames = TQString("xsltfilter") + TQDir::separator() + TQString("export") +
TQDir::separator() + appName + TQDir::separator() + "*/*.xsl";
TQStringList commonFilesList = KGlobal::dirs()->findAllResources("data", filenames, true);
TQStringList commonFilesList = TDEGlobal::dirs()->findAllResources("data", filenames, true);
kdDebug() << "There are " << commonFilesList.size() << " entries like " << filenames << endl;

TQStringList tempList;


+ 2
- 2
filters/xsltfilter/import/xsltimportdia.cc View File

@@ -72,12 +72,12 @@ XSLTImportDia::XSLTImportDia(KoStore* out, const TQCString &format, TQWidget* pa
}

/* Common xslt files box */
TQString appName = (const char*) KGlobal::instance()->instanceName();
TQString appName = (const char*) TDEGlobal::instance()->instanceName();
kdDebug() << "app name = " << appName << endl;
TQString filenames = TQString("xsltfilter") + TQDir::separator() + TQString("import") +
TQDir::separator() + appName + TQDir::separator() + "*/*.xsl";
TQStringList commonFilesList = KGlobal::dirs()->findAllResources("data", filenames, true);
TQStringList commonFilesList = TDEGlobal::dirs()->findAllResources("data", filenames, true);
kdDebug() << "There are " << commonFilesList.size() << " entries like " << filenames << endl;
TQStringList tempList;


+ 1
- 1
karbon/dockers/vdocumentdocker.cc View File

@@ -1164,7 +1164,7 @@ VHistoryItem::init()
char buffer[70];
sprintf( buffer, "%064ld", ++g_lastKey );
m_key = buffer;
setPixmap( 0, TQPixmap( KGlobal::iconLoader()->iconPath( m_command->icon(), KIcon::Small ) ) );
setPixmap( 0, TQPixmap( TDEGlobal::iconLoader()->iconPath( m_command->icon(), KIcon::Small ) ) );
setText( 0, m_command->name() );
} // VHistoryITem::init



+ 1
- 1
karbon/karbon_part.cc View File

@@ -635,7 +635,7 @@ KarbonPart::initConfig()
undos = config->readNumEntry( "UndoRedo", -1 );
TQString defaultUnit = "cm";

if( KGlobal::locale()->measureSystem() == KLocale::Imperial )
if( TDEGlobal::locale()->measureSystem() == KLocale::Imperial )
defaultUnit = "in";

setUnit( KoUnit::unit( config->readEntry( "Units", defaultUnit ) ) );


+ 1
- 1
karbon/karbon_resourceserver.cc View File

@@ -497,7 +497,7 @@ KarbonResourceServer::cachePixmap( const TQString &key, int group_or_size )
TQPixmap *result = 0L;
if( !( result = m_pixmaps[ key ] ) )
{
result = new TQPixmap( KGlobal::iconLoader()->iconPath( key, group_or_size ) );
result = new TQPixmap( TDEGlobal::iconLoader()->iconPath( key, group_or_size ) );
m_pixmaps.insert( key, result );
}
return result;


+ 1
- 1
karbon/karbon_view.cc View File

@@ -1171,7 +1171,7 @@ KarbonView::mouseEvent( TQMouseEvent* event, const KoPoint &p )
xy.setX(KoUnit::toUserValue(xy.x(), part()->unit()));
xy.setY(KoUnit::toUserValue(xy.y(), part()->unit()));

m_cursorCoords->setText( TQString( "%1, %2" ).arg(KGlobal::_locale->formatNumber(xy.x(), 2)).arg(KGlobal::_locale->formatNumber(xy.y(), 2)) );
m_cursorCoords->setText( TQString( "%1, %2" ).arg(TDEGlobal::_locale->formatNumber(xy.x(), 2)).arg(TDEGlobal::_locale->formatNumber(xy.y(), 2)) );

if( toolController() )
return toolController()->mouseEvent( event, p );


+ 1
- 1
karbon/render/vkopainter.cc View File

@@ -625,7 +625,7 @@ VKoPainter::applyPattern( ArtSVP *svp, bool fill )

VPattern pat = fill ? m_fill->pattern() : m_stroke->pattern();
if( !pat.isValid() ) {
pat.load( KGlobal::iconLoader()->iconPath( "karbon.png", -KIcon::SizeMedium ) ); }
pat.load( TDEGlobal::iconLoader()->iconPath( "karbon.png", -KIcon::SizeMedium ) ); }
if( !pat.isValid() ) {
pat = *(dynamic_cast<VPattern *>(KarbonFactory::rServer()->patterns().getFirst() )) ;}



+ 2
- 2
karbon/tools/vtexttool.cc View File

@@ -325,7 +325,7 @@ VTextOptionsWidget::VTextOptionsWidget( VTextTool* tool, TQWidget *parent )

mainLayout->add( m_tabWidget = new TQTabWidget( base ) );

m_tabWidget->setFont( TQFont( KGlobalSettings::generalFont().family() , 8 ) );
m_tabWidget->setFont( TQFont( TDEGlobalSettings::generalFont().family() , 8 ) );

TQWidget* textWidget = new TQWidget( m_tabWidget );

@@ -376,7 +376,7 @@ VTextOptionsWidget::VTextOptionsWidget( VTextTool* tool, TQWidget *parent )

m_tabWidget->addTab( fxWidget, i18n( "Effects" ) );

m_fontCombo->setCurrentText( KGlobalSettings::generalFont().family() );
m_fontCombo->setCurrentText( TDEGlobalSettings::generalFont().family() );

m_fontSize->setValue( 12 );
m_fontSize->setSuffix( " pt" );


+ 3
- 3
kchart/csvimportdialog.cc View File

@@ -62,7 +62,7 @@ CSVImportDialog::CSVImportDialog(TQWidget* parent, TQByteArray& fileArray)
TQStringList encodings;
encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).arg( "UTF-8" );
encodings << i18n( "Descriptive encoding name", "Locale ( %1 )" ).arg( TQTextCodec::codecForLocale()->name() );
encodings += KGlobal::charsets()->descriptiveEncodingNames();
encodings += TDEGlobal::charsets()->descriptiveEncodingNames();
// Add a few non-standard encodings, which might be useful for text files
const TQString description(i18n("Descriptive encoding name","Other ( %1 )"));
encodings << description.arg("Apple Roman"); // Apple
@@ -589,7 +589,7 @@ void CSVImportDialog::ignoreDuplicatesChanged(int)

TQTextCodec* CSVImportDialog::getCodec(void) const
{
const TQString strCodec( KGlobal::charsets()->encodingForName( m_dialog->comboBoxEncoding->currentText() ) );
const TQString strCodec( TDEGlobal::charsets()->encodingForName( m_dialog->comboBoxEncoding->currentText() ) );
kdDebug(30502) << "Encoding: " << strCodec << endl;

bool ok = false;
@@ -602,7 +602,7 @@ TQTextCodec* CSVImportDialog::getCodec(void) const
}
else
{
codec = KGlobal::charsets()->codecForName( strCodec, ok );
codec = TDEGlobal::charsets()->codecForName( strCodec, ok );
}

// Still nothing?


+ 2
- 2
kchart/kchartBackgroundPixmapConfigPage.cc View File

@@ -181,7 +181,7 @@ void KChartBackgroundPixmapConfigPage::loadWallpaperFilesList()
TQMap<TQString, TQPair<TQString, TQString> > papers;

//search for .desktop files before searching for images without .desktop files
TQStringList lst = KGlobal::dirs()->findAllResources("wallpaper", "*desktop", false, true);
TQStringList lst = TDEGlobal::dirs()->findAllResources("wallpaper", "*desktop", false, true);
TQStringList files;
for (TQStringList::ConstIterator it = lst.begin(); it != lst.end(); ++it)
{
@@ -219,7 +219,7 @@ void KChartBackgroundPixmapConfigPage::loadWallpaperFilesList()
}

//now find any wallpapers that don't have a .desktop file
lst = KGlobal::dirs()->findAllResources("wallpaper", "*", false, true);
lst = TDEGlobal::dirs()->findAllResources("wallpaper", "*", false, true);
for (TQStringList::ConstIterator it = lst.begin(); it != lst.end(); ++it)
{
if ( !(*it).endsWith(".desktop") && files.grep(*it).empty() ) {


+ 2
- 2
kchart/kchart_part.cc View File

@@ -724,8 +724,8 @@ void KChartPart::setChartDefaults()
yAxis = m_params->axisParams( KDChartAxisParams::AxisPosLeft );

// decimal symbol and thousands separator
yAxis.setAxisLabelsRadix( KGlobal::locale()->decimalSymbol(),
KGlobal::locale()->thousandsSeparator() );
yAxis.setAxisLabelsRadix( TDEGlobal::locale()->decimalSymbol(),
TDEGlobal::locale()->thousandsSeparator() );

m_params->setAxisParams( KDChartAxisParams::AxisPosLeft, yAxis );



+ 3
- 3
kchart/kchart_view.cc View File

@@ -356,7 +356,7 @@ void KChartView::slotRepaint()
void KChartView::saveConfig()
{
kdDebug(35001) << "Save config..." << endl;
((KChartPart*)koDocument())->saveConfig( KGlobal::config() );
((KChartPart*)koDocument())->saveConfig( TDEGlobal::config() );
}


@@ -364,8 +364,8 @@ void KChartView::loadConfig()
{
kdDebug(35001) << "Load config..." << endl;

KGlobal::config()->reparseConfiguration();
((KChartPart*)koDocument())->loadConfig( KGlobal::config() );
TDEGlobal::config()->reparseConfiguration();
((KChartPart*)koDocument())->loadConfig( TDEGlobal::config() );

updateGuiTypeOfChart();
//refresh chart when you load config


+ 5
- 5
kdgantt/KDGanttViewSubwidgets.cpp View File

@@ -824,7 +824,7 @@ void KDTimeHeaderWidget::preparePopupMenu()

TQString KDTimeHeaderWidget::getToolTipText(TQPoint p)
{
return KGlobal::locale()->formatDateTime(getDateTimeForIndex(p.x()));
return TDEGlobal::locale()->formatDateTime(getDateTimeForIndex(p.x()));
}
void KDTimeHeaderWidget::addTickRight( int num )
{
@@ -1962,7 +1962,7 @@ TQDateTime KDTimeHeaderWidget::getEvenTimeDate(TQDateTime tempdatetime ,Scale sc
break;
case KDGanttView::Week:
tempdate = tempdatetime.date();
while (tempdate.dayOfWeek ()!= KGlobal::locale()->weekStartDay())
while (tempdate.dayOfWeek ()!= TDEGlobal::locale()->weekStartDay())
tempdate = tempdate.addDays(-1);
//tempdate = tempdate.addDays(-7);
tempdatetime = TQDateTime (tempdate, TQTime (0,0));
@@ -2229,7 +2229,7 @@ void KDTimeHeaderWidget::computeTicks(bool doNotComputeRealScale)
TQTime tempTime = myRealStart.time();
TQDateTime tempDateTime;
int i;
const KCalendarSystem * calendar = KGlobal::locale()->calendar();
const KCalendarSystem * calendar = TDEGlobal::locale()->calendar();
switch (myRealScale)
{
case KDGanttView::Minute:
@@ -2296,7 +2296,7 @@ void KDTimeHeaderWidget::computeTicks(bool doNotComputeRealScale)
tempDate = tempDate.addDays(tempMinorScaleCount);
}
tempDate = myRealStart.date();
while (tempDate.dayOfWeek() != KGlobal::locale()->weekStartDay())
while (tempDate.dayOfWeek() != TDEGlobal::locale()->weekStartDay())
tempDate = tempDate.addDays(1);
while (tempDate < myRealEnd.date()) {
majorTicks.append( getCoordX(tempDate));
@@ -2316,7 +2316,7 @@ void KDTimeHeaderWidget::computeTicks(bool doNotComputeRealScale)
tempDate = tempDate.addDays(7*tempMinorScaleCount);
}
tempDate = myRealStart.date();
while (tempDate.day() != KGlobal::locale()->weekStartDay())
while (tempDate.day() != TDEGlobal::locale()->weekStartDay())
tempDate = tempDate.addDays(1);
while (tempDate < myRealEnd.date()) {
majorTicks.append( getCoordX(tempDate));


+ 5
- 5
kexi/3rdparty/kolibs/koGlobal.cc View File

@@ -48,15 +48,15 @@ KoGlobal::KoGlobal()
: m_pointSize( -1 ), m_kofficeConfig( 0L )
{
// Install the libkoffice* translations
KGlobal::locale()->insertCatalogue("koffice");
TDEGlobal::locale()->insertCatalogue("koffice");

KImageIO::registerFormats();

// Tell KStandardDirs about the koffice prefix
KGlobal::dirs()->addPrefix(PREFIX);
TDEGlobal::dirs()->addPrefix(PREFIX);

// Tell the iconloader about share/apps/koffice/icons
KGlobal::iconLoader()->addAppDir("koffice");
TDEGlobal::iconLoader()->addAppDir("koffice");

// Another way to get the DPI of the display would be TQPaintDeviceMetrics,
// but we have no widget here (and moving this to KoView wouldn't allow
@@ -77,7 +77,7 @@ KoGlobal::~KoGlobal()

TQFont KoGlobal::_defaultFont()
{
TQFont font = KGlobalSettings::generalFont();
TQFont font = TDEGlobalSettings::generalFont();
// we have to use TQFontInfo, in case the font was specified with a pixel size
if ( font.pointSize() == -1 )
{
@@ -132,7 +132,7 @@ void KoGlobal::createListOfLanguages()
// Many of them are already in all_languages but all_languages doesn't
// currently have en_GB or en_US etc.

const TQStringList translationList = KGlobal::dirs()->findAllResources("locale",
const TQStringList translationList = TDEGlobal::dirs()->findAllResources("locale",
TQString::fromLatin1("*/entry.desktop"));
for ( TQStringList::ConstIterator it = translationList.begin();
it != translationList.end(); ++it )


+ 1
- 1
kexi/3rdparty/kolibs/koGlobal.h View File

@@ -33,7 +33,7 @@ class KOFFICECORE_EXPORT KoGlobal
public:
/// For KoApplication
static void initialize() {
(void)self(); // I don't want to make KGlobal instances public, so self() is private
(void)self(); // I don't want to make TDEGlobal instances public, so self() is private
}
/**
* Return the default font for KOffice programs.


+ 1
- 1
kexi/3rdparty/kolibs/koPageLayout.cpp View File

@@ -217,7 +217,7 @@ KoFormat KoPageFormat::formatFromString( const TQString & string )

KoFormat KoPageFormat::defaultFormat()
{
int kprinter = KGlobal::locale()->pageSize();
int kprinter = TDEGlobal::locale()->pageSize();
for ( int i = 0 ; i <= PG_LAST_FORMAT ; ++i )
{
if ( pageFormatInfo[ i ].kprinter == kprinter )


+ 2
- 2
kexi/3rdparty/kolibs/koUnit.cc View File

@@ -116,7 +116,7 @@ double KoUnit::ptToUnit( const double ptValue, const Unit unit )

TQString KoUnit::toUserStringValue( double ptValue, Unit unit )
{
return KGlobal::locale()->formatNumber( toUserValue( ptValue, unit ) );
return TDEGlobal::locale()->formatNumber( toUserValue( ptValue, unit ) );
}

double KoUnit::fromUserValue( double value, Unit unit )
@@ -144,7 +144,7 @@ double KoUnit::fromUserValue( double value, Unit unit )

double KoUnit::fromUserValue( const TQString& value, Unit unit, bool* ok )
{
return fromUserValue( KGlobal::locale()->readNumber( value, ok ), unit );
return fromUserValue( TDEGlobal::locale()->readNumber( value, ok ), unit );
}

double KoUnit::parseValue( TQString value, double defaultVal )


+ 3
- 3
kexi/3rdparty/kolibs/koUnitWidgets.cc View File

@@ -89,7 +89,7 @@ KoUnitDoubleValidator::validate( TQString &s, int &pos ) const

TQString KoUnitDoubleBase::getVisibleText( double value ) const
{
const TQString num ( TQString( "%1%2").arg( KGlobal::locale()->formatNumber( value, m_precision ), KoUnit::unitName( m_unit ) ) );
const TQString num ( TQString( "%1%2").arg( TDEGlobal::locale()->formatNumber( value, m_precision ), KoUnit::unitName( m_unit ) ) );
kdDebug(30004) << "getVisibleText: " << TQString::number( value, 'f', 12 ) << " => " << num << endl;
return num;
}
@@ -99,11 +99,11 @@ double KoUnitDoubleBase::toDouble( const TQString& str, bool* ok ) const
TQString str2( str );
/* KLocale::readNumber wants the thousand separator exactly at 1000.
But when editing, it might be anywhere. So we need to remove it. */
const TQString sep( KGlobal::locale()->thousandsSeparator() );
const TQString sep( TDEGlobal::locale()->thousandsSeparator() );
if ( !sep.isEmpty() )
str2.remove( sep );
str2.remove( KoUnit::unitName( m_unit ) );
const double dbl = KGlobal::locale()->readNumber( str2, ok );
const double dbl = TDEGlobal::locale()->readNumber( str2, ok );
if ( ok )
kdDebug(30004) << "toDouble:" << str << ": => :" << str2 << ": => " << TQString::number( dbl, 'f', 12 ) << endl;
else


+ 1
- 1
kexi/core/kexi.cpp View File

@@ -145,7 +145,7 @@ TQFont Kexi::smallFont(TQWidget *init)
_INIT_SHARED;
if (!_int->smallFont) {
_int->smallFont = new TQFont( init->font() );
const int wdth = KGlobalSettings::desktopGeometry(init).width();
const int wdth = TDEGlobalSettings::desktopGeometry(init).width();
int size = 10 + TQMAX(0, wdth - 1100) / 100;
size = TQMIN( init->fontInfo().pixelSize(), size );
_int->smallFont->setPixelSize( size );


+ 4
- 4
kexi/core/kexidbconnectionset.cpp View File

@@ -68,7 +68,7 @@ bool KexiDBConnectionSet::addConnectionData(KexiDB::ConnectionData *data, const
|| !filename.isEmpty() && data==d->dataForFilenames[filename];

if (generateUniqueFilename) {
TQString dir = KGlobal::dirs()->saveLocation("data", "kexi/connections/", false /*!create*/);
TQString dir = TDEGlobal::dirs()->saveLocation("data", "kexi/connections/", false /*!create*/);
if (dir.isEmpty())
return false;
TQString baseFilename( dir + (data->hostName.isEmpty() ? "localhost" : data->hostName) );
@@ -151,11 +151,11 @@ void KexiDBConnectionSet::clear()
void KexiDBConnectionSet::load()
{
clear();
// TQStringList dirs( KGlobal::dirs()->findDirs("data", "kexi/connections") );
// TQStringList dirs( TDEGlobal::dirs()->findDirs("data", "kexi/connections") );
// kexidbg << dirs << endl;
TQStringList files( KGlobal::dirs()->findAllResources("data", "kexi/connections/*.kexic") );
TQStringList files( TDEGlobal::dirs()->findAllResources("data", "kexi/connections/*.kexic") );
// //also try for capital file extension
// files += KGlobal::dirs()->findAllResources("data", "kexi/connections/*.KEXIC");
// files += TDEGlobal::dirs()->findAllResources("data", "kexi/connections/*.KEXIC");
// kexidbg << files << endl;

foreach(TQStringList::ConstIterator, it, files) {


+ 3
- 3
kexi/core/kexidbshortcutfile.cpp View File

@@ -286,11 +286,11 @@ bool KexiDBConnShortcutFile::saveConnectionData(const KexiDB::ConnectionData& da
bool KexiDBConnSetShortcutFiles::loadConnectionDataSet(KexiDBConnectionSet& set)
{
set.clear();
// TQStringList dirs( KGlobal::dirs()->findDirs("data", "kexi/connections") );
// TQStringList dirs( TDEGlobal::dirs()->findDirs("data", "kexi/connections") );
// kexidbg << dirs << endl;
TQStringList files( KGlobal::dirs()->findAllResources("data", "kexi/connections/*.kexic") );
TQStringList files( TDEGlobal::dirs()->findAllResources("data", "kexi/connections/*.kexic") );
// //also try for capital file extension
// files += KGlobal::dirs()->findAllResources("data", "kexi/connections/*.KEXIC");
// files += TDEGlobal::dirs()->findAllResources("data", "kexi/connections/*.KEXIC");
kexidbg << files << endl;

foreach(TQStringList::ConstIterator, it, files) {


+ 1
- 1
kexi/core/kexidbshortcutfile.h View File

@@ -105,7 +105,7 @@ class KEXICORE_EXPORT KexiDBConnShortcutFile : protected KexiDBShortcutFile
//! connection information (i.e. KexiDBConnectionSet).
//! This is implementation for handling .KEXIC files.
//! The set is loaded from files found using
//! KGlobal::dirs()->findAllResources("data", "kexi/connections/*.kexic").
//! TDEGlobal::dirs()->findAllResources("data", "kexi/connections/*.kexic").
class KexiDBConnSetShortcutFiles
{
public:


+ 1
- 1
kexi/core/kexitemplateloader.cpp View File

@@ -34,7 +34,7 @@ KexiTemplateInfo::List KexiTemplateLoader::loadListInfo()
{
KexiTemplateInfo::List list;
const TQString subdir = TQString(kapp->instanceName()) + "/templates";
TQString lang( KGlobal::locale()->language() );
TQString lang( TDEGlobal::locale()->language() );
TQStringList dirs( kapp->dirs()->findDirs("data", subdir) );
while (true) {
foreach( TQStringList::ConstIterator, it, dirs) {


+ 1
- 1
kexi/doc/dev/TODO-Kexi-js View File

@@ -917,7 +917,7 @@ General TODO:
TODO:
- on opening detect whether a table exists (empty table view should not be displayed)
- Another Kexi instance started from KexiMainWindow using QProcess freezes after opening
3rd table or so. Move to KProcess on Linux.
3rd table or so. Move to TDEProcess on Linux.

TODO:
- if you place e.g. a label in a container like a tabwidget and doubleclick it to edit the content,


+ 4
- 4
kexi/formeditor/formmanager.cpp View File

@@ -116,9 +116,9 @@ FormManager::FormManager(TQObject *parent, int options, const char *name)
{
Q_UNUSED(options);
#ifdef KEXI_STANDALONE
KGlobal::locale()->insertCatalogue("standalone_kformdesigner");
TDEGlobal::locale()->insertCatalogue("standalone_kformdesigner");
#else
KGlobal::locale()->insertCatalogue("kformdesigner");
TDEGlobal::locale()->insertCatalogue("kformdesigner");
#endif

connect( kapp, TQT_SIGNAL( settingsChanged(int) ), TQT_SLOT( slotSettingsChanged(int) ) );
@@ -226,7 +226,7 @@ FormManager::createActions(WidgetLibrary *lib, KActionCollection* collection, KX
this, TQT_SLOT(slotStyle()), m_collection, "change_style");
m_style->setEditable(false);

KGlobal::config()->setGroup("General");
TDEGlobal::config()->setGroup("General");
TQString currentStyle = TQString::fromLatin1(kapp->style().name()).lower();
const TQStringList styles = TQStyleFactory::keys();
m_style->setItems(styles);
@@ -1460,7 +1460,7 @@ void
FormManager::slotSettingsChanged(int category)
{
if (category==TDEApplication::SETTINGS_SHORTCUTS) {
m_contextMenuKey = KGlobalSettings::contextMenuKey();
m_contextMenuKey = TDEGlobalSettings::contextMenuKey();
}
}



+ 1
- 1
kexi/formeditor/test/main.cpp View File

@@ -47,7 +47,7 @@ int main(int argc, char **argv)
TDECmdLineArgs::addCmdLineOptions(options);
TDEApplication app;

KGlobal::iconLoader()->addAppDir("kexi");
TDEGlobal::iconLoader()->addAppDir("kexi");

KFDMainWindow *v = new KFDMainWindow();
if (!v->centralWidget()) { //KFD part could be not found


+ 2
- 2
kexi/kexidb/drivermanager.cpp View File

@@ -92,8 +92,8 @@ bool DriverManagerInternal::lookupDrivers()
connect(tqApp,TQT_SIGNAL(aboutToQuit()),this,TQT_SLOT(slotAppQuits()));
}
//TODO: for QT-only version check for TDEInstance wrapper
// KexiDBWarn << "DriverManagerInternal::lookupDrivers(): cannot work without TDEInstance (KGlobal::instance()==0)!" << endl;
// setError("Driver Manager cannot work without TDEInstance (KGlobal::instance()==0)!");
// KexiDBWarn << "DriverManagerInternal::lookupDrivers(): cannot work without TDEInstance (TDEGlobal::instance()==0)!" << endl;
// setError("Driver Manager cannot work without TDEInstance (TDEGlobal::instance()==0)!");

lookupDriversNeeded = false;
clearError();


+ 2
- 2
kexi/kexidb/utils.cpp View File

@@ -613,12 +613,12 @@ TQString KexiDB::formatNumberForVisibleDecimalPlaces(double value, int decimalPl
i--;
if (s[i]=='.') //remove '.'
i--;
s = s.left(i+1).replace('.', KGlobal::locale()->decimalSymbol());
s = s.left(i+1).replace('.', TDEGlobal::locale()->decimalSymbol());
return s;
}
if (decimalPlaces == 0)
return TQString::number((int)value);
return KGlobal::locale()->formatNumber(value, decimalPlaces);
return TDEGlobal::locale()->formatNumber(value, decimalPlaces);
}

KexiDB::Field::Type KexiDB::intToFieldType( int type )


+ 12
- 12
kexi/main/keximainwindowimpl.cpp View File

@@ -154,11 +154,11 @@ int KexiMainWindowImpl::create(int argc, char *argv[], TDEAboutData* aboutdata)
TDEApplication* app = new TDEApplication(true, GUIenabled);

#ifdef KEXI_STANDALONE
KGlobal::locale()->removeCatalogue("kexi");
KGlobal::locale()->insertCatalogue("standalone_kexi");
TDEGlobal::locale()->removeCatalogue("kexi");
TDEGlobal::locale()->insertCatalogue("standalone_kexi");
#endif
KGlobal::locale()->insertCatalogue("koffice");
KGlobal::locale()->insertCatalogue("koproperty");
TDEGlobal::locale()->insertCatalogue("koffice");
TDEGlobal::locale()->insertCatalogue("koproperty");

#ifdef CUSTOM_VERSION
# include "custom_exec.h"
@@ -255,8 +255,8 @@ KexiMainWindowImpl::KexiMainWindowImpl()
manager()->setSplitterKeepSize(true);
setStandardMDIMenuEnabled(false);
setAsDefaultHost(); //this is default host now.
KGlobal::iconLoader()->addAppDir("kexi");
KGlobal::iconLoader()->addAppDir("koffice");
TDEGlobal::iconLoader()->addAppDir("kexi");
TDEGlobal::iconLoader()->addAppDir("koffice");

//get informed
connect(&Kexi::partManager(),TQT_SIGNAL(partLoaded(KexiPart::Part*)),this,TQT_SLOT(slotPartLoaded(KexiPart::Part*)));
@@ -1360,7 +1360,7 @@ tristate KexiMainWindowImpl::createProjectFromTemplate(const KexiProjectData& pr
while (true) {
#ifdef TQ_WS_WIN
//! @todo remove
TQString recentDir = KGlobalSettings::documentPath();
TQString recentDir = TDEGlobalSettings::documentPath();
if (fname.isEmpty() && !projectData.constConnectionData()->dbFileName().isEmpty()) //propose filename from db template name
fname = KFileDialog::getStartURL(startDir, recentDir).path()
+ '/' + projectData.constConnectionData()->dbFileName();
@@ -2073,8 +2073,8 @@ KexiMainWindowImpl::restoreSettings()
int scnum = TQApplication::desktop()->screenNumber(parentWidget());
TQRect desk = TQApplication::desktop()->screenGeometry(scnum);
//#if KDE_IS_VERSION(3,1,90)
// restoredWidth = KGlobalSettings::screenGeometry(scnum).width();
// restoredHeight = KGlobalSettings::screenGeometry(scnum).height();
// restoredWidth = TDEGlobalSettings::screenGeometry(scnum).width();
// restoredHeight = TDEGlobalSettings::screenGeometry(scnum).height();
//#else
// restoredWidth = TQApplication::desktop()->width();
// restoredHeight = TQApplication::desktop()->height();
@@ -2563,7 +2563,7 @@ KexiMainWindowImpl::slotProjectNew()
}
//todo: pass new_data->caption()
//start new instance
//! @todo use KProcess?
//! @todo use TDEProcess?
TQProcess proc(args, TQT_TQOBJECT(this), "process");
proc.setCommunication((TQProcess::Communication)0);
// proc.setWorkingDirectory( TQFileInfo(new_data->connectionData()->fileName()).dir(true) );
@@ -3989,7 +3989,7 @@ void KexiMainWindowImpl::importantInfo(bool /*onStartup*/)
if (!d->config->hasKey("RunOnStart"))
d->config->writeEntry("RunOnStart",true);

TQString lang = KGlobal::locale()->language();
TQString lang = TDEGlobal::locale()->language();
TQString fname = locate("data", TQString("kexi/readme_")+lang);
if (fname.isEmpty())//back to default
fname = locate("data", "kexi/readme_en");
@@ -4002,7 +4002,7 @@ void KexiMainWindowImpl::importantInfo(bool /*onStartup*/)
TQFile f(fname);
if ( f.open( IO_ReadOnly ) ) {
TQTextStream ts(&f);
ts.setCodec( KGlobal::locale()->codecForEncoding() );
ts.setCodec( TDEGlobal::locale()->codecForEncoding() );
TQTextBrowser *tb = KexiUtils::findFirstChild<KTextBrowser>(&tipDialog,"KTextBrowser");
if (tb) {
tb->setText( TQString("<qt>%1</qt>").arg(ts.read()) );


+ 1
- 1
kexi/main/kexinewstuff.cpp View File

@@ -41,7 +41,7 @@ KexiNewStuff::KexiNewStuff(TQWidget *parent)
// fails to download something, it still marks the thing as
// successfully downloaded and therefore we arn't able to
// download it again :-/
KGlobal::config()->deleteGroup("KNewStuffStatus");
TDEGlobal::config()->deleteGroup("KNewStuffStatus");
}

KexiNewStuff::~KexiNewStuff()


+ 5
- 5
kexi/main/printing/kexisimpleprintingengine.cpp View File

@@ -278,7 +278,7 @@ void KexiSimplePrintingEngine::paintPage(int pageNumber, TQPainter& painter, boo
}
painter.setFont(m_mainFont);

m_dateTimeText = KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime(),
m_dateTimeText = TDEGlobal::locale()->formatDateTime(TQDateTime::currentDateTime(),
true, false);
m_dateTimeWidth = painter.fontMetrics().width(m_dateTimeText+" ");
m_mainLineSpacing = painter.fontMetrics().lineSpacing();
@@ -432,23 +432,23 @@ void KexiSimplePrintingEngine::paintRecord(TQPainter& painter, KexiTableItem *it
else if (ftype==KexiDB::Field::DateTime) {
TQDateTime dt(v.toDateTime());
if (dt.isValid())
text = KGlobal::locale()->formatDateTime(dt);
text = TDEGlobal::locale()->formatDateTime(dt);
}
//! todo inherit format
else if (ftype==KexiDB::Field::Date) {
TQDate date(v.toDate());
if (date.isValid())
text = KGlobal::locale()->formatDate(date, true/*short*/);
text = TDEGlobal::locale()->formatDate(date, true/*short*/);
}
//! todo inherit format
else if (ftype==KexiDB::Field::Time) {
TQTime time(v.toTime());
if (time.isValid())
text = KGlobal::locale()->formatTime(time);
text = TDEGlobal::locale()->formatTime(time);
}
//! todo currency, decimal...
else if (ci->field->isFPNumericType())
text = KGlobal::locale()->formatNumber(v.toDouble());
text = TDEGlobal::locale()->formatNumber(v.toDouble());
else if (ftype==KexiDB::Field::Boolean)
text = v.toBool()
? i18n("Boolean Yes (true)","Yes") : i18n("Boolean No (false)", "No");


+ 1
- 1
kexi/main/printing/kexisimpleprintingpagesetup.cpp View File

@@ -324,7 +324,7 @@ KexiSimplePrintingPageSetup::KexiSimplePrintingPageSetup( KexiMainWindow *mainWi

// settings
//! @todo default?
m_unit = KLocale::Metric == KGlobal::locale()->measureSystem() ? KoUnit::U_CM : KoUnit::U_INCH;
m_unit = KLocale::Metric == TDEGlobal::locale()->measureSystem() ? KoUnit::U_CM : KoUnit::U_INCH;

// GUI
TQVBoxLayout *lyr = new TQVBoxLayout(this);


+ 1
- 1
kexi/main/startup/KexiConnSelector.cpp View File

@@ -108,7 +108,7 @@ KexiConnSelectorWidget::KexiConnSelectorWidget( KexiDBConnectionSet& conn_set,
d->conn_set = &conn_set;
d->startDirOrVariable = startDirOrVariable;
TQString none, iconname = KMimeType::mimeType( KexiDB::Driver::defaultFileBasedDriverMimeType() )->icon(none,0);
const TQPixmap &icon = KGlobal::iconLoader()->loadIcon( iconname, KIcon::Desktop );
const TQPixmap &icon = TDEGlobal::iconLoader()->loadIcon( iconname, KIcon::Desktop );
setIcon( icon );

TQVBoxLayout* globalLyr = new TQVBoxLayout( this );


+ 6
- 6
kexi/main/startup/KexiNewProjectWizard.cpp View File

@@ -107,7 +107,7 @@ KexiNewProjectWizard::KexiNewProjectWizard(KexiDBConnectionSet& conn_set,
TQString none;
d->lvi_file = new KListViewItem( m_prjtype_sel->lv_types, i18n("New Project Stored in File") );
d->lvi_file->setPixmap(0,
KGlobal::iconLoader()->loadIcon( KMimeType::mimeType(
TDEGlobal::iconLoader()->loadIcon( KMimeType::mimeType(
KexiDB::Driver::defaultFileBasedDriverMimeType() )->icon(none,0), KIcon::Desktop
)
);
@@ -357,15 +357,15 @@ void KexiNewProjectWizard::accept()
void KexiNewProjectWizard::done(int r)
{
/* //save state (always, no matter if dialog is accepted or not)
KGlobal::config()->setGroup("Startup");
TDEGlobal::config()->setGroup("Startup");
if (!m_prjtype_sel->chk_always->isChecked())
KGlobal::config()->deleteEntry("DefaultStorageForNewProjects");
TDEGlobal::config()->deleteEntry("DefaultStorageForNewProjects");
else if (m_prjtype_sel->lv_types->currentItem()==d->lvi_file)
KGlobal::config()->writeEntry("DefaultStorageForNewProjects","File");
TDEGlobal::config()->writeEntry("DefaultStorageForNewProjects","File");
else
KGlobal::config()->writeEntry("DefaultStorageForNewProjects","Server");*/
TDEGlobal::config()->writeEntry("DefaultStorageForNewProjects","Server");*/

KGlobal::config()->sync();
TDEGlobal::config()->sync();
KWizard::done(r);
}



+ 1
- 1
kexi/main/startup/KexiProjectSelector.cpp View File

@@ -105,7 +105,7 @@ KexiProjectSelectorWidget::KexiProjectSelectorWidget(
d->showProjectNameColumn = showProjectNameColumn;
d->showConnectionColumns = showConnectionColumns;
TQString none, iconname = KMimeType::mimeType( KexiDB::Driver::defaultFileBasedDriverMimeType() )->icon(none,0);
d->fileicon = KGlobal::iconLoader()->loadIcon( iconname, KIcon::Desktop );
d->fileicon = TDEGlobal::iconLoader()->loadIcon( iconname, KIcon::Desktop );
setIcon( d->fileicon );
d->dbicon = SmallIcon("database");
// list->setHScrollBarMode( TQScrollView::AlwaysOn );


+ 9
- 9
kexi/main/startup/KexiStartupDialog.cpp View File

@@ -69,9 +69,9 @@ public:
result = 0;
TQString none, iconname;
iconname = KMimeType::mimeType( KexiDB::Driver::defaultFileBasedDriverMimeType() )->icon(none,0);
kexi_sqlite_icon = KGlobal::iconLoader()->loadIcon( iconname, KIcon::Desktop );
kexi_sqlite_icon = TDEGlobal::iconLoader()->loadIcon( iconname, KIcon::Desktop );
iconname = KMimeType::mimeType("application/x-kexiproject-shortcut")->icon(none,0);
kexi_shortcut_icon = KGlobal::iconLoader()->loadIcon( iconname, KIcon::Desktop );
kexi_shortcut_icon = TDEGlobal::iconLoader()->loadIcon( iconname, KIcon::Desktop );
prj_selector = 0;
chkDoNotShow = 0;
openExistingConnWidget = 0;
@@ -208,8 +208,8 @@ KexiStartupDialog::~KexiStartupDialog()

bool KexiStartupDialog::shouldBeShown()
{
KGlobal::config()->setGroup("Startup");
return KGlobal::config()->readBoolEntry("ShowStartupDialog",true);
TDEGlobal::config()->setGroup("Startup");
return TDEGlobal::config()->readBoolEntry("ShowStartupDialog",true);
}

void KexiStartupDialog::show()
@@ -272,15 +272,15 @@ void KexiStartupDialog::done(int r)
}

//save settings
KGlobal::config()->setGroup("Startup");
TDEGlobal::config()->setGroup("Startup");
if (d->openExistingConnWidget)
KGlobal::config()->writeEntry("OpenExistingType",
TDEGlobal::config()->writeEntry("OpenExistingType",
(d->openExistingConnWidget->selectedConnectionType() == KexiConnSelectorWidget::FileBased)
? "File" : "Server");
if (d->chkDoNotShow)
KGlobal::config()->writeEntry("ShowStartupDialog",!d->chkDoNotShow->isChecked());
TDEGlobal::config()->writeEntry("ShowStartupDialog",!d->chkDoNotShow->isChecked());

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

KDialogBase::done(r);
}
@@ -552,7 +552,7 @@ void KexiStartupDialog::setupPageOpenExisting()
d->pageOpenExisting, "KexiConnSelectorWidget");
d->openExistingConnWidget->hideConnectonIcon();
lyr->addWidget( d->openExistingConnWidget );
if (KGlobal::config()->readEntry("OpenExistingType","File")=="File")
if (TDEGlobal::config()->readEntry("OpenExistingType","File")=="File")
d->openExistingConnWidget->showSimpleConn();
else {
d->openExistingConnWidget->showSimpleConn();


+ 6
- 6
kexi/main/startup/KexiStartupFileDialog_win.cpp View File

@@ -56,7 +56,7 @@ KexiStartupFileDialogBase::KexiStartupFileDialogBase(
//make default 'My Documents' folder
//TODO: store changes in the app's config file?
if (_dirName.isEmpty())
_dirName = KGlobalSettings::documentPath();
_dirName = TDEGlobalSettings::documentPath();

init(_dirName, filter, parent);

@@ -84,7 +84,7 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f
//TODO d->keepLocation = false;
//TODO d->operationMode = Opening;
setMode(KFile::File | KFile::ExistingOnly); //(js) default: open action
setIcon( KGlobal::iconLoader()->loadIcon("fileopen", KIcon::Desktop) );
setIcon( TDEGlobal::iconLoader()->loadIcon("fileopen", KIcon::Desktop) );
setDir(TQDir(startDir));
//TODO d->hasDefaultFilter = false;
//TODO d->hasView = false;
@@ -99,7 +99,7 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f
//(js) d->autoSelectExtCheckBox = 0; // delayed loading
//TODO d->autoSelectExtChecked = false;
//(js) d->urlBar = 0; // delayed loading
//TODO KConfig *config = KGlobal::config();
//TODO KConfig *config = TDEGlobal::config();
//TODO KConfigGroupSaver cs( config, ConfigGroup );
//TODO d->initializeSpeedbar = config->readBoolEntry( "Set speedbar defaults",
//TODO true );
@@ -131,7 +131,7 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f
text );

KURL docPath;
docPath.setPath( KGlobalSettings::documentPath() );
docPath.setPath( TDEGlobalSettings::documentPath() );
if ( u.path(+1) != docPath.path(+1) ) {
text = i18n("Documents: %1").arg( docPath.path( +1 ) );
d->pathCombo->addDefaultURL( u,
@@ -139,7 +139,7 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f
text );
}

u.setPath( KGlobalSettings::desktopPath() );
u.setPath( TDEGlobalSettings::desktopPath() );
text = i18n("Desktop: %1").arg( u.path( +1 ) );
d->pathCombo->addDefaultURL( u,
KMimeType::pixmapForURL( u, 0, KIcon::Small ),
@@ -387,7 +387,7 @@ void KexiStartupFileDialogBase::setOperationMode( KFileDialog::OperationMode mod
// d->keepLocation = (mode == Saving);
if (mode == KFileDialog::Saving) {
setMode( KFile::File );
setIcon( KGlobal::iconLoader()->loadIcon("filesave", KIcon::Desktop) );
setIcon( TDEGlobal::iconLoader()->loadIcon("filesave", KIcon::Desktop) );
}
//(js) filterWidget->setEditable( !d->hasDefaultFilter || mode != Saving );
//(js) d->okButton->setGuiItem( (mode == Saving) ? KStdGuiItem::save() : KStdGuiItem::ok() );


+ 7
- 7
kexi/main/startup/KexiStartup_p.cpp View File

@@ -62,13 +62,13 @@ tristate SQLite2ToSQLite3Migration::run()
//remember permissions of m_filePath
m_restoreStat = (0==stat(TQFile::encodeName(m_filePath), &m_st));

m_process = new KProcess(this, "process");
m_process = new TDEProcess(this, "process");
*m_process << ksqlite2to3_app << m_filePath;
m_process->setWorkingDirectory( fi.dir(true).absPath() );
connect( m_process, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)),
this, TQT_SLOT(receivedStderr(KProcess*,char*,int)));
connect( m_process, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(processExited(KProcess*)) );
if (!m_process->start(KProcess::NotifyOnExit, KProcess::Stderr))
connect( m_process, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),
this, TQT_SLOT(receivedStderr(TDEProcess*,char*,int)));
connect( m_process, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(processExited(TDEProcess*)) );
if (!m_process->start(TDEProcess::NotifyOnExit, TDEProcess::Stderr))
return false;

m_dlg = new KProgressDialog(0, 0, TQString(),
@@ -91,12 +91,12 @@ tristate SQLite2ToSQLite3Migration::run()

extern void updateProgressBar(KProgressDialog *pd, char *buffer, int buflen);

void SQLite2ToSQLite3Migration::receivedStderr(KProcess *, char *buffer, int buflen)
void SQLite2ToSQLite3Migration::receivedStderr(TDEProcess *, char *buffer, int buflen)
{
updateProgressBar(m_dlg, buffer, buflen);
}

void SQLite2ToSQLite3Migration::processExited(KProcess* process)
void SQLite2ToSQLite3Migration::processExited(TDEProcess* process)
{
kdDebug() << "EXIT " << process->name() << endl;



+ 4
- 4
kexi/main/startup/KexiStartup_p.h View File

@@ -27,7 +27,7 @@

#include <kexiutils/tristate.h>

class KProcess;
class TDEProcess;
class KProgressDialog;

class SQLite2ToSQLite3Migration : public TQObject
@@ -41,13 +41,13 @@ class SQLite2ToSQLite3Migration : public TQObject
tristate run();

public slots:
void processExited(KProcess*);
void receivedStderr(KProcess*,char*,int);
void processExited(TDEProcess*);
void receivedStderr(TDEProcess*,char*,int);
void cancelClicked();

protected:
TQString m_filePath;
KProcess *m_process;
TDEProcess *m_process;