diff options
Diffstat (limited to 'filters')
30 files changed, 64 insertions, 64 deletions
diff --git a/filters/chalk/raw/kis_raw_import.cpp b/filters/chalk/raw/kis_raw_import.cpp index 4ec8f028..8bc6692d 100644 --- a/filters/chalk/raw/kis_raw_import.cpp +++ b/filters/chalk/raw/kis_raw_import.cpp @@ -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); diff --git a/filters/chalk/raw/kis_raw_import.h b/filters/chalk/raw/kis_raw_import.h index db1780b4..e0a1be39 100644 --- a/filters/chalk/raw/kis_raw_import.h +++ b/filters/chalk/raw/kis_raw_import.h @@ -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 }; diff --git a/filters/generic_wrapper/generic_filter.cc b/filters/generic_wrapper/generic_filter.cc index c36715e2..d380ba09 100644 --- a/filters/generic_wrapper/generic_filter.cc +++ b/filters/generic_wrapper/generic_filter.cc @@ -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; diff --git a/filters/karbon/ai/aiimport.cc b/filters/karbon/ai/aiimport.cc index 4e854995..d306e29b 100644 --- a/filters/karbon/ai/aiimport.cc +++ b/filters/karbon/ai/aiimport.cc @@ -41,7 +41,7 @@ public: protected: virtual void setupTranslations( void ) { - KGlobal::locale()->insertCatalogue( "kofficefilters" ); + TDEGlobal::locale()->insertCatalogue( "kofficefilters" ); } }; diff --git a/filters/karbon/eps/epsexport.cc b/filters/karbon/eps/epsexport.cc index 8696e6a3..023074da 100644 --- a/filters/karbon/eps/epsexport.cc +++ b/filters/karbon/eps/epsexport.cc @@ -74,7 +74,7 @@ public: protected: virtual void setupTranslations( void ) { - KGlobal::locale()->insertCatalogue( "kofficefilters" ); + TDEGlobal::locale()->insertCatalogue( "kofficefilters" ); } }; diff --git a/filters/karbon/eps/epsimport.cc b/filters/karbon/eps/epsimport.cc index 19742a4d..72bb1334 100644 --- a/filters/karbon/eps/epsimport.cc +++ b/filters/karbon/eps/epsimport.cc @@ -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()); diff --git a/filters/kivio/imageexport/kivio_imageexport.cpp b/filters/kivio/imageexport/kivio_imageexport.cpp index 2339dbf0..93e37f6e 100644 --- a/filters/kivio/imageexport/kivio_imageexport.cpp +++ b/filters/kivio/imageexport/kivio_imageexport.cpp @@ -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) diff --git a/filters/kspread/csv/csvdialog.cpp b/filters/kspread/csv/csvdialog.cpp index 75ddc2a5..94470818 100644 --- a/filters/kspread/csv/csvdialog.cpp +++ b/filters/kspread/csv/csvdialog.cpp @@ -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? diff --git a/filters/kspread/csv/csvexportdialog.cpp b/filters/kspread/csv/csvexportdialog.cpp index 285565e7..372e2dda 100644 --- a/filters/kspread/csv/csvexportdialog.cpp +++ b/filters/kspread/csv/csvexportdialog.cpp @@ -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? diff --git a/filters/kspread/gnumeric/gnumericexport.cc b/filters/kspread/gnumeric/gnumericexport.cc index 22cc7407..05a57be6 100644 --- a/filters/kspread/gnumeric/gnumericexport.cc +++ b/filters/kspread/gnumeric/gnumericexport.cc @@ -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"); diff --git a/filters/kspread/gnumeric/gnumericimport.cc b/filters/kspread/gnumeric/gnumericimport.cc index 01346a5b..665a6161 100644 --- a/filters/kspread/gnumeric/gnumericimport.cc +++ b/filters/kspread/gnumeric/gnumericimport.cc @@ -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") { diff --git a/filters/kspread/html/exportdialog.cc b/filters/kspread/html/exportdialog.cc index 8a0df7d0..1bec3b5f 100644 --- a/filters/kspread/html/exportdialog.cc +++ b/filters/kspread/html/exportdialog.cc @@ -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 } diff --git a/filters/kspread/opencalc/opencalcexport.cc b/filters/kspread/opencalc/opencalcexport.cc index ce1a55ad..04e25541 100644 --- a/filters/kspread/opencalc/opencalcexport.cc +++ b/filters/kspread/opencalc/opencalcexport.cc @@ -65,7 +65,7 @@ public: protected: virtual void setupTranslations( void ) { - KGlobal::locale()->insertCatalogue( "kofficefilters" ); + TDEGlobal::locale()->insertCatalogue( "kofficefilters" ); } }; diff --git a/filters/kspread/opencalc/opencalcimport.cc b/filters/kspread/opencalc/opencalcimport.cc index 60412181..08ccaca7 100644 --- a/filters/kspread/opencalc/opencalcimport.cc +++ b/filters/kspread/opencalc/opencalcimport.cc @@ -65,7 +65,7 @@ public: protected: virtual void setupTranslations( void ) { - KGlobal::locale()->insertCatalogue( "kofficefilters" ); + TDEGlobal::locale()->insertCatalogue( "kofficefilters" ); } }; diff --git a/filters/kword/abiword/ImportStyle.cc b/filters/kword/abiword/ImportStyle.cc index 5a08cf0d..ac432855 100644 --- a/filters/kword/abiword/ImportStyle.cc +++ b/filters/kword/abiword/ImportStyle.cc @@ -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; diff --git a/filters/kword/abiword/abiwordexport.cc b/filters/kword/abiword/abiwordexport.cc index cacfcea7..11f5d2dd 100644 --- a/filters/kword/abiword/abiwordexport.cc +++ b/filters/kword/abiword/abiwordexport.cc @@ -61,7 +61,7 @@ public: protected: virtual void setupTranslations( void ) { - KGlobal::locale()->insertCatalogue( "kofficefilters" ); + TDEGlobal::locale()->insertCatalogue( "kofficefilters" ); } }; diff --git a/filters/kword/abiword/abiwordimport.cc b/filters/kword/abiword/abiwordimport.cc index 2c7e4d3f..aec3373f 100644 --- a/filters/kword/abiword/abiwordimport.cc +++ b/filters/kword/abiword/abiwordimport.cc @@ -55,7 +55,7 @@ public: protected: virtual void setupTranslations( void ) { - KGlobal::locale()->insertCatalogue( "kofficefilters" ); + TDEGlobal::locale()->insertCatalogue( "kofficefilters" ); } }; diff --git a/filters/kword/ascii/ExportDialog.cc b/filters/kword/ascii/ExportDialog.cc index d5e581e3..e77f58c7 100644 --- a/filters/kword/ascii/ExportDialog.cc +++ b/filters/kword/ascii/ExportDialog.cc @@ -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? diff --git a/filters/kword/ascii/ImportDialog.cc b/filters/kword/ascii/ImportDialog.cc index 318dae0b..6f813b10 100644 --- a/filters/kword/ascii/ImportDialog.cc +++ b/filters/kword/ascii/ImportDialog.cc @@ -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? diff --git a/filters/kword/ascii/asciiexport.cc b/filters/kword/ascii/asciiexport.cc index f31818f9..1bea9a26 100644 --- a/filters/kword/ascii/asciiexport.cc +++ b/filters/kword/ascii/asciiexport.cc @@ -56,7 +56,7 @@ public: protected: virtual void setupTranslations(void) { - KGlobal::locale()->insertCatalogue("kofficefilters"); + TDEGlobal::locale()->insertCatalogue("kofficefilters"); } }; diff --git a/filters/kword/ascii/asciiimport.cc b/filters/kword/ascii/asciiimport.cc index 450c938f..c3d17203 100644 --- a/filters/kword/ascii/asciiimport.cc +++ b/filters/kword/ascii/asciiimport.cc @@ -56,7 +56,7 @@ public: protected: virtual void setupTranslations( void ) { - KGlobal::locale()->insertCatalogue( "kofficefilters" ); + TDEGlobal::locale()->insertCatalogue( "kofficefilters" ); } }; diff --git a/filters/kword/html/export/ExportDialog.cc b/filters/kword/html/export/ExportDialog.cc index ff81c956..70243ca5 100644 --- a/filters/kword/html/export/ExportDialog.cc +++ b/filters/kword/html/export/ExportDialog.cc @@ -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? diff --git a/filters/kword/mswrite/ImportDialog.cc b/filters/kword/mswrite/ImportDialog.cc index 460677cb..d26087fe 100644 --- a/filters/kword/mswrite/ImportDialog.cc +++ b/filters/kword/mswrite/ImportDialog.cc @@ -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); } } diff --git a/filters/kword/mswrite/mswriteexport.cc b/filters/kword/mswrite/mswriteexport.cc index a65cd330..abf007f8 100644 --- a/filters/kword/mswrite/mswriteexport.cc +++ b/filters/kword/mswrite/mswriteexport.cc @@ -55,7 +55,7 @@ public: protected: virtual void setupTranslations (void) { - KGlobal::locale()->insertCatalogue ("kofficefilters"); + TDEGlobal::locale()->insertCatalogue ("kofficefilters"); } }; diff --git a/filters/kword/mswrite/mswriteimport.cc b/filters/kword/mswrite/mswriteimport.cc index c28c9d62..7fd3b63e 100644 --- a/filters/kword/mswrite/mswriteimport.cc +++ b/filters/kword/mswrite/mswriteimport.cc @@ -53,7 +53,7 @@ public: protected: virtual void setupTranslations (void) { - KGlobal::locale()->insertCatalogue ("kofficefilters"); + TDEGlobal::locale()->insertCatalogue ("kofficefilters"); } }; diff --git a/filters/kword/pdf/pdfimport.cpp b/filters/kword/pdf/pdfimport.cpp index dfc56703..62c4d2a8 100644 --- a/filters/kword/pdf/pdfimport.cpp +++ b/filters/kword/pdf/pdfimport.cpp @@ -45,7 +45,7 @@ class PdfImportFactory : KGenericFactory<PdfImport, KoFilter> protected: virtual void setupTranslations() { - KGlobal::locale()->insertCatalogue("kofficefilters"); + TDEGlobal::locale()->insertCatalogue("kofficefilters"); } }; diff --git a/filters/kword/rtf/export/ExportFilter.cc b/filters/kword/rtf/export/ExportFilter.cc index f4f8d894..14f0f2a0 100644 --- a/filters/kword/rtf/export/ExportFilter.cc +++ b/filters/kword/rtf/export/ExportFilter.cc @@ -585,23 +585,23 @@ TQString RTFWorker::ProcessParagraphData ( const TQString ¶Text, 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; diff --git a/filters/olefilters/olefilter.cc b/filters/olefilters/olefilter.cc index 0f052e13..99879f28 100644 --- a/filters/olefilters/olefilter.cc +++ b/filters/olefilters/olefilter.cc @@ -49,7 +49,7 @@ public: protected: virtual void setupTranslations( void ) { - KGlobal::locale()->insertCatalogue( "kofficefilters" ); + TDEGlobal::locale()->insertCatalogue( "kofficefilters" ); } }; diff --git a/filters/xsltfilter/export/xsltexportdia.cc b/filters/xsltfilter/export/xsltexportdia.cc index aade6891..75c28795 100644 --- a/filters/xsltfilter/export/xsltexportdia.cc +++ b/filters/xsltfilter/export/xsltexportdia.cc @@ -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; diff --git a/filters/xsltfilter/import/xsltimportdia.cc b/filters/xsltfilter/import/xsltimportdia.cc index c3fb4b97..29b0ad7b 100644 --- a/filters/xsltfilter/import/xsltimportdia.cc +++ b/filters/xsltfilter/import/xsltimportdia.cc @@ -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; |