From 5b8ab149469c8e186ee8b05d90c0103ae722dd85 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:23:24 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- kexi/main/startup/KexiStartupDialog.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'kexi/main/startup/KexiStartupDialog.cpp') 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(); -- cgit v1.2.1