summaryrefslogtreecommitdiffstats
path: root/kexi
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:23:24 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:23:24 -0600
commit5b8ab149469c8e186ee8b05d90c0103ae722dd85 (patch)
treefb31321c80b12ee8e2237bdcf8c228fe44e67772 /kexi
parentfe33d391dd7c9da0f83e779344a17e2e445b70a8 (diff)
downloadkoffice-5b8ab149469c8e186ee8b05d90c0103ae722dd85.tar.gz
koffice-5b8ab149469c8e186ee8b05d90c0103ae722dd85.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kexi')
-rw-r--r--kexi/3rdparty/kolibs/koGlobal.cc10
-rw-r--r--kexi/3rdparty/kolibs/koGlobal.h2
-rw-r--r--kexi/3rdparty/kolibs/koPageLayout.cpp2
-rw-r--r--kexi/3rdparty/kolibs/koUnit.cc4
-rw-r--r--kexi/3rdparty/kolibs/koUnitWidgets.cc6
-rw-r--r--kexi/core/kexi.cpp2
-rw-r--r--kexi/core/kexidbconnectionset.cpp8
-rw-r--r--kexi/core/kexidbshortcutfile.cpp6
-rw-r--r--kexi/core/kexidbshortcutfile.h2
-rw-r--r--kexi/core/kexitemplateloader.cpp2
-rw-r--r--kexi/doc/dev/TODO-Kexi-js2
-rw-r--r--kexi/formeditor/formmanager.cpp8
-rw-r--r--kexi/formeditor/test/main.cpp2
-rw-r--r--kexi/kexidb/drivermanager.cpp4
-rw-r--r--kexi/kexidb/utils.cpp4
-rw-r--r--kexi/main/keximainwindowimpl.cpp24
-rw-r--r--kexi/main/kexinewstuff.cpp2
-rw-r--r--kexi/main/printing/kexisimpleprintingengine.cpp10
-rw-r--r--kexi/main/printing/kexisimpleprintingpagesetup.cpp2
-rw-r--r--kexi/main/startup/KexiConnSelector.cpp2
-rw-r--r--kexi/main/startup/KexiNewProjectWizard.cpp12
-rw-r--r--kexi/main/startup/KexiProjectSelector.cpp2
-rw-r--r--kexi/main/startup/KexiStartupDialog.cpp18
-rw-r--r--kexi/main/startup/KexiStartupFileDialog_win.cpp12
-rw-r--r--kexi/main/startup/KexiStartup_p.cpp14
-rw-r--r--kexi/main/startup/KexiStartup_p.h8
-rw-r--r--kexi/migration/importwizard.cpp2
-rw-r--r--kexi/migration/migratemanager.cpp4
-rw-r--r--kexi/plugins/importexport/csv/kexicsvimportdialog.cpp6
-rw-r--r--kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp2
-rw-r--r--kexi/plugins/macros/kexipart/keximacroerror.cpp2
-rw-r--r--kexi/plugins/queries/kexiquerydesignerguieditor.cpp2
-rw-r--r--kexi/plugins/queries/kexiquerydesignersqlhistory.cpp6
-rw-r--r--kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp2
-rw-r--r--kexi/tests/newapi/main.cpp2
-rw-r--r--kexi/tests/tableview/main.cpp2
-rw-r--r--kexi/widget/kexibrowser.cpp2
-rw-r--r--kexi/widget/kexicharencodingcombobox.cpp14
-rw-r--r--kexi/widget/kexidatasourcecombobox.cpp2
-rw-r--r--kexi/widget/kexidswelcome.cpp2
-rw-r--r--kexi/widget/kexifieldcombobox.cpp2
-rw-r--r--kexi/widget/kexiprjtypeselector.cpp2
-rw-r--r--kexi/widget/kexismalltoolbutton.cpp2
-rw-r--r--kexi/widget/relations/kexirelationview.cpp2
-rw-r--r--kexi/widget/relations/kexirelationviewtable.cpp16
-rw-r--r--kexi/widget/tableview/kexiblobtableedit.cpp2
-rw-r--r--kexi/widget/tableview/kexiblobtableedit.h4
-rw-r--r--kexi/widget/tableview/kexiinputtableedit.cpp2
-rw-r--r--kexi/widget/tableview/kexitableview.cpp6
-rw-r--r--kexi/widget/tableview/kexitableview.h2
-rw-r--r--kexi/widget/tableview/kexitextformatter.cpp2
-rw-r--r--kexi/widget/utils/kexidatetimeformatter.cpp6
52 files changed, 134 insertions, 134 deletions
diff --git a/kexi/3rdparty/kolibs/koGlobal.cc b/kexi/3rdparty/kolibs/koGlobal.cc
index a88e3bcd..1bdab489 100644
--- a/kexi/3rdparty/kolibs/koGlobal.cc
+++ b/kexi/3rdparty/kolibs/koGlobal.cc
@@ -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 )
diff --git a/kexi/3rdparty/kolibs/koGlobal.h b/kexi/3rdparty/kolibs/koGlobal.h
index 367a150b..cad645b4 100644
--- a/kexi/3rdparty/kolibs/koGlobal.h
+++ b/kexi/3rdparty/kolibs/koGlobal.h
@@ -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.
diff --git a/kexi/3rdparty/kolibs/koPageLayout.cpp b/kexi/3rdparty/kolibs/koPageLayout.cpp
index 316eba19..b4640a30 100644
--- a/kexi/3rdparty/kolibs/koPageLayout.cpp
+++ b/kexi/3rdparty/kolibs/koPageLayout.cpp
@@ -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 )
diff --git a/kexi/3rdparty/kolibs/koUnit.cc b/kexi/3rdparty/kolibs/koUnit.cc
index e8dd16ff..38c8b111 100644
--- a/kexi/3rdparty/kolibs/koUnit.cc
+++ b/kexi/3rdparty/kolibs/koUnit.cc
@@ -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 )
diff --git a/kexi/3rdparty/kolibs/koUnitWidgets.cc b/kexi/3rdparty/kolibs/koUnitWidgets.cc
index 73a55822..13ddf55b 100644
--- a/kexi/3rdparty/kolibs/koUnitWidgets.cc
+++ b/kexi/3rdparty/kolibs/koUnitWidgets.cc
@@ -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
diff --git a/kexi/core/kexi.cpp b/kexi/core/kexi.cpp
index dbaddb11..f352b51b 100644
--- a/kexi/core/kexi.cpp
+++ b/kexi/core/kexi.cpp
@@ -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 );
diff --git a/kexi/core/kexidbconnectionset.cpp b/kexi/core/kexidbconnectionset.cpp
index 492e779d..69828d07 100644
--- a/kexi/core/kexidbconnectionset.cpp
+++ b/kexi/core/kexidbconnectionset.cpp
@@ -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) {
diff --git a/kexi/core/kexidbshortcutfile.cpp b/kexi/core/kexidbshortcutfile.cpp
index 01f0adb3..1969caf5 100644
--- a/kexi/core/kexidbshortcutfile.cpp
+++ b/kexi/core/kexidbshortcutfile.cpp
@@ -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) {
diff --git a/kexi/core/kexidbshortcutfile.h b/kexi/core/kexidbshortcutfile.h
index 382f470f..5b06cc27 100644
--- a/kexi/core/kexidbshortcutfile.h
+++ b/kexi/core/kexidbshortcutfile.h
@@ -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:
diff --git a/kexi/core/kexitemplateloader.cpp b/kexi/core/kexitemplateloader.cpp
index f6564d65..0defda8c 100644
--- a/kexi/core/kexitemplateloader.cpp
+++ b/kexi/core/kexitemplateloader.cpp
@@ -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) {
diff --git a/kexi/doc/dev/TODO-Kexi-js b/kexi/doc/dev/TODO-Kexi-js
index 45378782..f66e4e08 100644
--- a/kexi/doc/dev/TODO-Kexi-js
+++ b/kexi/doc/dev/TODO-Kexi-js
@@ -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,
diff --git a/kexi/formeditor/formmanager.cpp b/kexi/formeditor/formmanager.cpp
index 412d3665..501d2769 100644
--- a/kexi/formeditor/formmanager.cpp
+++ b/kexi/formeditor/formmanager.cpp
@@ -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();
}
}
diff --git a/kexi/formeditor/test/main.cpp b/kexi/formeditor/test/main.cpp
index dcda9cc9..d0142ec6 100644
--- a/kexi/formeditor/test/main.cpp
+++ b/kexi/formeditor/test/main.cpp
@@ -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
diff --git a/kexi/kexidb/drivermanager.cpp b/kexi/kexidb/drivermanager.cpp
index b5713297..512bf8ad 100644
--- a/kexi/kexidb/drivermanager.cpp
+++ b/kexi/kexidb/drivermanager.cpp
@@ -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();
diff --git a/kexi/kexidb/utils.cpp b/kexi/kexidb/utils.cpp
index 594773af..d6652f6d 100644
--- a/kexi/kexidb/utils.cpp
+++ b/kexi/kexidb/utils.cpp
@@ -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 )
diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp
index d5d77cd9..f924bc60 100644
--- a/kexi/main/keximainwindowimpl.cpp
+++ b/kexi/main/keximainwindowimpl.cpp
@@ -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()) );
diff --git a/kexi/main/kexinewstuff.cpp b/kexi/main/kexinewstuff.cpp
index 1218df23..99ec8a31 100644
--- a/kexi/main/kexinewstuff.cpp
+++ b/kexi/main/kexinewstuff.cpp
@@ -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()
diff --git a/kexi/main/printing/kexisimpleprintingengine.cpp b/kexi/main/printing/kexisimpleprintingengine.cpp
index 3e6f8a97..b8ad5ebd 100644
--- a/kexi/main/printing/kexisimpleprintingengine.cpp
+++ b/kexi/main/printing/kexisimpleprintingengine.cpp
@@ -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");
diff --git a/kexi/main/printing/kexisimpleprintingpagesetup.cpp b/kexi/main/printing/kexisimpleprintingpagesetup.cpp
index c536f676..158c3ffc 100644
--- a/kexi/main/printing/kexisimpleprintingpagesetup.cpp
+++ b/kexi/main/printing/kexisimpleprintingpagesetup.cpp
@@ -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);
diff --git a/kexi/main/startup/KexiConnSelector.cpp b/kexi/main/startup/KexiConnSelector.cpp
index 6e104659..abbfac21 100644
--- a/kexi/main/startup/KexiConnSelector.cpp
+++ b/kexi/main/startup/KexiConnSelector.cpp
@@ -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 );
diff --git a/kexi/main/startup/KexiNewProjectWizard.cpp b/kexi/main/startup/KexiNewProjectWizard.cpp
index c8d36aab..414fcfcd 100644
--- a/kexi/main/startup/KexiNewProjectWizard.cpp
+++ b/kexi/main/startup/KexiNewProjectWizard.cpp
@@ -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);
}
diff --git a/kexi/main/startup/KexiProjectSelector.cpp b/kexi/main/startup/KexiProjectSelector.cpp
index 878e0273..eeb46da6 100644
--- a/kexi/main/startup/KexiProjectSelector.cpp
+++ b/kexi/main/startup/KexiProjectSelector.cpp
@@ -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 );
diff --git a/kexi/main/startup/KexiStartupDialog.cpp b/kexi/main/startup/KexiStartupDialog.cpp
index 688bc7d9..f6ded39a 100644
--- a/kexi/main/startup/KexiStartupDialog.cpp
+++ b/kexi/main/startup/KexiStartupDialog.cpp
@@ -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();
diff --git a/kexi/main/startup/KexiStartupFileDialog_win.cpp b/kexi/main/startup/KexiStartupFileDialog_win.cpp
index 5550cf9f..dfeaedd3 100644
--- a/kexi/main/startup/KexiStartupFileDialog_win.cpp
+++ b/kexi/main/startup/KexiStartupFileDialog_win.cpp
@@ -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() );
diff --git a/kexi/main/startup/KexiStartup_p.cpp b/kexi/main/startup/KexiStartup_p.cpp
index e959ccdc..287bd846 100644
--- a/kexi/main/startup/KexiStartup_p.cpp
+++ b/kexi/main/startup/KexiStartup_p.cpp
@@ -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;
diff --git a/kexi/main/startup/KexiStartup_p.h b/kexi/main/startup/KexiStartup_p.h
index dce0fb3a..246922be 100644
--- a/kexi/main/startup/KexiStartup_p.h
+++ b/kexi/main/startup/KexiStartup_p.h
@@ -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;
KProgressDialog* m_dlg;
struct stat m_st;
diff --git a/kexi/migration/importwizard.cpp b/kexi/migration/importwizard.cpp
index 6fdc5966..a62f90aa 100644
--- a/kexi/migration/importwizard.cpp
+++ b/kexi/migration/importwizard.cpp
@@ -110,7 +110,7 @@ ImportWizard::ImportWizard(TQWidget *parent, TQMap<TQString,TQString>* args)
}
}
- m_sourceDBEncoding = TQString::fromLatin1(KGlobal::locale()->encoding()); //default
+ m_sourceDBEncoding = TQString::fromLatin1(TDEGlobal::locale()->encoding()); //default
}
//===========================================================
diff --git a/kexi/migration/migratemanager.cpp b/kexi/migration/migratemanager.cpp
index 6d0bbc78..0cd52b4b 100644
--- a/kexi/migration/migratemanager.cpp
+++ b/kexi/migration/migratemanager.cpp
@@ -95,8 +95,8 @@ bool MigrateManagerInternal::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();
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");
diff --git a/kexi/tests/newapi/main.cpp b/kexi/tests/newapi/main.cpp
index 95e2c0b3..fce63501 100644
--- a/kexi/tests/newapi/main.cpp
+++ b/kexi/tests/newapi/main.cpp
@@ -159,7 +159,7 @@ int main(int argc, char** argv)
if (gui) {
app = new TDEApplication(true, true);
instance = app;
- KGlobal::iconLoader()->addAppDir("kexi");
+ TDEGlobal::iconLoader()->addAppDir("kexi");
}
else {
instance = new TDEInstance(prgname);
diff --git a/kexi/tests/tableview/main.cpp b/kexi/tests/tableview/main.cpp
index 88121b57..9e9b87c5 100644
--- a/kexi/tests/tableview/main.cpp
+++ b/kexi/tests/tableview/main.cpp
@@ -32,7 +32,7 @@
int main(int argc, char* argv[])
{
TDEApplication app(argc, argv, "tv_test");
- KGlobal::iconLoader()->addAppDir("kexi");
+ TDEGlobal::iconLoader()->addAppDir("kexi");
KexiTableView tv;
diff --git a/kexi/widget/kexibrowser.cpp b/kexi/widget/kexibrowser.cpp
index af893ddf..c81b967f 100644
--- a/kexi/widget/kexibrowser.cpp
+++ b/kexi/widget/kexibrowser.cpp
@@ -733,7 +733,7 @@ void KexiBrowser::updateItemName( KexiPart::Item& item, bool dirty )
void KexiBrowser::slotSettingsChanged(int)
{
- m_singleClick = KGlobalSettings::singleClick();
+ m_singleClick = TDEGlobalSettings::singleClick();
}
void KexiBrowser::selectItem(KexiPart::Item& item)
diff --git a/kexi/widget/kexicharencodingcombobox.cpp b/kexi/widget/kexicharencodingcombobox.cpp
index 84038dcd..ad368e69 100644
--- a/kexi/widget/kexicharencodingcombobox.cpp
+++ b/kexi/widget/kexicharencodingcombobox.cpp
@@ -31,21 +31,21 @@ KexiCharacterEncodingComboBox::KexiCharacterEncodingComboBox(
: KComboBox( parent, "KexiCharacterEncodingComboBox" )
, m_defaultEncodingAdded(false)
{
- TQString defaultEncoding(TQString::fromLatin1(KGlobal::locale()->encoding()));
+ TQString defaultEncoding(TQString::fromLatin1(TDEGlobal::locale()->encoding()));
TQString defaultEncodingDescriptiveName;
TQString _selectedEncoding = selectedEncoding;
if (_selectedEncoding.isEmpty())
- _selectedEncoding = TQString::fromLatin1(KGlobal::locale()->encoding());
+ _selectedEncoding = TQString::fromLatin1(TDEGlobal::locale()->encoding());
- TQStringList descEncodings(KGlobal::charsets()->descriptiveEncodingNames());
+ TQStringList descEncodings(TDEGlobal::charsets()->descriptiveEncodingNames());
TQStringList::ConstIterator it = descEncodings.constBegin();
for (uint id = 0; it!=descEncodings.constEnd(); ++it)
{
bool found = false;
- TQString name( KGlobal::charsets()->encodingForName( *it ) );
- TQTextCodec *codecForEnc = KGlobal::charsets()->codecForName(name, found);
+ TQString name( TDEGlobal::charsets()->encodingForName( *it ) );
+ TQTextCodec *codecForEnc = TDEGlobal::charsets()->codecForName(name, found);
if (found) {
insertItem(*it);
if (codecForEnc->name() == defaultEncoding || name == defaultEncoding) {
@@ -84,10 +84,10 @@ KexiCharacterEncodingComboBox::~KexiCharacterEncodingComboBox()
TQString KexiCharacterEncodingComboBox::selectedEncoding() const
{
if (defaultEncodingSelected()) {
- return TQString::fromLatin1(KGlobal::locale()->encoding());
+ return TQString::fromLatin1(TDEGlobal::locale()->encoding());
}
else {
- return KGlobal::charsets()->encodingForName( currentText() );
+ return TDEGlobal::charsets()->encodingForName( currentText() );
}
}
diff --git a/kexi/widget/kexidatasourcecombobox.cpp b/kexi/widget/kexidatasourcecombobox.cpp
index 5dab927b..725a560b 100644
--- a/kexi/widget/kexidatasourcecombobox.cpp
+++ b/kexi/widget/kexidatasourcecombobox.cpp
@@ -74,7 +74,7 @@ KexiDataSourceComboBox::KexiDataSourceComboBox(TQWidget *parent, const char *nam
, d(new Private())
{
setInsertionPolicy(NoInsertion);
- setCompletionMode(KGlobalSettings::CompletionPopupAuto);
+ setCompletionMode(TDEGlobalSettings::CompletionPopupAuto);
setSizeLimit( 16 );
connect(this, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotActivated(int)));
connect(this, TQT_SIGNAL(returnPressed(const TQString &)), this, TQT_SLOT(slotReturnPressed(const TQString &)));
diff --git a/kexi/widget/kexidswelcome.cpp b/kexi/widget/kexidswelcome.cpp
index cd4be1b2..e1184553 100644
--- a/kexi/widget/kexidswelcome.cpp
+++ b/kexi/widget/kexidswelcome.cpp
@@ -58,7 +58,7 @@ void
KexiDSWelcome::setUseWizard(bool use)
{
#if KDE_IS_VERSION(3,1,9) && !defined(TQ_WS_WIN)
- bool useIcons = KGlobalSettings::showIconsOnPushButtons();
+ bool useIcons = TDEGlobalSettings::showIconsOnPushButtons();
#else
bool useIcons = true;
#endif
diff --git a/kexi/widget/kexifieldcombobox.cpp b/kexi/widget/kexifieldcombobox.cpp
index d41d93a2..c490111e 100644
--- a/kexi/widget/kexifieldcombobox.cpp
+++ b/kexi/widget/kexifieldcombobox.cpp
@@ -75,7 +75,7 @@ KexiFieldComboBox::KexiFieldComboBox(TQWidget *parent, const char *name)
, d(new Private())
{
setInsertionPolicy(NoInsertion);
- setCompletionMode(KGlobalSettings::CompletionPopupAuto);
+ setCompletionMode(TDEGlobalSettings::CompletionPopupAuto);
setSizeLimit( 16 );
connect(this, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotActivated(int)));
connect(this, TQT_SIGNAL(returnPressed(const TQString &)), this, TQT_SLOT(slotReturnPressed(const TQString &)));
diff --git a/kexi/widget/kexiprjtypeselector.cpp b/kexi/widget/kexiprjtypeselector.cpp
index 2717e0e9..aea9b22f 100644
--- a/kexi/widget/kexiprjtypeselector.cpp
+++ b/kexi/widget/kexiprjtypeselector.cpp
@@ -28,7 +28,7 @@ KexiPrjTypeSelector::KexiPrjTypeSelector( TQWidget* parent )
{
TQString none;
icon_file->setPixmap(
- KGlobal::iconLoader()->loadIcon( KMimeType::mimeType(
+ TDEGlobal::iconLoader()->loadIcon( KMimeType::mimeType(
KexiDB::Driver::defaultFileBasedDriverMimeType() )->icon(none,0), KIcon::Desktop, 48
)
);
diff --git a/kexi/widget/kexismalltoolbutton.cpp b/kexi/widget/kexismalltoolbutton.cpp
index ab703923..82b6489e 100644
--- a/kexi/widget/kexismalltoolbutton.cpp
+++ b/kexi/widget/kexismalltoolbutton.cpp
@@ -72,7 +72,7 @@ void KexiSmallToolButton::init()
{
setPaletteBackgroundColor(palette().active().background());
setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred);
- TQFont f(KGlobalSettings::toolBarFont());
+ TQFont f(TDEGlobalSettings::toolBarFont());
f.setPixelSize(Kexi::smallFont().pixelSize());
setFont(f);
setAutoRaise(true);
diff --git a/kexi/widget/relations/kexirelationview.cpp b/kexi/widget/relations/kexirelationview.cpp
index 378d2580..a3ce7632 100644
--- a/kexi/widget/relations/kexirelationview.cpp
+++ b/kexi/widget/relations/kexirelationview.cpp
@@ -430,7 +430,7 @@ KexiRelationView::keyPressEvent(TQKeyEvent *ev)
{
kdDebug() << "KexiRelationView::keyPressEvent()" << endl;
- if (ev->key()==KGlobalSettings::contextMenuKey()) {
+ if (ev->key()==TDEGlobalSettings::contextMenuKey()) {
if (m_selectedConnection) {
emit connectionContextMenuRequest(
mapToGlobal(m_selectedConnection->connectionRect().center()) );
diff --git a/kexi/widget/relations/kexirelationviewtable.cpp b/kexi/widget/relations/kexirelationviewtable.cpp
index ce94a809..426edf71 100644
--- a/kexi/widget/relations/kexirelationviewtable.cpp
+++ b/kexi/widget/relations/kexirelationviewtable.cpp
@@ -135,8 +135,8 @@ void KexiRelationViewTableContainer::setFocus()
m_tableHeader->setFocus();
m_tableView->setFocus();
/* TQPalette p = tqApp->palette();
- p.setColor( TQPalette::Active, TQColorGroup::Highlight, KGlobalSettings::highlightColor() );
- p.setColor( TQPalette::Active, TQColorGroup::HighlightedText, KGlobalSettings::highlightedTextColor() );
+ p.setColor( TQPalette::Active, TQColorGroup::Highlight, TDEGlobalSettings::highlightColor() );
+ p.setColor( TQPalette::Active, TQColorGroup::HighlightedText, TDEGlobalSettings::highlightedTextColor() );
m_tableView->setPalette(p);*/
raise();
@@ -156,8 +156,8 @@ void KexiRelationViewTableContainer::unsetFocus()
// m_tableView->unsetPalette();
/* TQPalette p = m_tableView->palette();
-// p.setColor( TQPalette::Active, TQColorGroup::Highlight, KGlobalSettings::highlightColor() );
-// p.setColor( TQPalette::Active, TQColorGroup::HighlightedText, KGlobalSettings::highlightedTextColor() );
+// p.setColor( TQPalette::Active, TQColorGroup::Highlight, TDEGlobalSettings::highlightColor() );
+// p.setColor( TQPalette::Active, TQColorGroup::HighlightedText, TDEGlobalSettings::highlightedTextColor() );
p.setColor( TQPalette::Active, TQColorGroup::Highlight, p.color(TQPalette::Active, TQColorGroup::Background ) );
// p.setColor( TQPalette::Active, TQColorGroup::Highlight, gray );
p.setColor( TQPalette::Active, TQColorGroup::HighlightedText, p.color(TQPalette::Active, TQColorGroup::Foreground ) );
@@ -180,10 +180,10 @@ KexiRelationViewTableContainerHeader::KexiRelationViewTableContainerHeader(
:TQLabel(text,parent),m_dragging(false)
{
setMargin(1);
- m_activeBG = KGlobalSettings::activeTitleColor();
- m_activeFG = KGlobalSettings::activeTextColor();
- m_inactiveBG = KGlobalSettings::inactiveTitleColor();
- m_inactiveFG = KGlobalSettings::inactiveTextColor();
+ m_activeBG = TDEGlobalSettings::activeTitleColor();
+ m_activeFG = TDEGlobalSettings::activeTextColor();
+ m_inactiveBG = TDEGlobalSettings::inactiveTitleColor();
+ m_inactiveFG = TDEGlobalSettings::inactiveTextColor();
installEventFilter(this);
}
diff --git a/kexi/widget/tableview/kexiblobtableedit.cpp b/kexi/widget/tableview/kexiblobtableedit.cpp
index 1218a978..3502e15d 100644
--- a/kexi/widget/tableview/kexiblobtableedit.cpp
+++ b/kexi/widget/tableview/kexiblobtableedit.cpp
@@ -571,7 +571,7 @@ void KexiKIconTableEdit::setupContents( TQPainter *p, bool /*focused*/, const TQ
TQPixmap *pix = 0;
if (!key.isEmpty() && !(pix = d->pixmapCache[ key ])) {
//cache pixmap
- TQPixmap pm = KGlobal::iconLoader()->loadIcon( key, KIcon::Small,
+ TQPixmap pm = TDEGlobal::iconLoader()->loadIcon( key, KIcon::Small,
0, KIcon::DefaultState, 0L, true/*canReturnNull*/ );
if (!pm.isNull()) {
pix = new TQPixmap(pm);
diff --git a/kexi/widget/tableview/kexiblobtableedit.h b/kexi/widget/tableview/kexiblobtableedit.h
index a3b1c0f2..4d17b3b9 100644
--- a/kexi/widget/tableview/kexiblobtableedit.h
+++ b/kexi/widget/tableview/kexiblobtableedit.h
@@ -30,7 +30,7 @@
#include "kexicelleditorfactory.h"
class KTempFile;
-class KProcess;
+class TDEProcess;
class TQTextEdit;
class KexiBlobTableEdit : public KexiTableEdit
@@ -113,7 +113,7 @@ class KexiBlobTableEdit : public KexiTableEdit
class Private;
Private *d;
//todo KTempFile* m_tempFile;
-//todo KProcess* m_proc;
+//todo TDEProcess* m_proc;
//todo TQTextEdit *m_content;
};
diff --git a/kexi/widget/tableview/kexiinputtableedit.cpp b/kexi/widget/tableview/kexiinputtableedit.cpp
index 36b662f9..4f043117 100644
--- a/kexi/widget/tableview/kexiinputtableedit.cpp
+++ b/kexi/widget/tableview/kexiinputtableedit.cpp
@@ -83,7 +83,7 @@ void KexiInputTableEdit::init()
m_textFormatter.setField( field() );
//init settings
- m_decsym = KGlobal::locale()->decimalSymbol();
+ m_decsym = TDEGlobal::locale()->decimalSymbol();
if (m_decsym.isEmpty())
m_decsym=".";//default
diff --git a/kexi/widget/tableview/kexitableview.cpp b/kexi/widget/tableview/kexitableview.cpp
index fa474bfc..4303e551 100644
--- a/kexi/widget/tableview/kexitableview.cpp
+++ b/kexi/widget/tableview/kexitableview.cpp
@@ -60,7 +60,7 @@
#include <kexidb/cursor.h>
KexiTableView::Appearance::Appearance(TQWidget *widget)
- : alternateBackgroundColor( KGlobalSettings::alternateBackgroundColor() )
+ : alternateBackgroundColor( TDEGlobalSettings::alternateBackgroundColor() )
{
//set defaults
if (tqApp) {
@@ -207,7 +207,7 @@ KexiTableView::KexiTableView(KexiTableViewData* data, TQWidget* parent, const ch
// d->baseColor = colorGroup().base();
// d->textColor = colorGroup().text();
-// d->altColor = KGlobalSettings::alternateBackgroundColor();
+// d->altColor = TDEGlobalSettings::alternateBackgroundColor();
// d->grayColor = TQColor(200,200,200);
d->diagonalGrayPattern = TQBrush(d->appearance.borderColor, TQt::BDiagPattern);
@@ -2594,7 +2594,7 @@ KexiTableItem *KexiTableView::highlightedItem() const
void KexiTableView::slotSettingsChanged(int category)
{
if (category==TDEApplication::SETTINGS_SHORTCUTS) {
- d->contextMenuKey = KGlobalSettings::contextMenuKey();
+ d->contextMenuKey = TDEGlobalSettings::contextMenuKey();
}
}
diff --git a/kexi/widget/tableview/kexitableview.h b/kexi/widget/tableview/kexitableview.h
index f1692610..f4364eb8 100644
--- a/kexi/widget/tableview/kexitableview.h
+++ b/kexi/widget/tableview/kexitableview.h
@@ -94,7 +94,7 @@ public:
current active palette */
TQColor emptyAreaColor;
- /*! alternate background color, default is KGlobalSettings::alternateBackgroundColor() */
+ /*! alternate background color, default is TDEGlobalSettings::alternateBackgroundColor() */
TQColor alternateBackgroundColor;
/*! true if background altering should be enabled, true by default */
diff --git a/kexi/widget/tableview/kexitextformatter.cpp b/kexi/widget/tableview/kexitextformatter.cpp
index 6045620a..9829f347 100644
--- a/kexi/widget/tableview/kexitextformatter.cpp
+++ b/kexi/widget/tableview/kexitextformatter.cpp
@@ -168,7 +168,7 @@ TQVariant KexiTextFormatter::textToValue(const TQString& text) const
case KexiDB::Field::Double: {
// replace custom decimal symbol with '.' as required by to{Float|Double}()
TQString fixedText( text );
- fixedText.replace(KGlobal::locale()->decimalSymbol(), ".");
+ fixedText.replace(TDEGlobal::locale()->decimalSymbol(), ".");
if (t == KexiDB::Field::Double)
return fixedText.toDouble();
return fixedText.toFloat();
diff --git a/kexi/widget/utils/kexidatetimeformatter.cpp b/kexi/widget/utils/kexidatetimeformatter.cpp
index 298eda48..c6fe3460 100644
--- a/kexi/widget/utils/kexidatetimeformatter.cpp
+++ b/kexi/widget/utils/kexidatetimeformatter.cpp
@@ -32,7 +32,7 @@ KexiDateFormatter::KexiDateFormatter()
{
// use "short date" format system settings
//! @todo allow to override the format using column property and/or global app settings
- TQString df( KGlobal::locale()->dateFormatShort() );
+ TQString df( TDEGlobal::locale()->dateFormatShort() );
if (df.length()>2)
m_separator = df.mid(2,1);
else
@@ -171,7 +171,7 @@ KexiTimeFormatter::KexiTimeFormatter()
: m_hmsRegExp( new TQRegExp("(\\d*):(\\d*):(\\d*).*( am| pm){,1}", false/*!CS*/) )
, m_hmRegExp( new TQRegExp("(\\d*):(\\d*).*( am| pm){,1}", false/*!CS*/) )
{
- TQString tf( KGlobal::locale()->timeFormat() );
+ TQString tf( TDEGlobal::locale()->timeFormat() );
//m_hourpos, m_minpos, m_secpos; are result of tf.find()
TQString hourVariable, minVariable, secVariable;
@@ -309,7 +309,7 @@ TQString KexiTimeFormatter::timeToString( const TQTime& time ) const
if (m_secpos>=0)
s.replace( "%S", TQString::fromLatin1(time.second()<10 ? "0" : "") + TQString::number(time.second()) );
if (m_ampmpos>=0)
- s.replace( "%p", KGlobal::locale()->translate( time.hour()>=12 ? "pm" : "am") );
+ s.replace( "%p", TDEGlobal::locale()->translate( time.hour()>=12 ? "pm" : "am") );
return s;
}