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

6 files changed, 19 insertions, 19 deletions

diff --git a/src/kjtagdialog.cpp b/src/kjtagdialog.cpp
index 329a77a..2ab8008 100644
--- a/src/kjtagdialog.cpp
+++ b/src/kjtagdialog.cpp
@@ -34,7 +34,7 @@ KJTAGDialog::KJTAGDialog( TQWidget *parent )
 	m_selectFileBtn  = new TQPushButton( m_groupConfigure ) ;
 	m_selectFileBtn->setFixedSize( 30, 25 ) ;
 	m_selectFileBtn->move( 205, 15 ) ;
-	m_selectFileBtn->setPixmap( KGlobal::iconLoader()->loadIcon( "fileopen", KIcon::Small ) ) ;
+	m_selectFileBtn->setPixmap( TDEGlobal::iconLoader()->loadIcon( "fileopen", KIcon::Small ) ) ;
 	connect( m_selectFileBtn, TQT_SIGNAL( clicked() ), this, TQT_SLOT( selectFileName() ) ) ;
 
 	m_configureBtn = new TQPushButton( "Configure", m_groupConfigure ) ;
diff --git a/src/kpicosim.cpp b/src/kpicosim.cpp
index 7b36768..569f8e8 100755
--- a/src/kpicosim.cpp
+++ b/src/kpicosim.cpp
@@ -109,7 +109,7 @@ KPicoSim::KPicoSim() : KMainWindow( 0, "KPicoSim" )
 	m_editor = new CodeEditor( m_tabWidget ) ;
 	m_messages = new KListView( m_splitter, "messages" ) ;
 	m_simulator = new KSimulator( TQT_TQOBJECT(this) ) ;
-	m_processorView = new KProcessorView( this ) ;
+	m_processorView = new TDEProcessorView( this ) ;
 
 	m_tabWidget->addTab( m_editor, "Source" ) ;
 	addDockWindow( m_processorView, DockLeft ) ;
@@ -172,7 +172,7 @@ KPicoSim::KPicoSim() : KMainWindow( 0, "KPicoSim" )
 
 void KPicoSim::buildMenu()
 {
-	KIconLoader * ldr = KGlobal::iconLoader() ;
+	KIconLoader * ldr = TDEGlobal::iconLoader() ;
 
 	KPopupMenu * exportMenu = new KPopupMenu( this ) ;
 
@@ -533,7 +533,7 @@ bool KPicoSim::compile()
 
 void KPicoSim::startSim()
 {
-	KIconLoader * ldr = KGlobal::iconLoader() ;
+	KIconLoader * ldr = TDEGlobal::iconLoader() ;
 
 	if ( !m_simulationMode ) {
 		if ( compile() ) {
diff --git a/src/kpicosim.h b/src/kpicosim.h
index dd3c0d4..94022b9 100755
--- a/src/kpicosim.h
+++ b/src/kpicosim.h
@@ -52,7 +52,7 @@ class KPicoSim : public KMainWindow
 		CodeEditor * m_editor ;
 		KListView * m_messages ;		
 		TQSplitter * m_splitter ;
-		KProcessorView * m_processorView ;
+		TDEProcessorView * m_processorView ;
 		KSerialView *m_serialView ;
 		KScratchpadView *m_scratchpadView ;
 		TQTabWidget *m_tabWidget ;
diff --git a/src/kprocessorview.cpp b/src/kprocessorview.cpp
index 3a238ec..4ba12d9 100755
--- a/src/kprocessorview.cpp
+++ b/src/kprocessorview.cpp
@@ -35,7 +35,7 @@ void MyListView::mousePressEvent( TQMouseEvent * event )
 }
 */
 
-KProcessorView::KProcessorView(TQWidget *parent, const char *name)
+TDEProcessorView::TDEProcessorView(TQWidget *parent, const char *name)
  : KToolBar(parent)
 {
 	name = name ; // avoid compiler warning
@@ -92,7 +92,7 @@ KProcessorView::KProcessorView(TQWidget *parent, const char *name)
 	m_bHexMode = false ;
 }
 
-void KProcessorView::slotHexMode()
+void TDEProcessorView::slotHexMode()
 {
 	unsigned char regs[ 16 ] ;
 
@@ -101,7 +101,7 @@ void KProcessorView::slotHexMode()
 	setRegisterValues(regs) ;
 }
 
-void KProcessorView::showPopupMenu() 
+void TDEProcessorView::showPopupMenu() 
 {
 	TQPopupMenu *menu = new TQPopupMenu( this ) ;
 	menu->insertItem( "Hexadecimal", this, TQT_SLOT( slotHexMode() ), 0, 1 ) ;
@@ -109,7 +109,7 @@ void KProcessorView::showPopupMenu()
 	menu->exec( TQCursor::pos() );
 }
 
-void KProcessorView::slotItemRenamed( TQListViewItem * item )
+void TDEProcessorView::slotItemRenamed( TQListViewItem * item )
 {
 	int i, value, base ;
 	bool ok ;
@@ -143,13 +143,13 @@ void KProcessorView::slotItemRenamed( TQListViewItem * item )
 	}
 }
 
-void KProcessorView::resizeEvent( TQResizeEvent *event )
+void TDEProcessorView::resizeEvent( TQResizeEvent *event )
 {
 	event = event ;
 //	view->resize( width() - 10, height() - 10 ) ;
 }
 
-void KProcessorView::getRegisterValues( unsigned char *values )
+void TDEProcessorView::getRegisterValues( unsigned char *values )
 {
 	int i, base ;
 	bool ok ;
@@ -162,7 +162,7 @@ void KProcessorView::getRegisterValues( unsigned char *values )
 	}
 }
 
-void KProcessorView::setRegisterValues( unsigned char *values )
+void TDEProcessorView::setRegisterValues( unsigned char *values )
 {
 	int i, base ;
 		
@@ -176,7 +176,7 @@ void KProcessorView::setRegisterValues( unsigned char *values )
 	}
 }
 		
-void KProcessorView::setFlags( unsigned char flags )
+void TDEProcessorView::setFlags( unsigned char flags )
 {
 	if ( flags & 0x01 ) zeroFlag->setText( 1, "1" ) ;
 	else                zeroFlag->setText( 1, "0" ) ;
@@ -188,7 +188,7 @@ void KProcessorView::setFlags( unsigned char flags )
 	else                ieFlag->setText( 1, "0" ) ;
 } 
 
-unsigned char KProcessorView::getFlags() 
+unsigned char TDEProcessorView::getFlags() 
 {
 	unsigned char flags = 0 ;
 		
@@ -199,7 +199,7 @@ unsigned char KProcessorView::getFlags()
 	return flags ;
 }
 
-KProcessorView::~KProcessorView()
+TDEProcessorView::~TDEProcessorView()
 {
 	delete view ;
 }
diff --git a/src/kprocessorview.h b/src/kprocessorview.h
index ff7a4e1..05c95b4 100755
--- a/src/kprocessorview.h
+++ b/src/kprocessorview.h
@@ -27,13 +27,13 @@ class MyListView : public KListView
 } ;
 
 
-class KProcessorView : public KToolBar
+class TDEProcessorView : public KToolBar
 {
 	Q_OBJECT
   
 	public:
-    	KProcessorView(TQWidget *parent = 0, const char *name = 0);
-    	~KProcessorView();
+    	TDEProcessorView(TQWidget *parent = 0, const char *name = 0);
+    	~TDEProcessorView();
 	
 		void setRegisterValues( unsigned char *values ) ;
 		void getRegisterValues( unsigned char *values ) ;
diff --git a/src/kserialview.h b/src/kserialview.h
index 54f3e94..d43565a 100755
--- a/src/kserialview.h
+++ b/src/kserialview.h
@@ -40,7 +40,7 @@ class KSerialWindow : public KTextEdit
 			setWrapColumnOrWidth( 80 ) ; 				// Serial window is a terminal
 			setWrapPolicy( TQTextEdit::Anywhere ) ;
 			setWordWrap( TQTextEdit::FixedColumnWidth ) ; 
-			setFont( KGlobalSettings::fixedFont()  ) ;  // Use default fixed font
+			setFont( TDEGlobalSettings::fixedFont()  ) ;  // Use default fixed font
 		}
 		virtual ~KSerialWindow() {} ;