TDE
/
ktechlab
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/ktechlab
0
0
Fork 0
Code Issues Releases Wiki Activity

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

Browse Source
pull/1/head
Timothy Pearson 12 years ago
parent a19dd7fc8e
commit b0a967eb69
26 changed files with 79 additions and 79 deletions
Show Stats Download Patch File Download Diff File

8
src/canvasmanipulator.cpp
Unescape View File

@ -48,8 +48,8 @@ CMManager::CMManager( ItemDocument *itemDocument )
m_allowItemScrollTmr = new TQTimer(this); m_allowItemScrollTmr = new TQTimer(this);
connect( m_allowItemScrollTmr, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAllowItemScroll()) ); connect( m_allowItemScrollTmr, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAllowItemScroll()) );
KGlobal::config()->setGroup("General"); TDEGlobal::config()->setGroup("General");
slotSetManualRoute( KGlobal::config()->readBoolEntry( "ManualRouting", false ) ); slotSetManualRoute( TDEGlobal::config()->readBoolEntry( "ManualRouting", false ) );
} }
@ -336,8 +336,8 @@ void CMManager::setDrawAction( int drawAction )
void CMManager::slotSetManualRoute( bool manualRoute ) void CMManager::slotSetManualRoute( bool manualRoute )
{ {
KGlobal::config()->setGroup("General"); TDEGlobal::config()->setGroup("General");
KGlobal::config()->writeEntry( "ManualRouting", manualRoute ); TDEGlobal::config()->writeEntry( "ManualRouting", manualRoute );
setCMState( cms_manual_route, manualRoute ); setCMState( cms_manual_route, manualRoute );
} }

4
src/drawparts/dpline.cpp
Unescape View File

@ -31,7 +31,7 @@ LibraryItem* DPLine::libraryItem()
TQString("dp/line"), TQString("dp/line"),
i18n("Line"), i18n("Line"),
i18n("Other"), i18n("Other"),
KGlobal::iconLoader()->loadIcon( "text", KIcon::Small ), TDEGlobal::iconLoader()->loadIcon( "text", KIcon::Small ),
LibraryItem::lit_drawpart, LibraryItem::lit_drawpart,
DPLine::construct ); DPLine::construct );
} }
@ -159,7 +159,7 @@ LibraryItem* DPArrow::libraryItem()
TQString("dp/arrow"), TQString("dp/arrow"),
i18n("Arrow"), i18n("Arrow"),
i18n("Other"), i18n("Other"),
KGlobal::iconLoader()->loadIcon( "text", KIcon::Small ), TDEGlobal::iconLoader()->loadIcon( "text", KIcon::Small ),
LibraryItem::lit_drawpart, LibraryItem::lit_drawpart,
DPArrow::construct ); DPArrow::construct );
} }

2
src/drawparts/dptext.cpp
Unescape View File

@ -31,7 +31,7 @@ LibraryItem* DPText::libraryItem()
idList, idList,
i18n("Canvas Text"), i18n("Canvas Text"),
i18n("Other"), i18n("Other"),
KGlobal::iconLoader()->loadIcon( "text", KIcon::Small ), TDEGlobal::iconLoader()->loadIcon( "text", KIcon::Small ),
LibraryItem::lit_drawpart, LibraryItem::lit_drawpart,
DPText::construct ); DPText::construct );
} }

4
src/drawparts/solidshape.cpp
Unescape View File

@ -30,7 +30,7 @@ LibraryItem* DPRectangle::libraryItem()
TQString("dp/rectangle"), TQString("dp/rectangle"),
i18n("Rectangle"), i18n("Rectangle"),
i18n("Other"), i18n("Other"),
KGlobal::iconLoader()->loadIcon( "text", KIcon::Small ), TDEGlobal::iconLoader()->loadIcon( "text", KIcon::Small ),
LibraryItem::lit_drawpart, LibraryItem::lit_drawpart,
DPRectangle::construct ); DPRectangle::construct );
} }
@ -148,7 +148,7 @@ LibraryItem* DPEllipse::libraryItem()
TQString("dp/ellipse"), TQString("dp/ellipse"),
i18n("Ellipse"), i18n("Ellipse"),
i18n("Other"), i18n("Other"),
KGlobal::iconLoader()->loadIcon( "text", KIcon::Small ), TDEGlobal::iconLoader()->loadIcon( "text", KIcon::Small ),
LibraryItem::lit_drawpart, LibraryItem::lit_drawpart,
DPEllipse::construct ); DPEllipse::construct );
} }

8
src/electronics/components/piccomponent.cpp
Unescape View File

@ -82,10 +82,10 @@ PICComponent::PICComponent( ICNDocument *icnDocument, bool newItem, const char *
m_bLoadingProgram = false; m_bLoadingProgram = false;
m_pGpsim = 0L; m_pGpsim = 0L;
addButton( "run", TQRect(), KGlobal::iconLoader()->loadIcon( "player_play", KIcon::Small ) ); addButton( "run", TQRect(), TDEGlobal::iconLoader()->loadIcon( "player_play", KIcon::Small ) );
addButton( "pause", TQRect(), KGlobal::iconLoader()->loadIcon( "player_pause", KIcon::Small ) ); addButton( "pause", TQRect(), TDEGlobal::iconLoader()->loadIcon( "player_pause", KIcon::Small ) );
addButton( "reset", TQRect(), KGlobal::iconLoader()->loadIcon( "stop", KIcon::Small ) ); addButton( "reset", TQRect(), TDEGlobal::iconLoader()->loadIcon( "stop", KIcon::Small ) );
addButton( "reload", TQRect(), KGlobal::iconLoader()->loadIcon( "reload", KIcon::Small ) ); addButton( "reload", TQRect(), TDEGlobal::iconLoader()->loadIcon( "reload", KIcon::Small ) );
if ( icnDocument->ktechlab() ) if ( icnDocument->ktechlab() )
connect( icnDocument->ktechlab(), TQT_SIGNAL(recentFileAdded(const KURL &)), this, TQT_SLOT(slotUpdateFileList()) ); connect( icnDocument->ktechlab(), TQT_SIGNAL(recentFileAdded(const KURL &)), this, TQT_SLOT(slotUpdateFileList()) );

2
src/electronics/subcircuits.cpp
Unescape View File

@ -104,7 +104,7 @@ void Subcircuits::updateComponentSelector( int id, const TQString &name )
if ( name.isEmpty() ) if ( name.isEmpty() )
return; 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 );
} }

8
src/flowcodeview.cpp
Unescape View File

@ -30,10 +30,10 @@ FlowCodeView::FlowCodeView( FlowCodeDocument * flowCodeDocument, ViewContainer *
KPopupMenu * m = pa->popupMenu(); KPopupMenu * m = pa->popupMenu();
m->insertTitle( i18n("Convert to") ); m->insertTitle( i18n("Convert to") );
m->insertItem( KGlobal::iconLoader()->loadIcon( "convert_to_microbe", KIcon::Small ), i18n("Microbe"), FlowCodeDocument::MicrobeOutput ); m->insertItem( TDEGlobal::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( TDEGlobal::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( TDEGlobal::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_pic", KIcon::Small ), i18n("PIC (upload)"), FlowCodeDocument::PICOutput );
connect( m, TQT_SIGNAL(activated(int)), flowCodeDocument, TQT_SLOT(slotConvertTo(int)) ); connect( m, TQT_SIGNAL(activated(int)), flowCodeDocument, TQT_SLOT(slotConvertTo(int)) );
//END Convert To * Actions //END Convert To * Actions

2
src/flowcontainer.cpp
Unescape View File

@ -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; m_ext_in = m_int_in = m_int_out = m_ext_out = 0l;
b_expanded = true; 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 ); m_rectangularOverlay = new RectangularOverlay( this, 8, 8 );
setSize( -160, -120, 320, 240 ); setSize( -160, -120, 320, 240 );

4
src/gui/doublespinbox.cpp
Unescape View File

@ -146,7 +146,7 @@ double DoubleSpinBox::getMult()
double DoubleSpinBox::getDisplayedNumber( bool * ok ) double DoubleSpinBox::getDisplayedNumber( bool * ok )
{ {
KLocale * locale = KGlobal::locale(); KLocale * locale = TDEGlobal::locale();
// Fetch the characters that we don't want to discard // Fetch the characters that we don't want to discard
const TQString exclude = locale->decimalSymbol() const TQString exclude = locale->decimalSymbol()
@ -194,7 +194,7 @@ TQString DoubleSpinBox::mapValueToText( int v )
else if ( leftDigits > 3 ) else if ( leftDigits > 3 )
leftDigits = 3; leftDigits = 3;
KLocale * locale = KGlobal::locale(); KLocale * locale = TDEGlobal::locale();
return locale->formatNumber( val, 3-leftDigits ); return locale->formatNumber( val, 3-leftDigits );
} }

2
src/gui/newfiledlg.cpp
Unescape View File

@ -43,7 +43,7 @@ NewFileDlg::NewFileDlg( TQWidget *parent )
m_pNewFileWidget->typeIconView->setSelectionMode(TQIconView::Single); m_pNewFileWidget->typeIconView->setSelectionMode(TQIconView::Single);
m_pNewFileWidget->typeIconView->setMode(KIconView::Select); m_pNewFileWidget->typeIconView->setMode(KIconView::Select);
KIconLoader *loader = KGlobal::iconLoader(); KIconLoader *loader = TDEGlobal::iconLoader();
TQValueList<TQIconViewItem*> items; TQValueList<TQIconViewItem*> items;

10
src/gui/oscilloscope.cpp
Unescape View File

@ -82,8 +82,8 @@ Oscilloscope::Oscilloscope( KateMDI::ToolView * parent )
connect( updateScrollTmr, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateScrollbars()) ); connect( updateScrollTmr, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateScrollbars()) );
updateScrollTmr->start(20); updateScrollTmr->start(20);
KGlobal::config()->setGroup("Oscilloscope"); TDEGlobal::config()->setGroup("Oscilloscope");
setZoomLevel( KGlobal::config()->readDoubleNumEntry( "ZoomLevel", 0.5 ) ); setZoomLevel( TDEGlobal::config()->readDoubleNumEntry( "ZoomLevel", 0.5 ) );
connect( this, TQT_SIGNAL(probeRegistered(int, ProbeData *)), probePositioner, TQT_SLOT(slotProbeDataRegistered(int, ProbeData *)) ); connect( this, TQT_SIGNAL(probeRegistered(int, ProbeData *)), probePositioner, TQT_SLOT(slotProbeDataRegistered(int, ProbeData *)) );
connect( this, TQT_SIGNAL(probeUnregistered(int )), probePositioner, TQT_SLOT(slotProbeDataUnregistered(int )) ); 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 ) else if ( zoomLevel > 1.0 )
zoomLevel = 1.0; zoomLevel = 1.0;
KGlobal::config()->setGroup("Oscilloscope"); TDEGlobal::config()->setGroup("Oscilloscope");
KGlobal::config()->writeEntry( "ZoomLevel", zoomLevel ); TDEGlobal::config()->writeEntry( "ZoomLevel", zoomLevel );
// We want to maintain the position of the *center* of the view, not the // 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 // 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; KateMDI::ToolView * tv;
tv = ktechlab->createToolView( Oscilloscope::toolViewIdentifier(), tv = ktechlab->createToolView( Oscilloscope::toolViewIdentifier(),
KMultiTabBar::Bottom, KMultiTabBar::Bottom,
KGlobal::iconLoader()->loadIcon( "oscilloscope", KIcon::Small ), TDEGlobal::iconLoader()->loadIcon( "oscilloscope", KIcon::Small ),
i18n("Oscilloscope") ); i18n("Oscilloscope") );
Oscilloscope::self(tv); Oscilloscope::self(tv);

8
src/gui/oscilloscopeview.cpp
Unescape View File

@ -47,8 +47,8 @@ OscilloscopeView::OscilloscopeView( TQWidget *parent, const char *name )
m_pSimulator( Simulator::self() ), m_pSimulator( Simulator::self() ),
m_halfOutputHeight(0.0) m_halfOutputHeight(0.0)
{ {
KGlobal::config()->setGroup("Oscilloscope"); TDEGlobal::config()->setGroup("Oscilloscope");
m_fps = KGlobal::config()->readNumEntry( "FPS", 25 ); m_fps = TDEGlobal::config()->readNumEntry( "FPS", 25 );
setBackgroundMode(NoBackground); setBackgroundMode(NoBackground);
setMouseTracking(true); setMouseTracking(true);
@ -176,8 +176,8 @@ void OscilloscopeView::mouseReleaseEvent( TQMouseEvent *event )
void OscilloscopeView::slotSetFrameRate( int fps ) void OscilloscopeView::slotSetFrameRate( int fps )
{ {
m_fps = fps; m_fps = fps;
KGlobal::config()->setGroup("Oscilloscope"); TDEGlobal::config()->setGroup("Oscilloscope");
KGlobal::config()->writeEntry( "FPS", m_fps ); TDEGlobal::config()->writeEntry( "FPS", m_fps );
} }

4
src/icnview.cpp
Unescape View File

@ -46,8 +46,8 @@ ICNView::ICNView( ICNDocument *icnDocument, ViewContainer *viewContainer, uint v
KPopupMenu * m = m_pRoutingModeToolbarPopup->popupMenu(); KPopupMenu * m = m_pRoutingModeToolbarPopup->popupMenu();
m->insertTitle( i18n("Connection Routing Mode") ); m->insertTitle( i18n("Connection Routing Mode") );
m->insertItem( /*KGlobal::iconLoader()->loadIcon( "routing_mode_auto", KIcon::Small ), */i18n("Automatic"), 0 ); m->insertItem( /*TDEGlobal::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_manual", KIcon::Small ),*/ i18n("Manual"), 1 );
m->setCheckable(true); m->setCheckable(true);
m->setItemChecked( manualRouting ? 1 : 0, true ); m->setItemChecked( manualRouting ? 1 : 0, true );

10
src/itemview.cpp
Unescape View File

@ -65,11 +65,11 @@ ItemView::ItemView( ItemDocument * itemDocument, ViewContainer *viewContainer, u
KPopupMenu * m = pa->popupMenu(); KPopupMenu * m = pa->popupMenu();
m->insertTitle( i18n("Draw") ); m->insertTitle( i18n("Draw") );
m->insertItem( KGlobal::iconLoader()->loadIcon( "tool_text", KIcon::Small ), i18n("Text"), DrawPart::da_text ); m->insertItem( TDEGlobal::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( TDEGlobal::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( TDEGlobal::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( TDEGlobal::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_rectangle", KIcon::Small ), i18n("Rectangle"), DrawPart::da_rectangle );
connect( m, TQT_SIGNAL(activated(int)), itemDocument, TQT_SLOT(slotSetDrawAction(int)) ); connect( m, TQT_SIGNAL(activated(int)), itemDocument, TQT_SLOT(slotSetDrawAction(int)) );
//END Draw actions //END Draw actions

6
src/katemdi.cpp
Unescape View File

@ -223,7 +223,7 @@ void Sidebar::setSplitter (Splitter *sp)
{ {
m_splitter = sp; m_splitter = sp;
m_ownSplit = new Splitter ((sidebarPosition() == KMultiTabBar::Top || sidebarPosition() == KMultiTabBar::Bottom) ? Qt::Horizontal : Qt::Vertical, m_splitter); 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_ownSplit->setChildrenCollapsible( false );
m_splitter->setResizeMode( m_ownSplit, TQSplitter::KeepSize ); m_splitter->setResizeMode( m_ownSplit, TQSplitter::KeepSize );
m_ownSplit->hide (); 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_sidebars[KMultiTabBar::Left] = new Sidebar (KMultiTabBar::Left, this, hb);
m_hSplitter = new Splitter (Qt::Horizontal, 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); 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_sidebars[KMultiTabBar::Top] = new Sidebar (KMultiTabBar::Top, this, vb);
m_vSplitter = new Splitter (Qt::Vertical, 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); m_sidebars[KMultiTabBar::Top]->setSplitter (m_vSplitter);

14
src/ktechlab.cpp
Unescape View File

@ -80,7 +80,7 @@ KTechlab::KTechlab()
setupToolDocks(); setupToolDocks();
setupActions(); setupActions();
setupView(); setupView();
readProperties( KGlobal::config() ); readProperties( TDEGlobal::config() );
// kdDebug() << "Constructor time: " << ct.elapsed() << endl; // kdDebug() << "Constructor time: " << ct.elapsed() << endl;
} }
@ -158,7 +158,7 @@ void KTechlab::setupToolDocks()
#endif #endif
TQPixmap pm; TQPixmap pm;
KIconLoader * loader = KGlobal::iconLoader(); KIconLoader * loader = TDEGlobal::iconLoader();
KateMDI::ToolView * tv = 0l; KateMDI::ToolView * tv = 0l;
tv = createToolView( ProjectManager::toolViewIdentifier(), tv = createToolView( ProjectManager::toolViewIdentifier(),
@ -555,10 +555,10 @@ void KTechlab::slotTabReceivedDropEvent( TQWidget *widget, TQDropEvent *e )
e->accept(true); e->accept(true);
KPopupMenu dropMenu; KPopupMenu dropMenu;
dropMenu.insertItem( KGlobal::iconLoader()->loadIcon( "goto", KIcon::Small ), i18n("&Insert Into"), 0 ); dropMenu.insertItem( TDEGlobal::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( "editcopy", KIcon::Small ), i18n("&Copy Into"), 1 );
dropMenu.insertSeparator(); 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)) ); connect( &dropMenu, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotDragContextActivated(int)) );
// dropMenu.exec(e->pos() + widget->pos() ); // dropMenu.exec(e->pos() + widget->pos() );
@ -1007,7 +1007,7 @@ KURL::List KTechlab::getFileURLs()
void KTechlab::slotDocModifiedChanged() void KTechlab::slotDocModifiedChanged()
{ {
//BEGIN Set tab icons //BEGIN Set tab icons
KIconLoader *loader = KGlobal::iconLoader(); KIconLoader *loader = TDEGlobal::iconLoader();
const ViewContainerList::iterator vcEnd = m_viewContainerList.end(); const ViewContainerList::iterator vcEnd = m_viewContainerList.end();
for ( ViewContainerList::iterator it = m_viewContainerList.begin(); it != vcEnd; ++it ) for ( ViewContainerList::iterator it = m_viewContainerList.begin(); it != vcEnd; ++it )
{ {
@ -1129,7 +1129,7 @@ void KTechlab::slotFilePrint()
bool KTechlab::queryClose() bool KTechlab::queryClose()
{ {
saveProperties( KGlobal::config() ); saveProperties( TDEGlobal::config() );
if ( DocManager::self()->closeAll() && ProjectManager::self()->slotCloseProject() ) if ( DocManager::self()->closeAll() && ProjectManager::self()->slotCloseProject() )
{ {

24
src/languages/externallanguage.cpp
Unescape View File

@ -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 lines = TQStringList::split( '\n', TQString::fromLocal8Bit( buffer, buflen ), false );
TQStringList::iterator end = lines.end(); 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 lines = TQStringList::split( '\n', TQString::fromLocal8Bit( buffer, buflen ), false );
TQStringList::iterator end = lines.end(); 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 ) if ( !m_languageProcess )
return; return;
@ -114,7 +114,7 @@ bool ExternalLanguage::start()
{ {
displayProcessCommand(); 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(); deleteLanguageProcess();
m_errorCount = 0; m_errorCount = 0;
m_languageProcess = new KProcess(this); m_languageProcess = new TDEProcess(this);
connect( m_languageProcess, TQT_SIGNAL(receivedStdout( KProcess*, char*, int )), connect( m_languageProcess, TQT_SIGNAL(receivedStdout( TDEProcess*, char*, int )),
this, TQT_SLOT(receivedStdout( KProcess*, char*, int )) ); this, TQT_SLOT(receivedStdout( TDEProcess*, char*, int )) );
connect( m_languageProcess, TQT_SIGNAL(receivedStderr( KProcess*, char*, int )), connect( m_languageProcess, TQT_SIGNAL(receivedStderr( TDEProcess*, char*, int )),
this, TQT_SLOT(receivedStderr( KProcess*, char*, int )) ); this, TQT_SLOT(receivedStderr( TDEProcess*, char*, int )) );
connect( m_languageProcess, TQT_SIGNAL(processExited( KProcess* )), connect( m_languageProcess, TQT_SIGNAL(processExited( TDEProcess* )),
this, TQT_SLOT(processExited( KProcess* )) ); this, TQT_SLOT(processExited( TDEProcess* )) );
} }
@ -152,7 +152,7 @@ void ExternalLanguage::displayProcessCommand()
for ( TQValueList<TQCString>::const_iterator it = arguments.begin(); it != end; ++it ) for ( TQValueList<TQCString>::const_iterator it = arguments.begin(); it != end; ++it )
{ {
if ( (*it).isEmpty() || (*it).contains( TQRegExp("[\\s]") ) ) if ( (*it).isEmpty() || (*it).contains( TQRegExp("[\\s]") ) )
quotedArguments << KProcess::quote( *it ); quotedArguments << TDEProcess::quote( *it );
else else
quotedArguments << *it; quotedArguments << *it;
} }

10
src/languages/externallanguage.h
Unescape View File

@ -13,7 +13,7 @@
#include "language.h" #include "language.h"
class KProcess; class TDEProcess;
/** /**
Base class for Language support that relies on an external program; so this Base class for Language support that relies on an external program; so this
@ -31,9 +31,9 @@ public:
~ExternalLanguage(); ~ExternalLanguage();
protected slots: protected slots:
void receivedStdout( KProcess *, char * buffer, int buflen ); void receivedStdout( TDEProcess *, char * buffer, int buflen );
void receivedStderr( KProcess *, char * buffer, int buflen ); void receivedStderr( TDEProcess *, char * buffer, int buflen );
void processExited( KProcess * ); void processExited( TDEProcess * );
protected: protected:
/** /**
@ -92,7 +92,7 @@ protected:
*/ */
void displayProcessCommand(); void displayProcessCommand();
KProcess * m_languageProcess; TDEProcess * m_languageProcess;
}; };
#endif #endif

2
src/languages/picprogrammer.cpp
Unescape View File

@ -387,7 +387,7 @@ void PicProgrammer::processInput( ProcessOptions options )
TQString command = config.writeCommand; TQString command = config.writeCommand;
command.replace( "%port", options.m_port ); command.replace( "%port", options.m_port );
command.replace( "%device", TQString( options.m_picID ).remove("P") ); 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->setUseShell( true );
*m_languageProcess << command; *m_languageProcess << command;

2
src/languages/picprogrammer.h
Unescape View File

@ -15,7 +15,7 @@
class KConfig; class KConfig;
class KProcess; class TDEProcess;
class ProgrammerConfig class ProgrammerConfig

2
src/libraryitem.cpp
Unescape View File

@ -58,7 +58,7 @@ LibraryItem::~LibraryItem()
void LibraryItem::createIcon16() void LibraryItem::createIcon16()
{ {
if ( m_icon_full.isNull() ) 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 = KIcon::SizeSmallMedium;
// const int size = 22; // const int size = 22;

2
src/picitem.cpp
Unescape View File

@ -254,7 +254,7 @@ PicItem::PicItem( ICNDocument *icnDocument, bool newItem, const char *id, MicroS
updateVisibility(); updateVisibility();
addButton( "settings", TQRect( SidePadding-8, m_innerHeight+TopPadding+(BottomPadding-24)/2-1, InnerWidth+16, 24 ), i18n("Advanced...") ); 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); button("expandBtn")->setState(true);
move( 12, 12 ); move( 12, 12 );

6
src/recentfilesaction.cpp
Unescape View File

@ -41,7 +41,7 @@ RecentFilesAction::~RecentFilesAction()
void RecentFilesAction::addURL( const KURL& url ) 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; return;
TQString file; TQString file;
@ -72,7 +72,7 @@ void RecentFilesAction::addURL( const KURL& url )
void RecentFilesAction::loadEntries() void RecentFilesAction::loadEntries()
{ {
KConfig * config = KGlobal::config(); KConfig * config = TDEGlobal::config();
TQString key; TQString key;
TQString value; TQString value;
@ -101,7 +101,7 @@ void RecentFilesAction::loadEntries()
void RecentFilesAction::saveEntries() void RecentFilesAction::saveEntries()
{ {
KConfig * config = KGlobal::config(); KConfig * config = TDEGlobal::config();
TQString key; TQString key;
TQString value; TQString value;

8
src/textview.cpp
Unescape View File

@ -56,10 +56,10 @@ TextView::TextView( TextDocument * textDocument, ViewContainer *viewContainer, u
KPopupMenu * m = pa->popupMenu(); KPopupMenu * m = pa->popupMenu();
m->insertTitle( i18n("Convert to ...") ); m->insertTitle( i18n("Convert to ...") );
m->insertItem( KGlobal::iconLoader()->loadIcon( "convert_to_microbe", KIcon::Small ), i18n("Microbe"), TextDocument::MicrobeOutput ); m->insertItem( TDEGlobal::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( TDEGlobal::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( TDEGlobal::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_pic", KIcon::Small ), i18n("PIC (upload)"), TextDocument::PICOutput );
connect( m, TQT_SIGNAL(activated(int)), textDocument, TQT_SLOT(slotConvertTo(int)) ); connect( m, TQT_SIGNAL(activated(int)), textDocument, TQT_SLOT(slotConvertTo(int)) );
m->setItemEnabled( TextDocument::MicrobeOutput, false ); m->setItemEnabled( TextDocument::MicrobeOutput, false );

4
src/view.cpp
Unescape View File

@ -183,8 +183,8 @@ ViewStatusBar::ViewStatusBar( View *view )
m_fileNameLabel = new KSqueezedTextLabel(this); m_fileNameLabel = new KSqueezedTextLabel(this);
addWidget( m_fileNameLabel, 1, false ); addWidget( m_fileNameLabel, 1, false );
m_modifiedPixmap = KGlobal::iconLoader()->loadIcon( "filesave", KIcon::Small ); m_modifiedPixmap = TDEGlobal::iconLoader()->loadIcon( "filesave", KIcon::Small );
m_unmodifiedPixmap = KGlobal::iconLoader()->loadIcon( "null", 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(modifiedStateChanged()), this, TQT_SLOT(slotModifiedStateChanged()) );
connect( view->document(), TQT_SIGNAL(fileNameChanged(const KURL& )), this, TQT_SLOT(slotFileNameChanged(const KURL& )) ); connect( view->document(), TQT_SIGNAL(fileNameChanged(const KURL& )), this, TQT_SLOT(slotFileNameChanged(const KURL& )) );

2
src/viewcontainer.cpp
Unescape View File

@ -386,7 +386,7 @@ ViewArea::ViewArea( TQWidget *parent, ViewContainer *viewContainer, int id, cons
if (id >= 0) if (id >= 0)
p_viewContainer->setViewAreaId( this, uint(id) ); p_viewContainer->setViewAreaId( this, uint(id) );
p_viewContainer->setIdUsed(id); p_viewContainer->setIdUsed(id);
setOpaqueResize(KGlobalSettings::opaqueResize()); setOpaqueResize(TDEGlobalSettings::opaqueResize());
} }

Write Preview
Loading…
Cancel
Save