TQt4 port kdegames

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegames@1236074 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 57 insertions, 57 deletions

diff --git a/libkdegames/kstdgameaction.cpp b/libkdegames/kstdgameaction.cpp
index f37af6cb..4eb54bba 100644
--- a/libkdegames/kstdgameaction.cpp
+++ b/libkdegames/kstdgameaction.cpp
@@ -33,10 +33,10 @@ KStdGameAction::~KStdGameAction()
 {}
 
 KAction *KStdGameAction::action(StdGameAction act_enum, const TQObject *recvr,
-                                const char *slot, KActionCollection *parent,
+                                const char *slot, KActionCollection *tqparent,
                                 const char *name)
 {
-    return create( act_enum, name, recvr, slot, parent );
+    return create( act_enum, name, recvr, slot, tqparent );
 }
 
 const char* KStdGameAction::stdName(StdGameAction act_enum)
@@ -64,18 +64,18 @@ const KStdGameActionInfo g_rgActionInfo[] = {
     { KStdGameAction::Save, KStdAccel::Save, 0, "game_save", I18N_NOOP("&Save"), 0, "filesave" },
     { KStdGameAction::SaveAs, KStdAccel::AccelNone, 0, "game_save_as", I18N_NOOP("Save &As..."), 0, "filesaveas" },
     { KStdGameAction::End, KStdAccel::End, 0, "game_end", I18N_NOOP("&End Game"), 0, "fileclose" },
-    { KStdGameAction::Pause, KStdAccel::AccelNone, Qt::Key_P, "game_pause", I18N_NOOP("Pa&use"), 0, "player_pause" },
-    { KStdGameAction::Highscores, KStdAccel::AccelNone, Qt::CTRL+Qt::Key_H, "game_highscores", I18N_NOOP("Show &Highscores"), 0, "highscore" },
+    { KStdGameAction::Pause, KStdAccel::AccelNone, TQt::Key_P, "game_pause", I18N_NOOP("Pa&use"), 0, "player_pause" },
+    { KStdGameAction::Highscores, KStdAccel::AccelNone, TQt::CTRL+TQt::Key_H, "game_highscores", I18N_NOOP("Show &Highscores"), 0, "highscore" },
     { KStdGameAction::Print, KStdAccel::Print, 0, "game_print", I18N_NOOP("&Print..."), 0, "fileprint" },
     { KStdGameAction::Quit, KStdAccel::Quit, 0, "game_quit", I18N_NOOP("&Quit"), 0, "exit" },
 // "move" menu
     { KStdGameAction::Repeat, KStdAccel::AccelNone, 0, "move_repeat", I18N_NOOP("Repeat"), 0, 0 },
     { KStdGameAction::Undo, KStdAccel::Undo, 0, "move_undo", I18N_NOOP("Und&o"), 0, "undo" },
     { KStdGameAction::Redo, KStdAccel::Redo, 0, "move_redo", I18N_NOOP("Re&do"), 0, "redo" },
-    { KStdGameAction::Roll, KStdAccel::AccelNone, Qt::CTRL+Qt::Key_R, "move_roll", I18N_NOOP("&Roll Dice"), 0, "roll" },
+    { KStdGameAction::Roll, KStdAccel::AccelNone, TQt::CTRL+TQt::Key_R, "move_roll", I18N_NOOP("&Roll Dice"), 0, "roll" },
     { KStdGameAction::EndTurn, KStdAccel::AccelNone, 0, "move_end_turn", I18N_NOOP("End Turn"), 0, "endturn" },
-    { KStdGameAction::Hint, KStdAccel::AccelNone, Qt::Key_H, "move_hint", I18N_NOOP("&Hint"), 0, "idea" },
-    { KStdGameAction::Demo, KStdAccel::AccelNone, Qt::Key_D, "move_demo", I18N_NOOP("&Demo"), 0, "1rightarrow" },
+    { KStdGameAction::Hint, KStdAccel::AccelNone, TQt::Key_H, "move_hint", I18N_NOOP("&Hint"), 0, "idea" },
+    { KStdGameAction::Demo, KStdAccel::AccelNone, TQt::Key_D, "move_demo", I18N_NOOP("&Demo"), 0, "1rightarrow" },
     { KStdGameAction::Solve, KStdAccel::AccelNone, 0, "move_solve", I18N_NOOP("&Solve"), 0, "wizard" },
 // "settings" menu
     { KStdGameAction::ChooseGameType, KStdAccel::AccelNone, 0, "options_choose_game_type", I18N_NOOP("Choose Game &Type"), 0, 0 },
@@ -97,11 +97,11 @@ static const KStdGameActionInfo* infoPtr( KStdGameAction::StdGameAction id )
 
 KAction* KStdGameAction::create(StdGameAction id, const char *name,
                                 const TQObject *recvr, const char *slot,
-                                KActionCollection* parent )
+                                KActionCollection* tqparent )
 {
 	KAction* pAction = 0;
 	const KStdGameActionInfo* pInfo = infoPtr( id );
-	kdDebug(125) << "KStdGameAction::create( " << id << "=" << (pInfo ? pInfo->psName : (const char*)0) << ", " << parent << ", " << name << " )" << endl;
+	kdDebug(125) << "KStdGameAction::create( " << id << "=" << (pInfo ? pInfo->psName : (const char*)0) << ", " << tqparent << ", " << name << " )" << endl;
 	if( pInfo ) {
 		TQString sLabel = i18n(pInfo->psLabel);
 		KShortcut cut = (pInfo->globalAccel==KStdAccel::AccelNone
@@ -111,20 +111,20 @@ KAction* KStdGameAction::create(StdGameAction id, const char *name,
 		switch( id ) {
         case LoadRecent:
             pAction =
-                new KRecentFilesAction(sLabel, cut, recvr, slot, parent, n);
+                new KRecentFilesAction(sLabel, cut, recvr, slot, tqparent, n);
             break;
         case Pause:
         case Demo:
 			pAction = new KToggleAction( sLabel, pInfo->psIconName, cut,
-                                         recvr, slot, parent, n);
+                                         recvr, slot, tqparent, n);
 			break;
         case ChooseGameType:
             pAction = new KSelectAction( sLabel, pInfo->psIconName, cut,
-                                         recvr, slot, parent, n);
+                                         recvr, slot, tqparent, n);
             break;
 		 default:
 			pAction = new KAction( sLabel, pInfo->psIconName, cut,
-                                   recvr, slot, parent, n);
+                                   recvr, slot, tqparent, n);
 			break;
 		}
 	}
@@ -138,72 +138,72 @@ const char* KStdGameAction::name( StdGameAction id )
 }
 
 KAction *KStdGameAction::gameNew(const TQObject *recvr, const char *slot,
-                             KActionCollection *parent, const char *name )
-{ return KStdGameAction::create(New, name, recvr, slot, parent); }
+                             KActionCollection *tqparent, const char *name )
+{ return KStdGameAction::create(New, name, recvr, slot, tqparent); }
 KAction *KStdGameAction::load(const TQObject *recvr, const char *slot,
-                              KActionCollection *parent, const char *name )
-{ return KStdGameAction::create(Load, name, recvr, slot, parent); }
+                              KActionCollection *tqparent, const char *name )
+{ return KStdGameAction::create(Load, name, recvr, slot, tqparent); }
 KRecentFilesAction *KStdGameAction::loadRecent(const TQObject *recvr, const char *slot,
-                                               KActionCollection *parent, const char *name )
-{ return static_cast<KRecentFilesAction *>(KStdGameAction::create(LoadRecent, name, recvr, slot, parent)); }
+                                               KActionCollection *tqparent, const char *name )
+{ return static_cast<KRecentFilesAction *>(KStdGameAction::create(LoadRecent, name, recvr, slot, tqparent)); }
 KAction *KStdGameAction::save(const TQObject *recvr, const char *slot,
-                              KActionCollection *parent, const char *name )
-{ return KStdGameAction::create(Save, name, recvr, slot, parent); }
+                              KActionCollection *tqparent, const char *name )
+{ return KStdGameAction::create(Save, name, recvr, slot, tqparent); }
 KAction *KStdGameAction::saveAs(const TQObject *recvr, const char *slot,
-                                KActionCollection *parent, const char *name )
-{ return KStdGameAction::create(SaveAs, name, recvr, slot, parent); }
+                                KActionCollection *tqparent, const char *name )
+{ return KStdGameAction::create(SaveAs, name, recvr, slot, tqparent); }
 KAction *KStdGameAction::end(const TQObject *recvr, const char *slot,
-                             KActionCollection *parent, const char *name )
-{ return KStdGameAction::create(End, name, recvr, slot, parent); }
+                             KActionCollection *tqparent, const char *name )
+{ return KStdGameAction::create(End, name, recvr, slot, tqparent); }
 KToggleAction *KStdGameAction::pause(const TQObject *recvr, const char *slot,
-                                     KActionCollection *parent, const char *name )
-{ return static_cast<KToggleAction *>(KStdGameAction::create(Pause, name, recvr, slot, parent)); }
+                                     KActionCollection *tqparent, const char *name )
+{ return static_cast<KToggleAction *>(KStdGameAction::create(Pause, name, recvr, slot, tqparent)); }
 KAction *KStdGameAction::highscores(const TQObject *recvr, const char *slot,
-                                    KActionCollection *parent, const char *name )
-{ return KStdGameAction::create(Highscores, name, recvr, slot, parent); }
+                                    KActionCollection *tqparent, const char *name )
+{ return KStdGameAction::create(Highscores, name, recvr, slot, tqparent); }
 KAction *KStdGameAction::print(const TQObject *recvr, const char *slot,
-                               KActionCollection *parent, const char *name )
-{ return KStdGameAction::create(Print, name, recvr, slot, parent); }
+                               KActionCollection *tqparent, const char *name )
+{ return KStdGameAction::create(Print, name, recvr, slot, tqparent); }
 KAction *KStdGameAction::quit(const TQObject *recvr, const char *slot,
-                              KActionCollection *parent, const char *name )
-{ return KStdGameAction::create(Quit, name, recvr, slot, parent); }
+                              KActionCollection *tqparent, const char *name )
+{ return KStdGameAction::create(Quit, name, recvr, slot, tqparent); }
 
 KAction *KStdGameAction::repeat(const TQObject *recvr, const char *slot,
-                                KActionCollection *parent, const char *name )
-{ return KStdGameAction::create(Repeat, name, recvr, slot, parent); }
+                                KActionCollection *tqparent, const char *name )
+{ return KStdGameAction::create(Repeat, name, recvr, slot, tqparent); }
 KAction *KStdGameAction::undo(const TQObject *recvr, const char *slot,
-                              KActionCollection *parent, const char *name )
-{ return KStdGameAction::create(Undo, name, recvr, slot, parent); }
+                              KActionCollection *tqparent, const char *name )
+{ return KStdGameAction::create(Undo, name, recvr, slot, tqparent); }
 
 KAction *KStdGameAction::redo(const TQObject *recvr, const char *slot,
-                              KActionCollection *parent, const char *name )
-{ return KStdGameAction::create(Redo, name, recvr, slot, parent); }
+                              KActionCollection *tqparent, const char *name )
+{ return KStdGameAction::create(Redo, name, recvr, slot, tqparent); }
 
 KAction *KStdGameAction::roll(const TQObject *recvr, const char *slot,
-                              KActionCollection *parent, const char *name )
-{ return KStdGameAction::create(Roll, name, recvr, slot, parent); }
+                              KActionCollection *tqparent, const char *name )
+{ return KStdGameAction::create(Roll, name, recvr, slot, tqparent); }
 KAction *KStdGameAction::endTurn(const TQObject *recvr, const char *slot,
-                                 KActionCollection *parent, const char *name )
-{ return KStdGameAction::create(EndTurn, name, recvr, slot, parent); }
+                                 KActionCollection *tqparent, const char *name )
+{ return KStdGameAction::create(EndTurn, name, recvr, slot, tqparent); }
 
 KAction *KStdGameAction::carddecks(const TQObject *recvr, const char *slot,
-                                   KActionCollection *parent, const char *name )
-{ return KStdGameAction::create(Carddecks, name, recvr, slot, parent); }
+                                   KActionCollection *tqparent, const char *name )
+{ return KStdGameAction::create(Carddecks, name, recvr, slot, tqparent); }
 KAction *KStdGameAction::configureHighscores(const TQObject*recvr, const char *slot,
-                                             KActionCollection *parent, const char *name)
-{ return KStdGameAction::create(ConfigureHighscores, name, recvr, slot, parent); }
+                                             KActionCollection *tqparent, const char *name)
+{ return KStdGameAction::create(ConfigureHighscores, name, recvr, slot, tqparent); }
 KAction *KStdGameAction::hint(const TQObject*recvr, const char *slot,
-                              KActionCollection *parent, const char *name)
-{ return KStdGameAction::create(Hint, name, recvr, slot, parent); }
+                              KActionCollection *tqparent, const char *name)
+{ return KStdGameAction::create(Hint, name, recvr, slot, tqparent); }
 KToggleAction *KStdGameAction::demo(const TQObject*recvr, const char *slot,
-                               KActionCollection *parent, const char *name)
-{ return static_cast<KToggleAction *>(KStdGameAction::create(Demo, name, recvr, slot, parent)); }
+                               KActionCollection *tqparent, const char *name)
+{ return static_cast<KToggleAction *>(KStdGameAction::create(Demo, name, recvr, slot, tqparent)); }
 KAction *KStdGameAction::solve(const TQObject*recvr, const char *slot,
-                               KActionCollection *parent, const char *name)
-{ return KStdGameAction::create(Solve, name, recvr, slot, parent); }
+                               KActionCollection *tqparent, const char *name)
+{ return KStdGameAction::create(Solve, name, recvr, slot, tqparent); }
 KSelectAction *KStdGameAction::chooseGameType(const TQObject*recvr, const char *slot,
-                                          KActionCollection *parent, const char *name)
-{ return static_cast<KSelectAction *>(KStdGameAction::create(ChooseGameType, name, recvr, slot, parent)); }
+                                          KActionCollection *tqparent, const char *name)
+{ return static_cast<KSelectAction *>(KStdGameAction::create(ChooseGameType, name, recvr, slot, tqparent)); }
 KAction *KStdGameAction::restart(const TQObject*recvr, const char *slot,
-                                 KActionCollection *parent, const char *name)
-{ return KStdGameAction::create(Restart, name, recvr, slot, parent); }
+                                 KActionCollection *tqparent, const char *name)
+{ return KStdGameAction::create(Restart, name, recvr, slot, tqparent); }