From 74b3ea38c5a98cbc73839d9ef4590708f2515cee Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 15:03:47 -0600 Subject: Rename a number of classes to enhance compatibility with KDE4 --- src/kpicosim.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'src/kpicosim.cpp') diff --git a/src/kpicosim.cpp b/src/kpicosim.cpp index c47fd2f..8bd0dc4 100755 --- a/src/kpicosim.cpp +++ b/src/kpicosim.cpp @@ -99,7 +99,7 @@ enum IDs { } ; -KPicoSim::KPicoSim() : KMainWindow( 0, "KPicoSim" ) +KPicoSim::KPicoSim() : TDEMainWindow( 0, "KPicoSim" ) { // set the shell's ui resource file // setXMLFile("kpicosimui.rc"); @@ -107,7 +107,7 @@ KPicoSim::KPicoSim() : KMainWindow( 0, "KPicoSim" ) m_splitter = new TQSplitter( this ) ; m_tabWidget = new TQTabWidget( m_splitter ) ; m_editor = new CodeEditor( m_tabWidget ) ; - m_messages = new KListView( m_splitter, "messages" ) ; + m_messages = new TDEListView( m_splitter, "messages" ) ; m_simulator = new KSimulator( TQT_TQOBJECT(this) ) ; m_processorView = new TDEProcessorView( this ) ; @@ -122,7 +122,7 @@ KPicoSim::KPicoSim() : KMainWindow( 0, "KPicoSim" ) buildMenu() ; - KToolBar *toolbar = new KToolBar( this ) ; + TDEToolBar *toolbar = new TDEToolBar( this ) ; addDockWindow( toolbar ) ; toolbar->insertButton( "filenew", -1, TQT_SIGNAL( clicked() ), TQT_TQOBJECT(m_editor), TQT_SLOT( slotNewFile() ), true, "New" ) ; @@ -130,7 +130,7 @@ KPicoSim::KPicoSim() : KMainWindow( 0, "KPicoSim" ) toolbar->insertButton( "filesave", -1, TQT_SIGNAL( clicked() ), TQT_TQOBJECT(m_editor), TQT_SLOT( slotSave() ), true, "Save" ) ; toolbar->insertButton( "filesaveas", -1, TQT_SIGNAL( clicked() ), TQT_TQOBJECT(m_editor), TQT_SLOT( slotSaveAs() ), true, "Save As" ) ; - m_debugBar = new KToolBar( this ) ; + m_debugBar = new TDEToolBar( this ) ; addDockWindow( m_debugBar ) ; m_debugBar->insertButton( UserIcon( "rebuild" ), COMPILE_ID, TQT_SIGNAL( clicked() ), TQT_TQOBJECT(this), TQT_SLOT( compile() ), true, "Compile" ) ; m_debugBar->insertButton( "run", START_SIM_ID, TQT_SIGNAL( clicked() ), TQT_TQOBJECT(this), TQT_SLOT( startSim() ), true, "Start/Stop Debug" ) ; @@ -174,14 +174,14 @@ void KPicoSim::buildMenu() { KIconLoader * ldr = TDEGlobal::iconLoader() ; - KPopupMenu * exportMenu = new KPopupMenu( this ) ; + TDEPopupMenu * exportMenu = new TDEPopupMenu( this ) ; exportMenu->insertItem( "VHDL", TQT_TQOBJECT(this), TQT_SLOT( fileExportVHDL() ) ) ; // exportMenu->insertItem( "COE", TQT_TQOBJECT(this), TQT_SLOT( fileExportCOE() ) ) ; exportMenu->insertItem( "MEM", TQT_TQOBJECT(this), TQT_SLOT( fileExportMEM() ) ) ; exportMenu->insertItem( "HEX", TQT_TQOBJECT(this), TQT_SLOT( fileExportHEX() ) ) ; - m_fileMenu = new KPopupMenu( this ) ; + m_fileMenu = new TDEPopupMenu( this ) ; m_fileMenu->insertItem( ldr->loadIcon( "filenew", KIcon::Small ), "New", TQT_TQOBJECT(this), TQT_SLOT( slotFileNew() ) ) ; m_fileMenu->insertItem( ldr->loadIcon( "fileopen", KIcon::Small ), "Open", TQT_TQOBJECT(m_editor), TQT_SLOT( slotOpen() ) ) ; m_fileMenu->insertSeparator() ; @@ -194,7 +194,7 @@ void KPicoSim::buildMenu() m_fileMenu->insertSeparator() ; m_fileMenu->insertItem( ldr->loadIcon( "fileclose", KIcon::Small ), "Quit", TQT_TQOBJECT(this), TQT_SLOT( slotClose() ) ) ; - m_editMenu = new KPopupMenu( this ) ; + m_editMenu = new TDEPopupMenu( this ) ; m_editMenu->insertItem( ldr->loadIcon( "undo", KIcon::Small ), "Undo", TQT_TQOBJECT(m_editor), TQT_SLOT( slotUndo() ),TQKeySequence( "CTRL+Z" ) ) ; m_editMenu->insertItem( ldr->loadIcon( "redo", KIcon::Small ), "Redo", TQT_TQOBJECT(m_editor), TQT_SLOT( slotRedo() ),TQKeySequence( "CTRL+SHIFT+Z" ) ) ; m_editMenu->insertSeparator() ; @@ -208,7 +208,7 @@ void KPicoSim::buildMenu() m_editMenu->insertItem( "Find Next", TQT_TQOBJECT(m_editor), TQT_SLOT( slotFindNext() ), TQKeySequence( "F3" ) ) ; - m_debugMenu = new KPopupMenu( this ) ; + m_debugMenu = new TDEPopupMenu( this ) ; m_debugMenu->insertSeparator() ; m_debugMenu->insertItem( ldr->loadIcon( "rebuild", KIcon::Small ), "Compile", TQT_TQOBJECT(this), TQT_SLOT( compile() ), TQKeySequence( "SHIFT+F9" ) ) ; m_debugMenu->insertItem( ldr->loadIcon( "run", KIcon::Small ), "Start Debug", TQT_TQOBJECT(this), TQT_SLOT( startSim() ), TQKeySequence( "F9" ) , START_SIM_ID ) ; @@ -222,15 +222,15 @@ void KPicoSim::buildMenu() m_debugMenu->insertSeparator() ; m_debugMenu->insertItem( "Toggle Breakpoint", TQT_TQOBJECT(m_editor), TQT_SLOT( slotToggleBreakpoint() ), TQKeySequence( "F8" ) ) ; - m_settingsMenu = new KPopupMenu( this ) ; + m_settingsMenu = new TDEPopupMenu( this ) ; m_settingsMenu->insertItem( "Configure Editor...", TQT_TQOBJECT(m_editor), TQT_SLOT( slotShowConfig() ) ) ; - m_peripheralMenu = new KPopupMenu( this ) ; + m_peripheralMenu = new TDEPopupMenu( this ) ; m_peripheralMenu->insertItem( "I/O Port", TQT_TQOBJECT(this), TQT_SLOT( newIOPort() ) ) ; m_peripheralMenu->insertItem( "Scratchpad", TQT_TQOBJECT(this), TQT_SLOT( showScratchpad() ), 0, VIEW_SCRATCHPAD_ID ) ; m_peripheralMenu->insertItem( "Serial port", TQT_TQOBJECT(this), TQT_SLOT( showSerialPort() ), 0, VIEW_SERIAL_ID ) ; - m_jtagMenu = new KPopupMenu( this ) ; + m_jtagMenu = new TDEPopupMenu( this ) ; m_jtagMenu->insertItem( "Download", TQT_TQOBJECT(this), TQT_SLOT( jtagDownload() ) ) ; TDEAboutData *aboutData = new TDEAboutData( @@ -247,7 +247,7 @@ void KPicoSim::buildMenu() aboutData->addAuthor( "Mark Six", "m6@xs4all.nl", "http://www.xs4all.nl/~marksix" ) ; KHelpMenu *helpMenu = new KHelpMenu( this, aboutData, false ) ; - KPopupMenu *help = helpMenu->menu() ; + TDEPopupMenu *help = helpMenu->menu() ; menuBar()->insertItem( "File", m_fileMenu ) ; menuBar()->insertItem( "Edit", m_editMenu ) ; -- cgit v1.2.1