diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:23:24 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:23:24 -0600 |
| commit | 5b8ab149469c8e186ee8b05d90c0103ae722dd85 (patch) | |
| tree | fb31321c80b12ee8e2237bdcf8c228fe44e67772 /kexi/main/keximainwindowimpl.cpp | |
| parent | fe33d391dd7c9da0f83e779344a17e2e445b70a8 (diff) | |
| download | koffice-5b8ab149469c8e186ee8b05d90c0103ae722dd85.tar.gz koffice-5b8ab149469c8e186ee8b05d90c0103ae722dd85.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kexi/main/keximainwindowimpl.cpp')
| -rw-r--r-- | kexi/main/keximainwindowimpl.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
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()) ); |