diff options
Diffstat (limited to 'kexi/plugins')
6 files changed, 10 insertions, 10 deletions
diff --git a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp index 3f1cb6a3..eb1f1897 100644 --- a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp +++ b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp @@ -192,7 +192,7 @@ KexiCSVImportDialog::KexiCSVImportDialog( Mode mode, KexiMainWindow* mainWin, setIcon(DesktopIcon(_IMPORT_ICON)); setSizeGripEnabled( TRUE ); -// m_encoding = TQString::fromLatin1(KGlobal::locale()->encoding()); +// m_encoding = TQString::fromLatin1(TDEGlobal::locale()->encoding()); // m_stripWhiteSpaceInTextValuesChecked = true; m_file = 0; m_inputStream = 0; @@ -308,7 +308,7 @@ if ( m_mode == Clipboard ) TQStringList mimetypes( csvMimeTypes() ); #ifdef TQ_WS_WIN //! @todo remove - TQString recentDir = KGlobalSettings::documentPath(); + TQString recentDir = TDEGlobalSettings::documentPath(); m_fname = TQFileDialog::getOpenFileName( KFileDialog::getStartURL(":CSVImportExport", recentDir).path(), KexiUtils::fileDialogFilterStrings(mimetypes, false), @@ -667,7 +667,7 @@ tristate KexiCSVImportDialog::loadRows(TQString &field, int &row, int &column, i m_file->at(0); //always seek at 0 because loadRows() is called many times m_inputStream = new TQTextStream(m_file); if (m_options.defaultEncodingExplicitySet) { - TQTextCodec *codec = KGlobal::charsets()->codecForName(m_options.encoding); + TQTextCodec *codec = TDEGlobal::charsets()->codecForName(m_options.encoding); if (codec) m_inputStream->setCodec(codec); //TQTextCodec::codecForName("CP1250")); } diff --git a/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp b/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp index 49b72323..21c8891f 100644 --- a/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp +++ b/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp @@ -37,7 +37,7 @@ KexiCSVImportOptions::KexiCSVImportOptions() kapp->config()->setGroup("ImportExport"); encoding = kapp->config()->readEntry("DefaultEncodingForImportingCSVFiles"); if (encoding.isEmpty()) { - encoding = TQString::fromLatin1(KGlobal::locale()->encoding()); + encoding = TQString::fromLatin1(TDEGlobal::locale()->encoding()); defaultEncodingExplicitySet = false; } else diff --git a/kexi/plugins/macros/kexipart/keximacroerror.cpp b/kexi/plugins/macros/kexipart/keximacroerror.cpp index 25ec569f..1b23fa50 100644 --- a/kexi/plugins/macros/kexipart/keximacroerror.cpp +++ b/kexi/plugins/macros/kexipart/keximacroerror.cpp @@ -52,7 +52,7 @@ KexiMacroError::KexiMacroError(KexiMainWindow* mainwin, KSharedPtr<KoMacro::Cont KoMacro::Exception* exception = context->exception(); - iconlbl->setPixmap(KGlobal::instance()->iconLoader()->loadIcon("messagebox_critical", KIcon::Small, 32)); + iconlbl->setPixmap(TDEGlobal::instance()->iconLoader()->loadIcon("messagebox_critical", KIcon::Small, 32)); errorlbl->setText(i18n("<qt>Failed to execute the macro \"%1\".<br>%2</qt>").arg( context->macro()->name() ).arg( exception->errorMessage() )); int i = 1; diff --git a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp index b08daaf0..9a6f3205 100644 --- a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp +++ b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp @@ -1372,7 +1372,7 @@ KexiQueryDesignerGuiEditor::parseExpressionString(const TQString& fullString, in } else if (str[0]>='0' && str[0]<='9' || str[0]=='-' || str[0]=='+') { //number - TQString decimalSym = KGlobal::locale()->decimalSymbol(); + TQString decimalSym = TDEGlobal::locale()->decimalSymbol(); bool ok; int pos = str.find('.'); if (pos==-1) {//second chance: local decimal symbol diff --git a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp index 4fea781e..81bb22bc 100644 --- a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp +++ b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp @@ -335,12 +335,12 @@ HistoryEntry::highlight(const TQColorGroup &cg) if(!m_error.isEmpty()) // text += ("<br>"+i18n("Error: %1").arg(m_error)); -// text += TQString("<br><font face=\"") + KGlobalSettings::generalFont().family() + TQString("\" size=\"-1\">") + i18n("Error: %1").arg(m_error) + "</font>"; - text += TQString("<br><font face=\"") + KGlobalSettings::generalFont().family() + TQString("\">") + i18n("Error: %1").arg(m_error) + "</font>"; +// text += TQString("<br><font face=\"") + TDEGlobalSettings::generalFont().family() + TQString("\" size=\"-1\">") + i18n("Error: %1").arg(m_error) + "</font>"; + text += TQString("<br><font face=\"") + TDEGlobalSettings::generalFont().family() + TQString("\">") + i18n("Error: %1").arg(m_error) + "</font>"; kdDebug() << "HistoryEntry::highlight() text:" << text << endl; // m_formated = new TQSimpleRichText(text, TQFont("courier", 8)); - m_formated = new TQSimpleRichText(text, KGlobalSettings::fixedFont()); + m_formated = new TQSimpleRichText(text, TDEGlobalSettings::fixedFont()); } diff --git a/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp b/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp index 84fbe4ec..bd6454de 100644 --- a/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp +++ b/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp @@ -89,7 +89,7 @@ bool KexiScriptPart::execute(KexiPart::Item* item, TQObject* sender) if(scriptaction) { const TQString dontAskAgainName = "askExecuteScript"; - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); TQString dontask = config->readEntry(dontAskAgainName).lower(); bool exec = (dontask == "yes"); |