From b0a967eb693adc458fdf7d070379b8c1ec3e9415 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:25:21 -0600 Subject: [PATCH] Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- src/canvasmanipulator.cpp | 8 +++---- src/drawparts/dpline.cpp | 4 ++-- src/drawparts/dptext.cpp | 2 +- src/drawparts/solidshape.cpp | 4 ++-- src/electronics/components/piccomponent.cpp | 8 +++---- src/electronics/subcircuits.cpp | 2 +- src/flowcodeview.cpp | 8 +++---- src/flowcontainer.cpp | 2 +- src/gui/doublespinbox.cpp | 4 ++-- src/gui/newfiledlg.cpp | 2 +- src/gui/oscilloscope.cpp | 10 ++++----- src/gui/oscilloscopeview.cpp | 8 +++---- src/icnview.cpp | 4 ++-- src/itemview.cpp | 10 ++++----- src/katemdi.cpp | 6 +++--- src/ktechlab.cpp | 14 ++++++------ src/languages/externallanguage.cpp | 24 ++++++++++----------- src/languages/externallanguage.h | 10 ++++----- src/languages/picprogrammer.cpp | 2 +- src/languages/picprogrammer.h | 2 +- src/libraryitem.cpp | 2 +- src/picitem.cpp | 2 +- src/recentfilesaction.cpp | 6 +++--- src/textview.cpp | 8 +++---- src/view.cpp | 4 ++-- src/viewcontainer.cpp | 2 +- 26 files changed, 79 insertions(+), 79 deletions(-) diff --git a/src/canvasmanipulator.cpp b/src/canvasmanipulator.cpp index 8fef847..8746333 100644 --- a/src/canvasmanipulator.cpp +++ b/src/canvasmanipulator.cpp @@ -48,8 +48,8 @@ CMManager::CMManager( ItemDocument *itemDocument ) m_allowItemScrollTmr = new TQTimer(this); connect( m_allowItemScrollTmr, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAllowItemScroll()) ); - KGlobal::config()->setGroup("General"); - slotSetManualRoute( KGlobal::config()->readBoolEntry( "ManualRouting", false ) ); + TDEGlobal::config()->setGroup("General"); + slotSetManualRoute( TDEGlobal::config()->readBoolEntry( "ManualRouting", false ) ); } @@ -336,8 +336,8 @@ void CMManager::setDrawAction( int drawAction ) void CMManager::slotSetManualRoute( bool manualRoute ) { - KGlobal::config()->setGroup("General"); - KGlobal::config()->writeEntry( "ManualRouting", manualRoute ); + TDEGlobal::config()->setGroup("General"); + TDEGlobal::config()->writeEntry( "ManualRouting", manualRoute ); setCMState( cms_manual_route, manualRoute ); } diff --git a/src/drawparts/dpline.cpp b/src/drawparts/dpline.cpp index 4d17b01..b476cc9 100644 --- a/src/drawparts/dpline.cpp +++ b/src/drawparts/dpline.cpp @@ -31,7 +31,7 @@ LibraryItem* DPLine::libraryItem() TQString("dp/line"), i18n("Line"), i18n("Other"), - KGlobal::iconLoader()->loadIcon( "text", KIcon::Small ), + TDEGlobal::iconLoader()->loadIcon( "text", KIcon::Small ), LibraryItem::lit_drawpart, DPLine::construct ); } @@ -159,7 +159,7 @@ LibraryItem* DPArrow::libraryItem() TQString("dp/arrow"), i18n("Arrow"), i18n("Other"), - KGlobal::iconLoader()->loadIcon( "text", KIcon::Small ), + TDEGlobal::iconLoader()->loadIcon( "text", KIcon::Small ), LibraryItem::lit_drawpart, DPArrow::construct ); } diff --git a/src/drawparts/dptext.cpp b/src/drawparts/dptext.cpp index 73bcdd9..eaa792d 100644 --- a/src/drawparts/dptext.cpp +++ b/src/drawparts/dptext.cpp @@ -31,7 +31,7 @@ LibraryItem* DPText::libraryItem() idList, i18n("Canvas Text"), i18n("Other"), - KGlobal::iconLoader()->loadIcon( "text", KIcon::Small ), + TDEGlobal::iconLoader()->loadIcon( "text", KIcon::Small ), LibraryItem::lit_drawpart, DPText::construct ); } diff --git a/src/drawparts/solidshape.cpp b/src/drawparts/solidshape.cpp index c995fa2..7de7a34 100644 --- a/src/drawparts/solidshape.cpp +++ b/src/drawparts/solidshape.cpp @@ -30,7 +30,7 @@ LibraryItem* DPRectangle::libraryItem() TQString("dp/rectangle"), i18n("Rectangle"), i18n("Other"), - KGlobal::iconLoader()->loadIcon( "text", KIcon::Small ), + TDEGlobal::iconLoader()->loadIcon( "text", KIcon::Small ), LibraryItem::lit_drawpart, DPRectangle::construct ); } @@ -148,7 +148,7 @@ LibraryItem* DPEllipse::libraryItem() TQString("dp/ellipse"), i18n("Ellipse"), i18n("Other"), - KGlobal::iconLoader()->loadIcon( "text", KIcon::Small ), + TDEGlobal::iconLoader()->loadIcon( "text", KIcon::Small ), LibraryItem::lit_drawpart, DPEllipse::construct ); } diff --git a/src/electronics/components/piccomponent.cpp b/src/electronics/components/piccomponent.cpp index 00a32c3..b747ac6 100644 --- a/src/electronics/components/piccomponent.cpp +++ b/src/electronics/components/piccomponent.cpp @@ -82,10 +82,10 @@ PICComponent::PICComponent( ICNDocument *icnDocument, bool newItem, const char * m_bLoadingProgram = false; m_pGpsim = 0L; - addButton( "run", TQRect(), KGlobal::iconLoader()->loadIcon( "player_play", KIcon::Small ) ); - addButton( "pause", TQRect(), KGlobal::iconLoader()->loadIcon( "player_pause", KIcon::Small ) ); - addButton( "reset", TQRect(), KGlobal::iconLoader()->loadIcon( "stop", KIcon::Small ) ); - addButton( "reload", TQRect(), KGlobal::iconLoader()->loadIcon( "reload", KIcon::Small ) ); + addButton( "run", TQRect(), TDEGlobal::iconLoader()->loadIcon( "player_play", KIcon::Small ) ); + addButton( "pause", TQRect(), TDEGlobal::iconLoader()->loadIcon( "player_pause", KIcon::Small ) ); + addButton( "reset", TQRect(), TDEGlobal::iconLoader()->loadIcon( "stop", KIcon::Small ) ); + addButton( "reload", TQRect(), TDEGlobal::iconLoader()->loadIcon( "reload", KIcon::Small ) ); if ( icnDocument->ktechlab() ) connect( icnDocument->ktechlab(), TQT_SIGNAL(recentFileAdded(const KURL &)), this, TQT_SLOT(slotUpdateFileList()) ); diff --git a/src/electronics/subcircuits.cpp b/src/electronics/subcircuits.cpp index 18ff615..fef6752 100644 --- a/src/electronics/subcircuits.cpp +++ b/src/electronics/subcircuits.cpp @@ -104,7 +104,7 @@ void Subcircuits::updateComponentSelector( int id, const TQString &name ) if ( name.isEmpty() ) return; - ComponentSelector::self()->addItem( name, "sc/"+TQString::number(id), "Subcircuits", KGlobal::iconLoader()->loadIcon( "ktechlab_circuit", KIcon::Small ), true ); + ComponentSelector::self()->addItem( name, "sc/"+TQString::number(id), "Subcircuits", TDEGlobal::iconLoader()->loadIcon( "ktechlab_circuit", KIcon::Small ), true ); } diff --git a/src/flowcodeview.cpp b/src/flowcodeview.cpp index d6e994f..38af6ef 100644 --- a/src/flowcodeview.cpp +++ b/src/flowcodeview.cpp @@ -30,10 +30,10 @@ FlowCodeView::FlowCodeView( FlowCodeDocument * flowCodeDocument, ViewContainer * KPopupMenu * m = pa->popupMenu(); m->insertTitle( i18n("Convert to") ); - m->insertItem( KGlobal::iconLoader()->loadIcon( "convert_to_microbe", KIcon::Small ), i18n("Microbe"), FlowCodeDocument::MicrobeOutput ); - m->insertItem( KGlobal::iconLoader()->loadIcon( "convert_to_assembly", KIcon::Small ), i18n("Assembly"), FlowCodeDocument::AssemblyOutput ); - m->insertItem( KGlobal::iconLoader()->loadIcon( "convert_to_hex", KIcon::Small ), i18n("Hex"), FlowCodeDocument::HexOutput ); - m->insertItem( KGlobal::iconLoader()->loadIcon( "convert_to_pic", KIcon::Small ), i18n("PIC (upload)"), FlowCodeDocument::PICOutput ); + m->insertItem( TDEGlobal::iconLoader()->loadIcon( "convert_to_microbe", KIcon::Small ), i18n("Microbe"), FlowCodeDocument::MicrobeOutput ); + m->insertItem( TDEGlobal::iconLoader()->loadIcon( "convert_to_assembly", KIcon::Small ), i18n("Assembly"), FlowCodeDocument::AssemblyOutput ); + m->insertItem( TDEGlobal::iconLoader()->loadIcon( "convert_to_hex", KIcon::Small ), i18n("Hex"), FlowCodeDocument::HexOutput ); + m->insertItem( TDEGlobal::iconLoader()->loadIcon( "convert_to_pic", KIcon::Small ), i18n("PIC (upload)"), FlowCodeDocument::PICOutput ); connect( m, TQT_SIGNAL(activated(int)), flowCodeDocument, TQT_SLOT(slotConvertTo(int)) ); //END Convert To * Actions diff --git a/src/flowcontainer.cpp b/src/flowcontainer.cpp index 22c2db8..c5f4b83 100644 --- a/src/flowcontainer.cpp +++ b/src/flowcontainer.cpp @@ -30,7 +30,7 @@ FlowContainer::FlowContainer( ICNDocument *_icnDocument, bool newItem, const TQS m_ext_in = m_int_in = m_int_out = m_ext_out = 0l; b_expanded = true; - addButton( "expandBtn", TQRect( offsetX(), offsetY()+24 - 11, 22, 22 ), KGlobal::iconLoader()->loadIcon( "down", KIcon::Small ), true ); + addButton( "expandBtn", TQRect( offsetX(), offsetY()+24 - 11, 22, 22 ), TDEGlobal::iconLoader()->loadIcon( "down", KIcon::Small ), true ); m_rectangularOverlay = new RectangularOverlay( this, 8, 8 ); setSize( -160, -120, 320, 240 ); diff --git a/src/gui/doublespinbox.cpp b/src/gui/doublespinbox.cpp index 4418538..50b5272 100644 --- a/src/gui/doublespinbox.cpp +++ b/src/gui/doublespinbox.cpp @@ -146,7 +146,7 @@ double DoubleSpinBox::getMult() double DoubleSpinBox::getDisplayedNumber( bool * ok ) { - KLocale * locale = KGlobal::locale(); + KLocale * locale = TDEGlobal::locale(); // Fetch the characters that we don't want to discard const TQString exclude = locale->decimalSymbol() @@ -194,7 +194,7 @@ TQString DoubleSpinBox::mapValueToText( int v ) else if ( leftDigits > 3 ) leftDigits = 3; - KLocale * locale = KGlobal::locale(); + KLocale * locale = TDEGlobal::locale(); return locale->formatNumber( val, 3-leftDigits ); } diff --git a/src/gui/newfiledlg.cpp b/src/gui/newfiledlg.cpp index 9da23e2..87159c1 100644 --- a/src/gui/newfiledlg.cpp +++ b/src/gui/newfiledlg.cpp @@ -43,7 +43,7 @@ NewFileDlg::NewFileDlg( TQWidget *parent ) m_pNewFileWidget->typeIconView->setSelectionMode(TQIconView::Single); m_pNewFileWidget->typeIconView->setMode(KIconView::Select); - KIconLoader *loader = KGlobal::iconLoader(); + KIconLoader *loader = TDEGlobal::iconLoader(); TQValueList items; diff --git a/src/gui/oscilloscope.cpp b/src/gui/oscilloscope.cpp index 6206134..2935e7a 100644 --- a/src/gui/oscilloscope.cpp +++ b/src/gui/oscilloscope.cpp @@ -82,8 +82,8 @@ Oscilloscope::Oscilloscope( KateMDI::ToolView * parent ) connect( updateScrollTmr, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateScrollbars()) ); updateScrollTmr->start(20); - KGlobal::config()->setGroup("Oscilloscope"); - setZoomLevel( KGlobal::config()->readDoubleNumEntry( "ZoomLevel", 0.5 ) ); + TDEGlobal::config()->setGroup("Oscilloscope"); + setZoomLevel( TDEGlobal::config()->readDoubleNumEntry( "ZoomLevel", 0.5 ) ); connect( this, TQT_SIGNAL(probeRegistered(int, ProbeData *)), probePositioner, TQT_SLOT(slotProbeDataRegistered(int, ProbeData *)) ); connect( this, TQT_SIGNAL(probeUnregistered(int )), probePositioner, TQT_SLOT(slotProbeDataUnregistered(int )) ); @@ -119,8 +119,8 @@ void Oscilloscope::setZoomLevel( double zoomLevel ) else if ( zoomLevel > 1.0 ) zoomLevel = 1.0; - KGlobal::config()->setGroup("Oscilloscope"); - KGlobal::config()->writeEntry( "ZoomLevel", zoomLevel ); + TDEGlobal::config()->setGroup("Oscilloscope"); + TDEGlobal::config()->writeEntry( "ZoomLevel", zoomLevel ); // We want to maintain the position of the *center* of the view, not the // left edge, so have to record time at center of view... We also have to @@ -332,7 +332,7 @@ void addOscilloscopeAsToolView( KTechlab *ktechlab ) KateMDI::ToolView * tv; tv = ktechlab->createToolView( Oscilloscope::toolViewIdentifier(), KMultiTabBar::Bottom, - KGlobal::iconLoader()->loadIcon( "oscilloscope", KIcon::Small ), + TDEGlobal::iconLoader()->loadIcon( "oscilloscope", KIcon::Small ), i18n("Oscilloscope") ); Oscilloscope::self(tv); diff --git a/src/gui/oscilloscopeview.cpp b/src/gui/oscilloscopeview.cpp index e42af21..b2535ae 100644 --- a/src/gui/oscilloscopeview.cpp +++ b/src/gui/oscilloscopeview.cpp @@ -47,8 +47,8 @@ OscilloscopeView::OscilloscopeView( TQWidget *parent, const char *name ) m_pSimulator( Simulator::self() ), m_halfOutputHeight(0.0) { - KGlobal::config()->setGroup("Oscilloscope"); - m_fps = KGlobal::config()->readNumEntry( "FPS", 25 ); + TDEGlobal::config()->setGroup("Oscilloscope"); + m_fps = TDEGlobal::config()->readNumEntry( "FPS", 25 ); setBackgroundMode(NoBackground); setMouseTracking(true); @@ -176,8 +176,8 @@ void OscilloscopeView::mouseReleaseEvent( TQMouseEvent *event ) void OscilloscopeView::slotSetFrameRate( int fps ) { m_fps = fps; - KGlobal::config()->setGroup("Oscilloscope"); - KGlobal::config()->writeEntry( "FPS", m_fps ); + TDEGlobal::config()->setGroup("Oscilloscope"); + TDEGlobal::config()->writeEntry( "FPS", m_fps ); } diff --git a/src/icnview.cpp b/src/icnview.cpp index d7a026c..ee27bf5 100644 --- a/src/icnview.cpp +++ b/src/icnview.cpp @@ -46,8 +46,8 @@ ICNView::ICNView( ICNDocument *icnDocument, ViewContainer *viewContainer, uint v KPopupMenu * m = m_pRoutingModeToolbarPopup->popupMenu(); m->insertTitle( i18n("Connection Routing Mode") ); - m->insertItem( /*KGlobal::iconLoader()->loadIcon( "routing_mode_auto", KIcon::Small ), */i18n("Automatic"), 0 ); - m->insertItem( /*KGlobal::iconLoader()->loadIcon( "routing_mode_manual", KIcon::Small ),*/ i18n("Manual"), 1 ); + m->insertItem( /*TDEGlobal::iconLoader()->loadIcon( "routing_mode_auto", KIcon::Small ), */i18n("Automatic"), 0 ); + m->insertItem( /*TDEGlobal::iconLoader()->loadIcon( "routing_mode_manual", KIcon::Small ),*/ i18n("Manual"), 1 ); m->setCheckable(true); m->setItemChecked( manualRouting ? 1 : 0, true ); diff --git a/src/itemview.cpp b/src/itemview.cpp index 9370e1b..c21cd25 100644 --- a/src/itemview.cpp +++ b/src/itemview.cpp @@ -65,11 +65,11 @@ ItemView::ItemView( ItemDocument * itemDocument, ViewContainer *viewContainer, u KPopupMenu * m = pa->popupMenu(); m->insertTitle( i18n("Draw") ); - m->insertItem( KGlobal::iconLoader()->loadIcon( "tool_text", KIcon::Small ), i18n("Text"), DrawPart::da_text ); - m->insertItem( KGlobal::iconLoader()->loadIcon( "tool_line", KIcon::Small ), i18n("Line"), DrawPart::da_line ); - m->insertItem( KGlobal::iconLoader()->loadIcon( "tool_arrow", KIcon::Small ), i18n("Arrow"), DrawPart::da_arrow ); - m->insertItem( KGlobal::iconLoader()->loadIcon( "tool_ellipse", KIcon::Small ), i18n("Ellipse"), DrawPart::da_ellipse ); - m->insertItem( KGlobal::iconLoader()->loadIcon( "tool_rectangle", KIcon::Small ), i18n("Rectangle"), DrawPart::da_rectangle ); + m->insertItem( TDEGlobal::iconLoader()->loadIcon( "tool_text", KIcon::Small ), i18n("Text"), DrawPart::da_text ); + m->insertItem( TDEGlobal::iconLoader()->loadIcon( "tool_line", KIcon::Small ), i18n("Line"), DrawPart::da_line ); + m->insertItem( TDEGlobal::iconLoader()->loadIcon( "tool_arrow", KIcon::Small ), i18n("Arrow"), DrawPart::da_arrow ); + m->insertItem( TDEGlobal::iconLoader()->loadIcon( "tool_ellipse", KIcon::Small ), i18n("Ellipse"), DrawPart::da_ellipse ); + m->insertItem( TDEGlobal::iconLoader()->loadIcon( "tool_rectangle", KIcon::Small ), i18n("Rectangle"), DrawPart::da_rectangle ); connect( m, TQT_SIGNAL(activated(int)), itemDocument, TQT_SLOT(slotSetDrawAction(int)) ); //END Draw actions diff --git a/src/katemdi.cpp b/src/katemdi.cpp index 460de99..5ffbbff 100644 --- a/src/katemdi.cpp +++ b/src/katemdi.cpp @@ -223,7 +223,7 @@ void Sidebar::setSplitter (Splitter *sp) { m_splitter = sp; m_ownSplit = new Splitter ((sidebarPosition() == KMultiTabBar::Top || sidebarPosition() == KMultiTabBar::Bottom) ? Qt::Horizontal : Qt::Vertical, m_splitter); - m_ownSplit->setOpaqueResize( KGlobalSettings::opaqueResize() ); + m_ownSplit->setOpaqueResize( TDEGlobalSettings::opaqueResize() ); m_ownSplit->setChildrenCollapsible( false ); m_splitter->setResizeMode( m_ownSplit, TQSplitter::KeepSize ); m_ownSplit->hide (); @@ -600,7 +600,7 @@ MainWindow::MainWindow (TQWidget* parentWidget, const char* name) m_sidebars[KMultiTabBar::Left] = new Sidebar (KMultiTabBar::Left, this, hb); m_hSplitter = new Splitter (Qt::Horizontal, hb); - m_hSplitter->setOpaqueResize( KGlobalSettings::opaqueResize() ); + m_hSplitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() ); m_sidebars[KMultiTabBar::Left]->setSplitter (m_hSplitter); @@ -610,7 +610,7 @@ MainWindow::MainWindow (TQWidget* parentWidget, const char* name) m_sidebars[KMultiTabBar::Top] = new Sidebar (KMultiTabBar::Top, this, vb); m_vSplitter = new Splitter (Qt::Vertical, vb); - m_vSplitter->setOpaqueResize( KGlobalSettings::opaqueResize() ); + m_vSplitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() ); m_sidebars[KMultiTabBar::Top]->setSplitter (m_vSplitter); diff --git a/src/ktechlab.cpp b/src/ktechlab.cpp index 5553fc7..43a7a3b 100644 --- a/src/ktechlab.cpp +++ b/src/ktechlab.cpp @@ -80,7 +80,7 @@ KTechlab::KTechlab() setupToolDocks(); setupActions(); setupView(); - readProperties( KGlobal::config() ); + readProperties( TDEGlobal::config() ); // kdDebug() << "Constructor time: " << ct.elapsed() << endl; } @@ -158,7 +158,7 @@ void KTechlab::setupToolDocks() #endif TQPixmap pm; - KIconLoader * loader = KGlobal::iconLoader(); + KIconLoader * loader = TDEGlobal::iconLoader(); KateMDI::ToolView * tv = 0l; tv = createToolView( ProjectManager::toolViewIdentifier(), @@ -555,10 +555,10 @@ void KTechlab::slotTabReceivedDropEvent( TQWidget *widget, TQDropEvent *e ) e->accept(true); KPopupMenu dropMenu; - dropMenu.insertItem( KGlobal::iconLoader()->loadIcon( "goto", KIcon::Small ), i18n("&Insert Into"), 0 ); - dropMenu.insertItem( KGlobal::iconLoader()->loadIcon( "editcopy", KIcon::Small ), i18n("&Copy Into"), 1 ); + dropMenu.insertItem( TDEGlobal::iconLoader()->loadIcon( "goto", KIcon::Small ), i18n("&Insert Into"), 0 ); + dropMenu.insertItem( TDEGlobal::iconLoader()->loadIcon( "editcopy", KIcon::Small ), i18n("&Copy Into"), 1 ); dropMenu.insertSeparator(); - dropMenu.insertItem( KGlobal::iconLoader()->loadIcon( "stop", KIcon::Small ), i18n("C&ancel"), 2 ); + dropMenu.insertItem( TDEGlobal::iconLoader()->loadIcon( "stop", KIcon::Small ), i18n("C&ancel"), 2 ); connect( &dropMenu, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotDragContextActivated(int)) ); // dropMenu.exec(e->pos() + widget->pos() ); @@ -1007,7 +1007,7 @@ KURL::List KTechlab::getFileURLs() void KTechlab::slotDocModifiedChanged() { //BEGIN Set tab icons - KIconLoader *loader = KGlobal::iconLoader(); + KIconLoader *loader = TDEGlobal::iconLoader(); const ViewContainerList::iterator vcEnd = m_viewContainerList.end(); for ( ViewContainerList::iterator it = m_viewContainerList.begin(); it != vcEnd; ++it ) { @@ -1129,7 +1129,7 @@ void KTechlab::slotFilePrint() bool KTechlab::queryClose() { - saveProperties( KGlobal::config() ); + saveProperties( TDEGlobal::config() ); if ( DocManager::self()->closeAll() && ProjectManager::self()->slotCloseProject() ) { diff --git a/src/languages/externallanguage.cpp b/src/languages/externallanguage.cpp index 82e35aa..553e597 100644 --- a/src/languages/externallanguage.cpp +++ b/src/languages/externallanguage.cpp @@ -46,7 +46,7 @@ void ExternalLanguage::deleteLanguageProcess() } -void ExternalLanguage::receivedStdout( KProcess *, char * buffer, int buflen ) +void ExternalLanguage::receivedStdout( TDEProcess *, char * buffer, int buflen ) { TQStringList lines = TQStringList::split( '\n', TQString::fromLocal8Bit( buffer, buflen ), false ); TQStringList::iterator end = lines.end(); @@ -72,7 +72,7 @@ void ExternalLanguage::receivedStdout( KProcess *, char * buffer, int buflen ) } -void ExternalLanguage::receivedStderr( KProcess *, char * buffer, int buflen ) +void ExternalLanguage::receivedStderr( TDEProcess *, char * buffer, int buflen ) { TQStringList lines = TQStringList::split( '\n', TQString::fromLocal8Bit( buffer, buflen ), false ); TQStringList::iterator end = lines.end(); @@ -93,7 +93,7 @@ void ExternalLanguage::receivedStderr( KProcess *, char * buffer, int buflen ) } -void ExternalLanguage::processExited( KProcess * ) +void ExternalLanguage::processExited( TDEProcess * ) { if ( !m_languageProcess ) return; @@ -114,7 +114,7 @@ bool ExternalLanguage::start() { displayProcessCommand(); - return m_languageProcess->start( KProcess::NotifyOnExit, KProcess::All ); + return m_languageProcess->start( TDEProcess::NotifyOnExit, TDEProcess::All ); } @@ -124,16 +124,16 @@ void ExternalLanguage::resetLanguageProcess() deleteLanguageProcess(); m_errorCount = 0; - m_languageProcess = new KProcess(this); + m_languageProcess = new TDEProcess(this); - connect( m_languageProcess, TQT_SIGNAL(receivedStdout( KProcess*, char*, int )), - this, TQT_SLOT(receivedStdout( KProcess*, char*, int )) ); + connect( m_languageProcess, TQT_SIGNAL(receivedStdout( TDEProcess*, char*, int )), + this, TQT_SLOT(receivedStdout( TDEProcess*, char*, int )) ); - connect( m_languageProcess, TQT_SIGNAL(receivedStderr( KProcess*, char*, int )), - this, TQT_SLOT(receivedStderr( KProcess*, char*, int )) ); + connect( m_languageProcess, TQT_SIGNAL(receivedStderr( TDEProcess*, char*, int )), + this, TQT_SLOT(receivedStderr( TDEProcess*, char*, int )) ); - connect( m_languageProcess, TQT_SIGNAL(processExited( KProcess* )), - this, TQT_SLOT(processExited( KProcess* )) ); + connect( m_languageProcess, TQT_SIGNAL(processExited( TDEProcess* )), + this, TQT_SLOT(processExited( TDEProcess* )) ); } @@ -152,7 +152,7 @@ void ExternalLanguage::displayProcessCommand() for ( TQValueList::const_iterator it = arguments.begin(); it != end; ++it ) { if ( (*it).isEmpty() || (*it).contains( TQRegExp("[\\s]") ) ) - quotedArguments << KProcess::quote( *it ); + quotedArguments << TDEProcess::quote( *it ); else quotedArguments << *it; } diff --git a/src/languages/externallanguage.h b/src/languages/externallanguage.h index 186df27..dc02e3a 100644 --- a/src/languages/externallanguage.h +++ b/src/languages/externallanguage.h @@ -13,7 +13,7 @@ #include "language.h" -class KProcess; +class TDEProcess; /** Base class for Language support that relies on an external program; so this @@ -31,9 +31,9 @@ public: ~ExternalLanguage(); protected slots: - void receivedStdout( KProcess *, char * buffer, int buflen ); - void receivedStderr( KProcess *, char * buffer, int buflen ); - void processExited( KProcess * ); + void receivedStdout( TDEProcess *, char * buffer, int buflen ); + void receivedStderr( TDEProcess *, char * buffer, int buflen ); + void processExited( TDEProcess * ); protected: /** @@ -92,7 +92,7 @@ protected: */ void displayProcessCommand(); - KProcess * m_languageProcess; + TDEProcess * m_languageProcess; }; #endif diff --git a/src/languages/picprogrammer.cpp b/src/languages/picprogrammer.cpp index 837a937..afc1307 100644 --- a/src/languages/picprogrammer.cpp +++ b/src/languages/picprogrammer.cpp @@ -387,7 +387,7 @@ void PicProgrammer::processInput( ProcessOptions options ) TQString command = config.writeCommand; command.replace( "%port", options.m_port ); command.replace( "%device", TQString( options.m_picID ).remove("P") ); - command.replace( "%file", KProcess::quote( options.inputFiles().first() ) ); + command.replace( "%file", TDEProcess::quote( options.inputFiles().first() ) ); m_languageProcess->setUseShell( true ); *m_languageProcess << command; diff --git a/src/languages/picprogrammer.h b/src/languages/picprogrammer.h index 9e1b606..ef9e1cf 100644 --- a/src/languages/picprogrammer.h +++ b/src/languages/picprogrammer.h @@ -15,7 +15,7 @@ class KConfig; -class KProcess; +class TDEProcess; class ProgrammerConfig diff --git a/src/libraryitem.cpp b/src/libraryitem.cpp index 8301a24..26374a6 100644 --- a/src/libraryitem.cpp +++ b/src/libraryitem.cpp @@ -58,7 +58,7 @@ LibraryItem::~LibraryItem() void LibraryItem::createIcon16() { if ( m_icon_full.isNull() ) - m_icon_full = KGlobal::iconLoader()->loadIcon( "null", KIcon::Small ); + m_icon_full = TDEGlobal::iconLoader()->loadIcon( "null", KIcon::Small ); // const int size = KIcon::SizeSmallMedium; // const int size = 22; diff --git a/src/picitem.cpp b/src/picitem.cpp index c60fd5d..05868b6 100644 --- a/src/picitem.cpp +++ b/src/picitem.cpp @@ -254,7 +254,7 @@ PicItem::PicItem( ICNDocument *icnDocument, bool newItem, const char *id, MicroS updateVisibility(); addButton( "settings", TQRect( SidePadding-8, m_innerHeight+TopPadding+(BottomPadding-24)/2-1, InnerWidth+16, 24 ), i18n("Advanced...") ); - addButton( "expandBtn", TQRect( (TopPadding-22)/2, (TopPadding-22)/2, 22, 22 ), KGlobal::iconLoader()->loadIcon( "down", KIcon::Small ), true ); + addButton( "expandBtn", TQRect( (TopPadding-22)/2, (TopPadding-22)/2, 22, 22 ), TDEGlobal::iconLoader()->loadIcon( "down", KIcon::Small ), true ); button("expandBtn")->setState(true); move( 12, 12 ); diff --git a/src/recentfilesaction.cpp b/src/recentfilesaction.cpp index 22f0d24..55b70b9 100644 --- a/src/recentfilesaction.cpp +++ b/src/recentfilesaction.cpp @@ -41,7 +41,7 @@ RecentFilesAction::~RecentFilesAction() void RecentFilesAction::addURL( const KURL& url ) { - if ( url.isLocalFile() && !KGlobal::dirs()->relativeLocation("tmp", url.path()).startsWith("/")) + if ( url.isLocalFile() && !TDEGlobal::dirs()->relativeLocation("tmp", url.path()).startsWith("/")) return; TQString file; @@ -72,7 +72,7 @@ void RecentFilesAction::addURL( const KURL& url ) void RecentFilesAction::loadEntries() { - KConfig * config = KGlobal::config(); + KConfig * config = TDEGlobal::config(); TQString key; TQString value; @@ -101,7 +101,7 @@ void RecentFilesAction::loadEntries() void RecentFilesAction::saveEntries() { - KConfig * config = KGlobal::config(); + KConfig * config = TDEGlobal::config(); TQString key; TQString value; diff --git a/src/textview.cpp b/src/textview.cpp index c8c0b95..309ac6a 100644 --- a/src/textview.cpp +++ b/src/textview.cpp @@ -56,10 +56,10 @@ TextView::TextView( TextDocument * textDocument, ViewContainer *viewContainer, u KPopupMenu * m = pa->popupMenu(); m->insertTitle( i18n("Convert to ...") ); - m->insertItem( KGlobal::iconLoader()->loadIcon( "convert_to_microbe", KIcon::Small ), i18n("Microbe"), TextDocument::MicrobeOutput ); - m->insertItem( KGlobal::iconLoader()->loadIcon( "convert_to_assembly", KIcon::Small ), i18n("Assembly"), TextDocument::AssemblyOutput ); - m->insertItem( KGlobal::iconLoader()->loadIcon( "convert_to_hex", KIcon::Small ), i18n("Hex"), TextDocument::HexOutput ); - m->insertItem( KGlobal::iconLoader()->loadIcon( "convert_to_pic", KIcon::Small ), i18n("PIC (upload)"), TextDocument::PICOutput ); + m->insertItem( TDEGlobal::iconLoader()->loadIcon( "convert_to_microbe", KIcon::Small ), i18n("Microbe"), TextDocument::MicrobeOutput ); + m->insertItem( TDEGlobal::iconLoader()->loadIcon( "convert_to_assembly", KIcon::Small ), i18n("Assembly"), TextDocument::AssemblyOutput ); + m->insertItem( TDEGlobal::iconLoader()->loadIcon( "convert_to_hex", KIcon::Small ), i18n("Hex"), TextDocument::HexOutput ); + m->insertItem( TDEGlobal::iconLoader()->loadIcon( "convert_to_pic", KIcon::Small ), i18n("PIC (upload)"), TextDocument::PICOutput ); connect( m, TQT_SIGNAL(activated(int)), textDocument, TQT_SLOT(slotConvertTo(int)) ); m->setItemEnabled( TextDocument::MicrobeOutput, false ); diff --git a/src/view.cpp b/src/view.cpp index 2b03246..a2f30e9 100644 --- a/src/view.cpp +++ b/src/view.cpp @@ -183,8 +183,8 @@ ViewStatusBar::ViewStatusBar( View *view ) m_fileNameLabel = new KSqueezedTextLabel(this); addWidget( m_fileNameLabel, 1, false ); - m_modifiedPixmap = KGlobal::iconLoader()->loadIcon( "filesave", KIcon::Small ); - m_unmodifiedPixmap = KGlobal::iconLoader()->loadIcon( "null", KIcon::Small ); + m_modifiedPixmap = TDEGlobal::iconLoader()->loadIcon( "filesave", KIcon::Small ); + m_unmodifiedPixmap = TDEGlobal::iconLoader()->loadIcon( "null", KIcon::Small ); connect( view->document(), TQT_SIGNAL(modifiedStateChanged()), this, TQT_SLOT(slotModifiedStateChanged()) ); connect( view->document(), TQT_SIGNAL(fileNameChanged(const KURL& )), this, TQT_SLOT(slotFileNameChanged(const KURL& )) ); diff --git a/src/viewcontainer.cpp b/src/viewcontainer.cpp index c1cb36c..d44d95f 100644 --- a/src/viewcontainer.cpp +++ b/src/viewcontainer.cpp @@ -386,7 +386,7 @@ ViewArea::ViewArea( TQWidget *parent, ViewContainer *viewContainer, int id, cons if (id >= 0) p_viewContainer->setViewAreaId( this, uint(id) ); p_viewContainer->setIdUsed(id); - setOpaqueResize(KGlobalSettings::opaqueResize()); + setOpaqueResize(TDEGlobalSettings::opaqueResize()); }