From deac2ca49faed824fe83066080714eb6d653615b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 15:13:01 -0600 Subject: Rename a number of classes to enhance compatibility with KDE4 --- tdeparts/tests/example.cpp | 16 ++++++++-------- tdeparts/tests/example.h | 6 +++--- tdeparts/tests/ghostview.cpp | 4 ++-- tdeparts/tests/normalktm.cpp | 10 +++++----- tdeparts/tests/normalktm.h | 8 ++++---- tdeparts/tests/notepad.cpp | 2 +- tdeparts/tests/parts.cpp | 2 +- tdeparts/tests/plugin_spellcheck.cpp | 2 +- 8 files changed, 25 insertions(+), 25 deletions(-) (limited to 'tdeparts/tests') diff --git a/tdeparts/tests/example.cpp b/tdeparts/tests/example.cpp index e8495ffe9..34a96a334 100644 --- a/tdeparts/tests/example.cpp +++ b/tdeparts/tests/example.cpp @@ -32,19 +32,19 @@ Shell::Shell() m_part1 = new Part1(this, m_splitter); m_part2 = new Part2(this, m_splitter); - KActionCollection *coll = actionCollection(); + TDEActionCollection *coll = actionCollection(); - (void)new KAction( "&View local file", 0, this, TQT_SLOT( slotFileOpen() ), coll, "open_local_file" ); - (void)new KAction( "&View remote file", 0, this, TQT_SLOT( slotFileOpenRemote() ), coll, "open_remote_file" ); + (void)new TDEAction( "&View local file", 0, this, TQT_SLOT( slotFileOpen() ), coll, "open_local_file" ); + (void)new TDEAction( "&View remote file", 0, this, TQT_SLOT( slotFileOpenRemote() ), coll, "open_remote_file" ); - m_paEditFile = new KAction( "&Edit file", 0, this, TQT_SLOT( slotFileEdit() ), coll, "edit_file" ); - m_paCloseEditor = new KAction( "&Close file editor", 0, this, TQT_SLOT( slotFileCloseEditor() ), coll, "close_editor" ); + m_paEditFile = new TDEAction( "&Edit file", 0, this, TQT_SLOT( slotFileEdit() ), coll, "edit_file" ); + m_paCloseEditor = new TDEAction( "&Close file editor", 0, this, TQT_SLOT( slotFileCloseEditor() ), coll, "close_editor" ); m_paCloseEditor->setEnabled(false); - KAction * paQuit = new KAction( "&Quit", 0, this, TQT_SLOT( close() ), coll, "shell_quit" ); + TDEAction * paQuit = new TDEAction( "&Quit", 0, this, TQT_SLOT( close() ), coll, "shell_quit" ); paQuit->setIconSet(TQIconSet(BarIcon("exit"))); - (void)new KAction( "Yet another menu item", 0, coll, "shell_yami" ); - (void)new KAction( "Yet another submenu item", 0, coll, "shell_yasmi" ); + (void)new TDEAction( "Yet another menu item", 0, coll, "shell_yami" ); + (void)new TDEAction( "Yet another submenu item", 0, coll, "shell_yasmi" ); setCentralWidget( m_splitter ); m_splitter->setMinimumSize( 400, 300 ); diff --git a/tdeparts/tests/example.h b/tdeparts/tests/example.h index b4bdead61..76541437d 100644 --- a/tdeparts/tests/example.h +++ b/tdeparts/tests/example.h @@ -5,7 +5,7 @@ #include #include -class KAction; +class TDEAction; class TQWidget; class Shell : public KParts::MainWindow @@ -26,8 +26,8 @@ protected: private: - KAction * m_paEditFile; - KAction * m_paCloseEditor; + TDEAction * m_paEditFile; + TDEAction * m_paCloseEditor; KParts::ReadOnlyPart *m_part1; KParts::Part *m_part2; diff --git a/tdeparts/tests/ghostview.cpp b/tdeparts/tests/ghostview.cpp index c94823aaf..c365bcfcb 100644 --- a/tdeparts/tests/ghostview.cpp +++ b/tdeparts/tests/ghostview.cpp @@ -20,10 +20,10 @@ Shell::Shell() { setXMLFile( "ghostviewtest_shell.rc" ); - KAction * paOpen = new KAction( "&Open file" , "fileopen", 0, this, + TDEAction * paOpen = new TDEAction( "&Open file" , "fileopen", 0, this, TQT_SLOT( slotFileOpen() ), actionCollection(), "file_open" ); - KAction * paQuit = new KAction( "&Quit" , "exit", 0, this, TQT_SLOT( close() ), actionCollection(), "file_quit" ); + TDEAction * paQuit = new TDEAction( "&Quit" , "exit", 0, this, TQT_SLOT( close() ), actionCollection(), "file_quit" ); // Try to find a postscript component first TDETrader::OfferList offers = TDETrader::self()->query("application/postscript", "('KParts/ReadOnlyPart' in ServiceTypes) or ('Browser/View' in ServiceTypes)"); diff --git a/tdeparts/tests/normalktm.cpp b/tdeparts/tests/normalktm.cpp index 277f3ccde..b3907402e 100644 --- a/tdeparts/tests/normalktm.cpp +++ b/tdeparts/tests/normalktm.cpp @@ -29,21 +29,21 @@ Shell::Shell() TQPopupMenu * pFile = new TQPopupMenu( this ); menuBar()->insertItem( "File", pFile ); TQObject * coll = this; - KAction * paLocal = new KAction( "&View local file", 0, this, TQT_SLOT( slotFileOpen() ), coll, "open_local_file" ); + TDEAction * paLocal = new TDEAction( "&View local file", 0, this, TQT_SLOT( slotFileOpen() ), coll, "open_local_file" ); // No XML : we need to plug our actions ourselves paLocal->plug( pFile ); - KAction * paRemote = new KAction( "&View remote file", 0, this, TQT_SLOT( slotFileOpenRemote() ), coll, "open_remote_file" ); + TDEAction * paRemote = new TDEAction( "&View remote file", 0, this, TQT_SLOT( slotFileOpenRemote() ), coll, "open_remote_file" ); paRemote->plug( pFile ); - m_paEditFile = new KAction( "&Edit file", 0, this, TQT_SLOT( slotFileEdit() ), coll, "edit_file" ); + m_paEditFile = new TDEAction( "&Edit file", 0, this, TQT_SLOT( slotFileEdit() ), coll, "edit_file" ); m_paEditFile->plug( pFile ); - m_paCloseEditor = new KAction( "&Close file editor", 0, this, TQT_SLOT( slotFileCloseEditor() ), coll, "close_editor" ); + m_paCloseEditor = new TDEAction( "&Close file editor", 0, this, TQT_SLOT( slotFileCloseEditor() ), coll, "close_editor" ); m_paCloseEditor->setEnabled(false); m_paCloseEditor->plug( pFile ); - KAction * paQuit = new KAction( "&Quit", 0, this, TQT_SLOT( close() ), coll, "shell_quit" ); + TDEAction * paQuit = new TDEAction( "&Quit", 0, this, TQT_SLOT( close() ), coll, "shell_quit" ); paQuit->setIconSet(TQIconSet(BarIcon("exit"))); paQuit->plug( pFile ); diff --git a/tdeparts/tests/normalktm.h b/tdeparts/tests/normalktm.h index 26a93a52a..7183690f0 100644 --- a/tdeparts/tests/normalktm.h +++ b/tdeparts/tests/normalktm.h @@ -5,10 +5,10 @@ #include #include -class KAction; +class TDEAction; class TQWidget; -class Shell : public KMainWindow +class Shell : public TDEMainWindow { Q_OBJECT public: @@ -26,8 +26,8 @@ protected: private: - KAction * m_paEditFile; - KAction * m_paCloseEditor; + TDEAction * m_paEditFile; + TDEAction * m_paCloseEditor; KParts::ReadOnlyPart *m_part1; KParts::Part *m_part2; diff --git a/tdeparts/tests/notepad.cpp b/tdeparts/tests/notepad.cpp index 6494288cd..f2b43ccda 100644 --- a/tdeparts/tests/notepad.cpp +++ b/tdeparts/tests/notepad.cpp @@ -26,7 +26,7 @@ NotepadPart::NotepadPart( TQWidget* parentWidget, const char*, m_edit = new TQMultiLineEdit( parentWidget, "NotepadPart's multiline edit" ); setWidget( m_edit ); - (void)new KAction( "Search and replace", 0, this, TQT_SLOT( slotSearchReplace() ), actionCollection(), "searchreplace" ); + (void)new TDEAction( "Search and replace", 0, this, TQT_SLOT( slotSearchReplace() ), actionCollection(), "searchreplace" ); setXMLFile( "notepadpart.rc" ); setReadWrite( true ); } diff --git a/tdeparts/tests/parts.cpp b/tdeparts/tests/parts.cpp index 2fc63c225..f41063ef9 100644 --- a/tdeparts/tests/parts.cpp +++ b/tdeparts/tests/parts.cpp @@ -27,7 +27,7 @@ Part1::Part1( TQObject *parent, TQWidget * parentWidget ) setWidget( m_edit ); setXMLFile( "tdepartstest_part1.rc" ); - /*KAction * paBlah = */ new KAction( "Blah", "filemail", 0, actionCollection(), "p1_blah" ); + /*TDEAction * paBlah = */ new TDEAction( "Blah", "filemail", 0, actionCollection(), "p1_blah" ); } Part1::~Part1() diff --git a/tdeparts/tests/plugin_spellcheck.cpp b/tdeparts/tests/plugin_spellcheck.cpp index 5521bf22f..dcdf33312 100644 --- a/tdeparts/tests/plugin_spellcheck.cpp +++ b/tdeparts/tests/plugin_spellcheck.cpp @@ -11,7 +11,7 @@ PluginSpellCheck::PluginSpellCheck( TQObject* parent, const char* name, const TQStringList& ) : Plugin( parent, name ) { - (void) new KAction( "&Select current line (plugin)", 0, this, TQT_SLOT(slotSpellCheck()), + (void) new TDEAction( "&Select current line (plugin)", 0, this, TQT_SLOT(slotSpellCheck()), actionCollection(), "spellcheck" ); } -- cgit v1.2.1