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

pull/1/head
Timothy Pearson 12 years ago
parent fddc4a34b2
commit 1b2c2a6009

@ -34,7 +34,7 @@ KJTAGDialog::KJTAGDialog( TQWidget *parent )
m_selectFileBtn = new TQPushButton( m_groupConfigure ) ; m_selectFileBtn = new TQPushButton( m_groupConfigure ) ;
m_selectFileBtn->setFixedSize( 30, 25 ) ; m_selectFileBtn->setFixedSize( 30, 25 ) ;
m_selectFileBtn->move( 205, 15 ) ; 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() ) ) ; connect( m_selectFileBtn, TQT_SIGNAL( clicked() ), this, TQT_SLOT( selectFileName() ) ) ;
m_configureBtn = new TQPushButton( "Configure", m_groupConfigure ) ; m_configureBtn = new TQPushButton( "Configure", m_groupConfigure ) ;

@ -109,7 +109,7 @@ KPicoSim::KPicoSim() : KMainWindow( 0, "KPicoSim" )
m_editor = new CodeEditor( m_tabWidget ) ; m_editor = new CodeEditor( m_tabWidget ) ;
m_messages = new KListView( m_splitter, "messages" ) ; m_messages = new KListView( m_splitter, "messages" ) ;
m_simulator = new KSimulator( TQT_TQOBJECT(this) ) ; m_simulator = new KSimulator( TQT_TQOBJECT(this) ) ;
m_processorView = new KProcessorView( this ) ; m_processorView = new TDEProcessorView( this ) ;
m_tabWidget->addTab( m_editor, "Source" ) ; m_tabWidget->addTab( m_editor, "Source" ) ;
addDockWindow( m_processorView, DockLeft ) ; addDockWindow( m_processorView, DockLeft ) ;
@ -172,7 +172,7 @@ KPicoSim::KPicoSim() : KMainWindow( 0, "KPicoSim" )
void KPicoSim::buildMenu() void KPicoSim::buildMenu()
{ {
KIconLoader * ldr = KGlobal::iconLoader() ; KIconLoader * ldr = TDEGlobal::iconLoader() ;
KPopupMenu * exportMenu = new KPopupMenu( this ) ; KPopupMenu * exportMenu = new KPopupMenu( this ) ;
@ -533,7 +533,7 @@ bool KPicoSim::compile()
void KPicoSim::startSim() void KPicoSim::startSim()
{ {
KIconLoader * ldr = KGlobal::iconLoader() ; KIconLoader * ldr = TDEGlobal::iconLoader() ;
if ( !m_simulationMode ) { if ( !m_simulationMode ) {
if ( compile() ) { if ( compile() ) {

@ -52,7 +52,7 @@ class KPicoSim : public KMainWindow
CodeEditor * m_editor ; CodeEditor * m_editor ;
KListView * m_messages ; KListView * m_messages ;
TQSplitter * m_splitter ; TQSplitter * m_splitter ;
KProcessorView * m_processorView ; TDEProcessorView * m_processorView ;
KSerialView *m_serialView ; KSerialView *m_serialView ;
KScratchpadView *m_scratchpadView ; KScratchpadView *m_scratchpadView ;
TQTabWidget *m_tabWidget ; TQTabWidget *m_tabWidget ;

@ -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) : KToolBar(parent)
{ {
name = name ; // avoid compiler warning name = name ; // avoid compiler warning
@ -92,7 +92,7 @@ KProcessorView::KProcessorView(TQWidget *parent, const char *name)
m_bHexMode = false ; m_bHexMode = false ;
} }
void KProcessorView::slotHexMode() void TDEProcessorView::slotHexMode()
{ {
unsigned char regs[ 16 ] ; unsigned char regs[ 16 ] ;
@ -101,7 +101,7 @@ void KProcessorView::slotHexMode()
setRegisterValues(regs) ; setRegisterValues(regs) ;
} }
void KProcessorView::showPopupMenu() void TDEProcessorView::showPopupMenu()
{ {
TQPopupMenu *menu = new TQPopupMenu( this ) ; TQPopupMenu *menu = new TQPopupMenu( this ) ;
menu->insertItem( "Hexadecimal", this, TQT_SLOT( slotHexMode() ), 0, 1 ) ; menu->insertItem( "Hexadecimal", this, TQT_SLOT( slotHexMode() ), 0, 1 ) ;
@ -109,7 +109,7 @@ void KProcessorView::showPopupMenu()
menu->exec( TQCursor::pos() ); menu->exec( TQCursor::pos() );
} }
void KProcessorView::slotItemRenamed( TQListViewItem * item ) void TDEProcessorView::slotItemRenamed( TQListViewItem * item )
{ {
int i, value, base ; int i, value, base ;
bool ok ; bool ok ;
@ -143,13 +143,13 @@ void KProcessorView::slotItemRenamed( TQListViewItem * item )
} }
} }
void KProcessorView::resizeEvent( TQResizeEvent *event ) void TDEProcessorView::resizeEvent( TQResizeEvent *event )
{ {
event = event ; event = event ;
// view->resize( width() - 10, height() - 10 ) ; // view->resize( width() - 10, height() - 10 ) ;
} }
void KProcessorView::getRegisterValues( unsigned char *values ) void TDEProcessorView::getRegisterValues( unsigned char *values )
{ {
int i, base ; int i, base ;
bool ok ; 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 ; 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" ) ; if ( flags & 0x01 ) zeroFlag->setText( 1, "1" ) ;
else zeroFlag->setText( 1, "0" ) ; else zeroFlag->setText( 1, "0" ) ;
@ -188,7 +188,7 @@ void KProcessorView::setFlags( unsigned char flags )
else ieFlag->setText( 1, "0" ) ; else ieFlag->setText( 1, "0" ) ;
} }
unsigned char KProcessorView::getFlags() unsigned char TDEProcessorView::getFlags()
{ {
unsigned char flags = 0 ; unsigned char flags = 0 ;
@ -199,7 +199,7 @@ unsigned char KProcessorView::getFlags()
return flags ; return flags ;
} }
KProcessorView::~KProcessorView() TDEProcessorView::~TDEProcessorView()
{ {
delete view ; delete view ;
} }

@ -27,13 +27,13 @@ class MyListView : public KListView
} ; } ;
class KProcessorView : public KToolBar class TDEProcessorView : public KToolBar
{ {
Q_OBJECT Q_OBJECT
public: public:
KProcessorView(TQWidget *parent = 0, const char *name = 0); TDEProcessorView(TQWidget *parent = 0, const char *name = 0);
~KProcessorView(); ~TDEProcessorView();
void setRegisterValues( unsigned char *values ) ; void setRegisterValues( unsigned char *values ) ;
void getRegisterValues( unsigned char *values ) ; void getRegisterValues( unsigned char *values ) ;

@ -40,7 +40,7 @@ class KSerialWindow : public KTextEdit
setWrapColumnOrWidth( 80 ) ; // Serial window is a terminal setWrapColumnOrWidth( 80 ) ; // Serial window is a terminal
setWrapPolicy( TQTextEdit::Anywhere ) ; setWrapPolicy( TQTextEdit::Anywhere ) ;
setWordWrap( TQTextEdit::FixedColumnWidth ) ; setWordWrap( TQTextEdit::FixedColumnWidth ) ;
setFont( KGlobalSettings::fixedFont() ) ; // Use default fixed font setFont( TDEGlobalSettings::fixedFont() ) ; // Use default fixed font
} }
virtual ~KSerialWindow() {} ; virtual ~KSerialWindow() {} ;

Loading…
Cancel
Save