diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:25:21 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:25:21 -0600 |
| commit | b0a967eb693adc458fdf7d070379b8c1ec3e9415 (patch) | |
| tree | 69fa22da8d08920ca8b1049861711e77a55512b9 /src/electronics | |
| parent | a19dd7fc8e64bebb22b87a2d3a9a2601b662b35d (diff) | |
| download | ktechlab-b0a967eb693adc458fdf7d070379b8c1ec3e9415.tar.gz ktechlab-b0a967eb693adc458fdf7d070379b8c1ec3e9415.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'src/electronics')
| -rw-r--r-- | src/electronics/components/piccomponent.cpp | 8 | ||||
| -rw-r--r-- | src/electronics/subcircuits.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
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 ); } |