From c48e769eb275917717e2b55eb869f7e559293ac8 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:48:31 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- kdict/toplevel.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'kdict/toplevel.cpp') diff --git a/kdict/toplevel.cpp b/kdict/toplevel.cpp index 17374766..a1bacd2b 100644 --- a/kdict/toplevel.cpp +++ b/kdict/toplevel.cpp @@ -90,7 +90,7 @@ TopLevel::TopLevel(TQWidget* parent, const char* name) if (global->showMatchList) { // show splitter, html view & match list splitter = new TQSplitter(Qt::Horizontal,this); - splitter->setOpaqueResize( KGlobalSettings::opaqueResize() ); + splitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() ); queryView->reparent(splitter,0,queryView->pos(),true); matchView->reparent(splitter,0,matchView->pos(),true); setCentralWidget(splitter); @@ -105,7 +105,7 @@ TopLevel::TopLevel(TQWidget* parent, const char* name) //apply settings resize(600,390); - applyMainWindowSettings(KGlobal::config(),"toplevel_options"); + applyMainWindowSettings(TDEGlobal::config(),"toplevel_options"); stratDbChanged(); // fill combos, build menus actQueryCombo->setFocus(); // place cursor in combobox @@ -295,7 +295,7 @@ bool TopLevel::queryClose() { kdDebug(5004) << "TopLevel::queryClose()" << endl; - saveMainWindowSettings(KGlobal::config(),"toplevel_options"); + saveMainWindowSettings(TDEGlobal::config(),"toplevel_options"); saveMatchViewSize(); global->queryComboCompletionMode = actQueryCombo->completionMode(); @@ -642,7 +642,7 @@ void TopLevel::toggleMatchListShow() { global->showMatchList = true; splitter = new TQSplitter(Qt::Horizontal,this); - splitter->setOpaqueResize( KGlobalSettings::opaqueResize() ); + splitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() ); setCentralWidget(splitter); splitter->show(); queryView->reparent(splitter,0,queryView->pos(),true); @@ -675,7 +675,7 @@ void TopLevel::adjustMatchViewSize() void TopLevel::slotConfToolbar() { - saveMainWindowSettings(KGlobal::config(),"toplevel_options"); + saveMainWindowSettings(TDEGlobal::config(),"toplevel_options"); KEditToolbar dlg(actionCollection(), "kdictui.rc"); connect(&dlg,TQT_SIGNAL( newToolbarConfig() ), this, TQT_SLOT( slotNewToolbarConfig() )); dlg.exec(); @@ -685,7 +685,7 @@ void TopLevel::slotConfToolbar() void TopLevel::slotNewToolbarConfig() { recreateGUI(); - applyMainWindowSettings(KGlobal::config(),"toplevel_options"); + applyMainWindowSettings(TDEGlobal::config(),"toplevel_options"); buildHistMenu(); // actionlists must be inserted stratDbChanged(); } -- cgit v1.2.1