Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent 8defc2d2a9
commit 46164d2bf7

@ -195,10 +195,10 @@ void KCMultiWidget::slotHelp()
KURL url( KURL("help:/"), docPath );
if (url.protocol() == "help" || url.protocol() == "man" || url.protocol() == "info") {
KProcess process;
TDEProcess process;
process << "khelpcenter"
<< url.url();
process.start(KProcess::DontCare);
process.start(TDEProcess::DontCare);
process.detach();
} else {
new KRun(url);

@ -141,7 +141,7 @@ void MainWindow::buildActions()
// "Search:" label
TQLabel *searchLabel = new TQLabel( this, "SearchLabel");
searchLabel->setText( i18n("&Search:") );
searchLabel->setFont(KGlobalSettings::toolBarFont());
searchLabel->setFont(TDEGlobalSettings::toolBarFont());
searchLabel->setMargin(2);
searchText = new KWidgetAction( searchLabel, i18n("&Search:"), Key_F6, 0, 0, actionCollection(), "searchText" );
searchLabel->setBuddy( search );

Loading…
Cancel
Save