TDE
/
kmplayer
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kmplayer
0
0
Fork 0
Code Issues Releases Wiki Activity

Remove various '#define' strings - part 6

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/15/head
Michele Calgaro 12 months ago
parent 30650e19e3
commit c8a3b81b3c
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
6 changed files with 96 additions and 96 deletions
Show Stats Download Patch File Download Diff File

174
src/kmplayerapp.cpp
Unescape View File

@ -516,8 +516,8 @@ KDE_NO_CDTOR_EXPORT KMPlayerApp::KMPlayerApp(TQWidget* , const char* name)
m_minimal_mode (false) m_minimal_mode (false)
{ {
setCentralWidget (m_view); setCentralWidget (m_view);
connect (m_broadcastconfig, TQT_SIGNAL (broadcastStarted()), TQT_TQOBJECT(this), TQT_SLOT (broadcastStarted())); connect (m_broadcastconfig, TQT_SIGNAL (broadcastStarted()), this, TQT_SLOT (broadcastStarted()));
connect (m_broadcastconfig, TQT_SIGNAL (broadcastStopped()), TQT_TQOBJECT(this), TQT_SLOT (broadcastStopped())); connect (m_broadcastconfig, TQT_SIGNAL (broadcastStopped()), this, TQT_SLOT (broadcastStopped()));
initStatusBar(); initStatusBar();
#ifdef HAVE_DBUS #ifdef HAVE_DBUS
m_player->setServiceName (TQString ("org.kde.kmplayer-%1").arg (getpid ())); m_player->setServiceName (TQString ("org.kde.kmplayer-%1").arg (getpid ()));
@ -554,7 +554,7 @@ KDE_NO_CDTOR_EXPORT KMPlayerApp::KMPlayerApp(TQWidget* , const char* name)
kdDebug() << "Window manager: TWin found" << endl; kdDebug() << "Window manager: TWin found" << endl;
else else
kdDebug() << "Window manager: not TWin - using save fullscreen mode" << endl; kdDebug() << "Window manager: not TWin - using save fullscreen mode" << endl;
connect(&m_screensaverTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(slotFakeKeyEvent())); connect(&m_screensaverTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotFakeKeyEvent()));
m_screensaverTimer.start( 55000 ); m_screensaverTimer.start( 55000 );
//setAutoSaveSettings(); //setAutoSaveSettings();
@ -574,48 +574,48 @@ KDE_NO_CDTOR_EXPORT KMPlayerApp::~KMPlayerApp () {
KDE_NO_EXPORT void KMPlayerApp::initActions () { KDE_NO_EXPORT void KMPlayerApp::initActions () {
TDEActionCollection * ac = actionCollection (); TDEActionCollection * ac = actionCollection ();
fileNewWindow = new TDEAction(i18n("New &Window"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileNewWindow()), ac, "new_window"); fileNewWindow = new TDEAction(i18n("New &Window"), 0, 0, this, TQT_SLOT(slotFileNewWindow()), ac, "new_window");
fileOpen = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpen()), ac, "open"); fileOpen = KStdAction::open(this, TQT_SLOT(slotFileOpen()), ac, "open");
fileOpenRecent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpenRecent(const KURL&)), ac, "open_recent"); fileOpenRecent = KStdAction::openRecent(this, TQT_SLOT(slotFileOpenRecent(const KURL&)), ac, "open_recent");
KStdAction::saveAs (TQT_TQOBJECT(this), TQT_SLOT (slotSaveAs ()), ac, "save_as"); KStdAction::saveAs (this, TQT_SLOT (slotSaveAs ()), ac, "save_as");
new TDEAction (i18n ("Clear &History"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT (slotClearHistory ()), ac, "clear_history"); new TDEAction (i18n ("Clear &History"), 0, 0, this, TQT_SLOT (slotClearHistory ()), ac, "clear_history");
fileClose = KStdAction::close (TQT_TQOBJECT(this), TQT_SLOT (slotFileClose ()), ac); fileClose = KStdAction::close (this, TQT_SLOT (slotFileClose ()), ac);
fileQuit = KStdAction::quit (TQT_TQOBJECT(this), TQT_SLOT (slotFileQuit ()), ac); fileQuit = KStdAction::quit (this, TQT_SLOT (slotFileQuit ()), ac);
new TDEAction (i18n ("&Open DVD"), TQString ("media-optical-dvd-mounted"), TDEShortcut (), TQT_TQOBJECT(this), TQT_SLOT(openDVD ()), ac, "opendvd"); new TDEAction (i18n ("&Open DVD"), TQString ("media-optical-dvd-mounted"), TDEShortcut (), this, TQT_SLOT(openDVD ()), ac, "opendvd");
new TDEAction (i18n ("&Open VCD"), TQString ("media-optical-cdrom-mounted"), TDEShortcut (), TQT_TQOBJECT(this), TQT_SLOT(openVCD ()), ac, "openvcd"); new TDEAction (i18n ("&Open VCD"), TQString ("media-optical-cdrom-mounted"), TDEShortcut (), this, TQT_SLOT(openVCD ()), ac, "openvcd");
new TDEAction (i18n ("&Open Audio CD"), TQString ("media-optical-cdrom-mounted"), TDEShortcut (), TQT_TQOBJECT(this), TQT_SLOT(openAudioCD ()), ac, "openaudiocd"); new TDEAction (i18n ("&Open Audio CD"), TQString ("media-optical-cdrom-mounted"), TDEShortcut (), this, TQT_SLOT(openAudioCD ()), ac, "openaudiocd");
new TDEAction (i18n ("&Open Pipe..."), TQString ("pipe"), TDEShortcut (), TQT_TQOBJECT(this), TQT_SLOT(openPipe ()), ac, "source_pipe"); new TDEAction (i18n ("&Open Pipe..."), TQString ("pipe"), TDEShortcut (), this, TQT_SLOT(openPipe ()), ac, "source_pipe");
//TDEGlobal::iconLoader ()->loadIconSet (TQString ("tv"), TDEIcon::Small, 0,true) //TDEGlobal::iconLoader ()->loadIconSet (TQString ("tv"), TDEIcon::Small, 0,true)
new TDEAction (i18n ("&Connect"), TQString ("connect_established"), TDEShortcut (), TQT_TQOBJECT(this), TQT_SLOT (openVDR ()), ac, "vdr_connect"); new TDEAction (i18n ("&Connect"), TQString ("connect_established"), TDEShortcut (), this, TQT_SLOT (openVDR ()), ac, "vdr_connect");
editVolumeInc = new TDEAction (i18n ("Increase Volume"), TQString ("player_volume"), TDEShortcut (), m_player, TQT_SLOT (increaseVolume ()), ac, "edit_volume_up"); editVolumeInc = new TDEAction (i18n ("Increase Volume"), TQString ("player_volume"), TDEShortcut (), m_player, TQT_SLOT (increaseVolume ()), ac, "edit_volume_up");
editVolumeDec = new TDEAction (i18n ("Decrease Volume"), TQString ("player_volume"), TDEShortcut (), m_player, TQT_SLOT(decreaseVolume ()), ac, "edit_volume_down"); editVolumeDec = new TDEAction (i18n ("Decrease Volume"), TQString ("player_volume"), TDEShortcut (), m_player, TQT_SLOT(decreaseVolume ()), ac, "edit_volume_down");
toggleView = new TDEAction (i18n ("C&onsole"), TQString ("konsole"), TDEShortcut (), TQT_TQOBJECT(m_player->view()), TQT_SLOT (toggleVideoConsoleWindow ()), ac, "view_video"); toggleView = new TDEAction (i18n ("C&onsole"), TQString ("konsole"), TDEShortcut (), m_player->view(), TQT_SLOT (toggleVideoConsoleWindow ()), ac, "view_video");
//new TDEAction (i18n ("V&ideo"), TQString (video-x-generic"), TDEShortcut (), m_view, TQT_SLOT (toggleVideoConsoleWindow ()), ac, "view_video"); //new TDEAction (i18n ("V&ideo"), TQString (video-x-generic"), TDEShortcut (), m_view, TQT_SLOT (toggleVideoConsoleWindow ()), ac, "view_video");
new TDEAction (i18n ("Pla&y List"), TQString ("player_playlist"), TDEShortcut (), m_player, TQT_SLOT (showPlayListWindow ()), ac, "view_playlist"); new TDEAction (i18n ("Pla&y List"), TQString ("player_playlist"), TDEShortcut (), m_player, TQT_SLOT (showPlayListWindow ()), ac, "view_playlist");
new TDEAction (i18n ("Minimal mode"), TQString ("application-x-zerosize"), TDEShortcut (), TQT_TQOBJECT(this), TQT_SLOT (slotMinimalMode ()), ac, "view_minimal"); new TDEAction (i18n ("Minimal mode"), TQString ("application-x-zerosize"), TDEShortcut (), this, TQT_SLOT (slotMinimalMode ()), ac, "view_minimal");
new TDEAction (i18n ("50%"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT (zoom50 ()), ac, "view_zoom_50"); new TDEAction (i18n ("50%"), 0, 0, this, TQT_SLOT (zoom50 ()), ac, "view_zoom_50");
new TDEAction (i18n ("100%"), TQString ("zoom-fit-best"), TDEShortcut (), TQT_TQOBJECT(this), TQT_SLOT (zoom100 ()), ac, "view_zoom_100"); new TDEAction (i18n ("100%"), TQString ("zoom-fit-best"), TDEShortcut (), this, TQT_SLOT (zoom100 ()), ac, "view_zoom_100");
new TDEAction (i18n ("150%"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT (zoom150 ()), ac, "view_zoom_150"); new TDEAction (i18n ("150%"), 0, 0, this, TQT_SLOT (zoom150 ()), ac, "view_zoom_150");
new TDEAction (i18n ("200%"), 0, TDEShortcut (), TQT_TQOBJECT(this), TQT_SLOT (zoom200 ()), ac, "view_zoom_200"); new TDEAction (i18n ("200%"), 0, TDEShortcut (), this, TQT_SLOT (zoom200 ()), ac, "view_zoom_200");
new TDEAction (i18n ("300%"), 0, TDEShortcut (), TQT_TQOBJECT(this), TQT_SLOT (zoom300 ()), ac, "view_zoom_300"); new TDEAction (i18n ("300%"), 0, TDEShortcut (), this, TQT_SLOT (zoom300 ()), ac, "view_zoom_300");
viewEditMode = new TDEToggleAction (i18n ("&Edit mode"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT (editMode ()), ac, "edit_mode"); viewEditMode = new TDEToggleAction (i18n ("&Edit mode"), 0, 0, this, TQT_SLOT (editMode ()), ac, "edit_mode");
viewSyncEditMode = new TDEAction (i18n ("Sync &with playlist"), TQString ("reload"), TDEShortcut (), TQT_TQOBJECT(this), TQT_SLOT (syncEditMode ()), ac, "sync_edit_mode"); viewSyncEditMode = new TDEAction (i18n ("Sync &with playlist"), TQString ("reload"), TDEShortcut (), this, TQT_SLOT (syncEditMode ()), ac, "sync_edit_mode");
viewSyncEditMode->setEnabled (false); viewSyncEditMode->setEnabled (false);
new TDEAction (i18n ("Show Popup Menu"), TDEShortcut (), TQT_TQOBJECT(m_view->controlPanel ()), TQT_SLOT (showPopupMenu ()), ac, "view_show_popup_menu"); new TDEAction (i18n ("Show Popup Menu"), TDEShortcut (), m_view->controlPanel (), TQT_SLOT (showPopupMenu ()), ac, "view_show_popup_menu");
new TDEAction (i18n ("Show Language Menu"), TDEShortcut (TQt::Key_L), TQT_TQOBJECT(m_view->controlPanel ()), TQT_SLOT (showLanguageMenu ()), ac, "view_show_lang_menu"); new TDEAction (i18n ("Show Language Menu"), TDEShortcut (TQt::Key_L), m_view->controlPanel (), TQT_SLOT (showLanguageMenu ()), ac, "view_show_lang_menu");
viewKeepRatio = new TDEToggleAction (i18n ("&Keep Width/Height Ratio"), 0, TQT_TQOBJECT(this), TQT_SLOT (keepSizeRatio ()), ac, "view_keep_ratio"); viewKeepRatio = new TDEToggleAction (i18n ("&Keep Width/Height Ratio"), 0, this, TQT_SLOT (keepSizeRatio ()), ac, "view_keep_ratio");
#if KDE_IS_VERSION(3,1,90) #if KDE_IS_VERSION(3,1,90)
viewFullscreen = KStdAction::fullScreen (TQT_TQOBJECT(this), TQT_SLOT(fullScreen ()), ac, 0, "view_fullscreen"); viewFullscreen = KStdAction::fullScreen (this, TQT_SLOT(fullScreen ()), ac, 0, "view_fullscreen");
#else #else
viewFullscreen = new TDEAction (i18n("&Full Screen"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(fullScreen ()), ac, "view_fullscreen"); viewFullscreen = new TDEAction (i18n("&Full Screen"), 0, 0, this, TQT_SLOT(fullScreen ()), ac, "view_fullscreen");
#endif #endif
/*TDEAction *playact =*/ new TDEAction (i18n ("P&lay"), TQString ("media-playback-start"), TDEShortcut (), m_player, TQT_SLOT (play ()), ac, "play"); /*TDEAction *playact =*/ new TDEAction (i18n ("P&lay"), TQString ("media-playback-start"), TDEShortcut (), m_player, TQT_SLOT (play ()), ac, "play");
/*TDEAction *pauseact =*/ new TDEAction (i18n ("&Pause"), TQString ("media-playback-pause"), TDEShortcut (), m_player, TQT_SLOT (pause ()), ac, "pause"); /*TDEAction *pauseact =*/ new TDEAction (i18n ("&Pause"), TQString ("media-playback-pause"), TDEShortcut (), m_player, TQT_SLOT (pause ()), ac, "pause");
/*TDEAction *stopact =*/ new TDEAction (i18n ("&Stop"), TQString ("media-playback-stop"), TDEShortcut (), m_player, TQT_SLOT (stop ()), ac, "stop"); /*TDEAction *stopact =*/ new TDEAction (i18n ("&Stop"), TQString ("media-playback-stop"), TDEShortcut (), m_player, TQT_SLOT (stop ()), ac, "stop");
/*TDEAction *artsctrl =*/ new TDEAction (i18n ("&Arts Control"), TQString ("player_volume"), TDEShortcut (), TQT_TQOBJECT(this), TQT_SLOT (startArtsControl ()), ac, "view_arts_control"); /*TDEAction *artsctrl =*/ new TDEAction (i18n ("&Arts Control"), TQString ("player_volume"), TDEShortcut (), this, TQT_SLOT (startArtsControl ()), ac, "view_arts_control");
viewToolBar = KStdAction::showToolbar(TQT_TQOBJECT(this), TQT_SLOT(slotViewToolBar()), ac, "showtoolbar"); viewToolBar = KStdAction::showToolbar(this, TQT_SLOT(slotViewToolBar()), ac, "showtoolbar");
viewStatusBar =KStdAction::showStatusbar(TQT_TQOBJECT(this),TQT_SLOT(slotViewStatusBar()),ac, "showstatusbar"); viewStatusBar =KStdAction::showStatusbar(this,TQT_SLOT(slotViewStatusBar()),ac, "showstatusbar");
viewMenuBar = KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(slotViewMenuBar()), ac, "showmenu"); viewMenuBar = KStdAction::showMenubar(this, TQT_SLOT(slotViewMenuBar()), ac, "showmenu");
KStdAction::preferences(m_player, TQT_SLOT(showConfigDialog()), ac,"configure"); KStdAction::preferences(m_player, TQT_SLOT(showConfigDialog()), ac,"configure");
fileNewWindow->setStatusText(i18n("Opens a new application window")); fileNewWindow->setStatusText(i18n("Opens a new application window"));
fileOpen->setStatusText(i18n("Opens an existing file")); fileOpen->setStatusText(i18n("Opens an existing file"));
@ -625,8 +625,8 @@ KDE_NO_EXPORT void KMPlayerApp::initActions () {
//viewToolBar->setStatusText(i18n("Enables/disables the toolbar")); //viewToolBar->setStatusText(i18n("Enables/disables the toolbar"));
viewStatusBar->setStatusText(i18n("Enables/disables the statusbar")); viewStatusBar->setStatusText(i18n("Enables/disables the statusbar"));
viewMenuBar->setStatusText(i18n("Enables/disables the menubar")); viewMenuBar->setStatusText(i18n("Enables/disables the menubar"));
KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT(slotConfigureKeys()), ac, "configkeys"); KStdAction::keyBindings( this, TQT_SLOT(slotConfigureKeys()), ac, "configkeys");
KStdAction::configureToolbars (TQT_TQOBJECT(this), TQT_SLOT (slotConfigureToolbars ()), ac, "configtoolbars"); KStdAction::configureToolbars (this, TQT_SLOT (slotConfigureToolbars ()), ac, "configtoolbars");
} }
KDE_NO_EXPORT void KMPlayerApp::initStatusBar () { KDE_NO_EXPORT void KMPlayerApp::initStatusBar () {
@ -646,18 +646,18 @@ KDE_NO_EXPORT void KMPlayerApp::initMenu () {
m_dvdmenu->clear (); m_dvdmenu->clear ();
#ifdef HAVE_XINE #ifdef HAVE_XINE
m_dvdnavmenu->clear (); m_dvdnavmenu->clear ();
m_dvdnavmenu->insertItem (i18n ("&Start"), TQT_TQOBJECT(this), TQT_SLOT (dvdNav ())); m_dvdnavmenu->insertItem (i18n ("&Start"), this, TQT_SLOT (dvdNav ()));
m_dvdmenu->insertItem (i18n ("&DVD Navigator"), m_dvdnavmenu, -1, 1); m_dvdmenu->insertItem (i18n ("&DVD Navigator"), m_dvdnavmenu, -1, 1);
m_dvdmenu->insertItem (i18n ("&Open DVD"), TQT_TQOBJECT(this), TQT_SLOT(openDVD ()), 0,-1, 2); m_dvdmenu->insertItem (i18n ("&Open DVD"), this, TQT_SLOT(openDVD ()), 0,-1, 2);
#else #else
m_dvdmenu->insertItem (i18n ("&Open DVD"), TQT_TQOBJECT(this), TQT_SLOT(openDVD ()), 0,-1, 1); m_dvdmenu->insertItem (i18n ("&Open DVD"), this, TQT_SLOT(openDVD ()), 0,-1, 1);
#endif #endif
m_sourcemenu->popup ()->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("media-optical-cdrom-mounted"), TDEIcon::Small, 0, true), i18n ("V&CD"), m_vcdmenu, -1, 6); m_sourcemenu->popup ()->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("media-optical-cdrom-mounted"), TDEIcon::Small, 0, true), i18n ("V&CD"), m_vcdmenu, -1, 6);
m_vcdmenu->clear (); m_vcdmenu->clear ();
m_sourcemenu->popup ()->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("tv"), TDEIcon::Small, 0, true), i18n ("&TV"), m_tvmenu, -1, 8); m_sourcemenu->popup ()->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("tv"), TDEIcon::Small, 0, true), i18n ("&TV"), m_tvmenu, -1, 8);
m_vcdmenu->insertItem (i18n ("&Open VCD"), TQT_TQOBJECT(this), TQT_SLOT(openVCD ()), 0,-1, 1); m_vcdmenu->insertItem (i18n ("&Open VCD"), this, TQT_SLOT(openVCD ()), 0,-1, 1);
m_sourcemenu->popup ()->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("media-optical-cdrom-mounted"), TDEIcon::Small, 0, true), i18n ("&Audio CD"), m_audiocdmenu, -1, 7); m_sourcemenu->popup ()->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("media-optical-cdrom-mounted"), TDEIcon::Small, 0, true), i18n ("&Audio CD"), m_audiocdmenu, -1, 7);
m_audiocdmenu->insertItem (i18n ("&Open Audio CD"), TQT_TQOBJECT(this), TQT_SLOT(openAudioCD ()), 0,-1, 1); m_audiocdmenu->insertItem (i18n ("&Open Audio CD"), this, TQT_SLOT(openAudioCD ()), 0,-1, 1);
} }
KDE_NO_EXPORT void KMPlayerApp::initView () { KDE_NO_EXPORT void KMPlayerApp::initView () {
@ -667,50 +667,50 @@ KDE_NO_EXPORT void KMPlayerApp::initView () {
new TDEAction (i18n ("Increase Volume"), editVolumeInc->shortcut (), m_player, TQT_SLOT (increaseVolume ()), m_view->viewArea ()->actionCollection (), "edit_volume_up"); new TDEAction (i18n ("Increase Volume"), editVolumeInc->shortcut (), m_player, TQT_SLOT (increaseVolume ()), m_view->viewArea ()->actionCollection (), "edit_volume_up");
new TDEAction (i18n ("Decrease Volume"), editVolumeDec->shortcut (), m_player, TQT_SLOT(decreaseVolume ()), m_view->viewArea ()->actionCollection (), "edit_volume_down"); new TDEAction (i18n ("Decrease Volume"), editVolumeDec->shortcut (), m_player, TQT_SLOT(decreaseVolume ()), m_view->viewArea ()->actionCollection (), "edit_volume_down");
connect (m_player->settings (), TQT_SIGNAL (configChanged ()), connect (m_player->settings (), TQT_SIGNAL (configChanged ()),
TQT_TQOBJECT(this), TQT_SLOT (configChanged ())); this, TQT_SLOT (configChanged ()));
connect (m_player, TQT_SIGNAL (loading (int)), connect (m_player, TQT_SIGNAL (loading (int)),
TQT_TQOBJECT(this), TQT_SLOT (loadingProgress (int))); this, TQT_SLOT (loadingProgress (int)));
connect (m_player, TQT_SIGNAL (positioned (int, int)), connect (m_player, TQT_SIGNAL (positioned (int, int)),
TQT_TQOBJECT(this), TQT_SLOT (positioned (int, int))); this, TQT_SLOT (positioned (int, int)));
connect (m_player, TQT_SIGNAL (statusUpdated (const TQString &)), connect (m_player, TQT_SIGNAL (statusUpdated (const TQString &)),
TQT_TQOBJECT(this), TQT_SLOT (slotStatusMsg (const TQString &))); this, TQT_SLOT (slotStatusMsg (const TQString &)));
connect (m_view, TQT_SIGNAL (windowVideoConsoleToggled (int)), connect (m_view, TQT_SIGNAL (windowVideoConsoleToggled (int)),
TQT_TQOBJECT(this), TQT_SLOT (windowVideoConsoleToggled (int))); this, TQT_SLOT (windowVideoConsoleToggled (int)));
connect (m_player, TQT_SIGNAL (sourceChanged (KMPlayer::Source *, KMPlayer::Source *)), TQT_TQOBJECT(this), TQT_SLOT (slotSourceChanged(KMPlayer::Source *, KMPlayer::Source *))); connect (m_player, TQT_SIGNAL (sourceChanged (KMPlayer::Source *, KMPlayer::Source *)), this, TQT_SLOT (slotSourceChanged(KMPlayer::Source *, KMPlayer::Source *)));
m_view->controlPanel ()->zoomMenu ()->connectItem (KMPlayer::ControlPanel::menu_zoom50, m_view->controlPanel ()->zoomMenu ()->connectItem (KMPlayer::ControlPanel::menu_zoom50,
TQT_TQOBJECT(this), TQT_SLOT (zoom50 ())); this, TQT_SLOT (zoom50 ()));
m_view->controlPanel ()->zoomMenu ()->connectItem (KMPlayer::ControlPanel::menu_zoom100, m_view->controlPanel ()->zoomMenu ()->connectItem (KMPlayer::ControlPanel::menu_zoom100,
TQT_TQOBJECT(this), TQT_SLOT (zoom100 ())); this, TQT_SLOT (zoom100 ()));
m_view->controlPanel ()->zoomMenu ()->connectItem (KMPlayer::ControlPanel::menu_zoom150, m_view->controlPanel ()->zoomMenu ()->connectItem (KMPlayer::ControlPanel::menu_zoom150,
TQT_TQOBJECT(this), TQT_SLOT (zoom150 ())); this, TQT_SLOT (zoom150 ()));
m_view->controlPanel ()->zoomMenu ()->connectItem (KMPlayer::ControlPanel::menu_zoom200, m_view->controlPanel ()->zoomMenu ()->connectItem (KMPlayer::ControlPanel::menu_zoom200,
TQT_TQOBJECT(this), TQT_SLOT (zoom200 ())); this, TQT_SLOT (zoom200 ()));
m_view->controlPanel ()->zoomMenu ()->connectItem (KMPlayer::ControlPanel::menu_zoom300, m_view->controlPanel ()->zoomMenu ()->connectItem (KMPlayer::ControlPanel::menu_zoom300,
TQT_TQOBJECT(this), TQT_SLOT (zoom300 ())); this, TQT_SLOT (zoom300 ()));
connect (m_view->controlPanel()->broadcastButton (), TQT_SIGNAL (clicked ()), connect (m_view->controlPanel()->broadcastButton (), TQT_SIGNAL (clicked ()),
TQT_TQOBJECT(this), TQT_SLOT (broadcastClicked ())); this, TQT_SLOT (broadcastClicked ()));
m_auto_resize = m_player->settings ()->autoresize; m_auto_resize = m_player->settings ()->autoresize;
if (m_auto_resize) if (m_auto_resize)
connect (m_player, TQT_SIGNAL (sourceDimensionChanged ()), connect (m_player, TQT_SIGNAL (sourceDimensionChanged ()),
TQT_TQOBJECT(this), TQT_SLOT (zoom100 ())); this, TQT_SLOT (zoom100 ()));
connect (m_view, TQT_SIGNAL (fullScreenChanged ()), connect (m_view, TQT_SIGNAL (fullScreenChanged ()),
TQT_TQOBJECT(this), TQT_SLOT (fullScreen ())); this, TQT_SLOT (fullScreen ()));
connect (m_player, TQT_SIGNAL (toggleMinimalMode ()), connect (m_player, TQT_SIGNAL (toggleMinimalMode ()),
TQT_TQOBJECT(this), TQT_SLOT (slotMinimalMode ())); this, TQT_SLOT (slotMinimalMode ()));
connect (m_view->playList (), TQT_SIGNAL (selectionChanged (TQListViewItem *)), connect (m_view->playList (), TQT_SIGNAL (selectionChanged (TQListViewItem *)),
TQT_TQOBJECT(this), TQT_SLOT (playListItemSelected (TQListViewItem *))); this, TQT_SLOT (playListItemSelected (TQListViewItem *)));
connect (m_view->playList(), TQT_SIGNAL (dropped (TQDropEvent*, TQListViewItem*)), connect (m_view->playList(), TQT_SIGNAL (dropped (TQDropEvent*, TQListViewItem*)),
TQT_TQOBJECT(this), TQT_SLOT (playListItemDropped (TQDropEvent *, TQListViewItem *))); this, TQT_SLOT (playListItemDropped (TQDropEvent *, TQListViewItem *)));
connect (m_view->playList(), TQT_SIGNAL (moved ()), connect (m_view->playList(), TQT_SIGNAL (moved ()),
TQT_TQOBJECT(this), TQT_SLOT (playListItemMoved ())); this, TQT_SLOT (playListItemMoved ()));
connect (m_view->playList(), TQT_SIGNAL (prepareMenu (KMPlayer::PlayListItem *, TQPopupMenu *)), TQT_TQOBJECT(this), TQT_SLOT (preparePlaylistMenu (KMPlayer::PlayListItem *, TQPopupMenu *))); connect (m_view->playList(), TQT_SIGNAL (prepareMenu (KMPlayer::PlayListItem *, TQPopupMenu *)), this, TQT_SLOT (preparePlaylistMenu (KMPlayer::PlayListItem *, TQPopupMenu *)));
m_dropmenu = new TQPopupMenu (m_view->playList ()); m_dropmenu = new TQPopupMenu (m_view->playList ());
m_dropmenu->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("player_playlist"), TDEIcon::Small, 0, true), i18n ("&Add to list"), TQT_TQOBJECT(this), TQT_SLOT (menuDropInList ())); m_dropmenu->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("player_playlist"), TDEIcon::Small, 0, true), i18n ("&Add to list"), this, TQT_SLOT (menuDropInList ()));
m_dropmenu->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("folder_grey"), TDEIcon::Small, 0, true), i18n ("Add in new &Group"), TQT_TQOBJECT(this), TQT_SLOT (menuDropInGroup ())); m_dropmenu->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("folder_grey"), TDEIcon::Small, 0, true), i18n ("Add in new &Group"), this, TQT_SLOT (menuDropInGroup ()));
m_dropmenu->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("edit-copy"), TDEIcon::Small, 0, true), i18n ("&Copy here"), TQT_TQOBJECT(this), TQT_SLOT (menuCopyDrop ())); m_dropmenu->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("edit-copy"), TDEIcon::Small, 0, true), i18n ("&Copy here"), this, TQT_SLOT (menuCopyDrop ()));
m_dropmenu->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("edit-delete"), TDEIcon::Small, 0, true), i18n ("&Delete"), TQT_TQOBJECT(this), TQT_SLOT (menuDeleteNode ())); m_dropmenu->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("edit-delete"), TDEIcon::Small, 0, true), i18n ("&Delete"), this, TQT_SLOT (menuDeleteNode ()));
/*TQPopupMenu * viewmenu = new TQPopupMenu; /*TQPopupMenu * viewmenu = new TQPopupMenu;
viewmenu->insertItem (i18n ("Full Screen"), TQT_TQOBJECT(this), TQT_SLOT(fullScreen ()), viewmenu->insertItem (i18n ("Full Screen"), this, TQT_SLOT(fullScreen ()),
TQKeySequence ("CTRL + Key_F")); TQKeySequence ("CTRL + Key_F"));
menuBar ()->insertItem (i18n ("&View"), viewmenu, -1, 2);*/ menuBar ()->insertItem (i18n ("&View"), viewmenu, -1, 2);*/
//toolBar("mainToolBar")->hide(); //toolBar("mainToolBar")->hide();
@ -837,14 +837,14 @@ KDE_NO_EXPORT void KMPlayerApp::slotSourceChanged (KMPlayer::Source *olds, KMPla
disconnect (olds, TQT_SIGNAL (titleChanged (const TQString &)), this, disconnect (olds, TQT_SIGNAL (titleChanged (const TQString &)), this,
TQT_SLOT (setCaption (const TQString &))); TQT_SLOT (setCaption (const TQString &)));
disconnect (olds, TQT_SIGNAL (startPlaying ()), disconnect (olds, TQT_SIGNAL (startPlaying ()),
TQT_TQOBJECT(this), TQT_SLOT (playerStarted ())); this, TQT_SLOT (playerStarted ()));
} }
if (news) { if (news) {
setCaption (news->prettyName (), false); setCaption (news->prettyName (), false);
connect (news, TQT_SIGNAL (titleChanged (const TQString &)), connect (news, TQT_SIGNAL (titleChanged (const TQString &)),
TQT_TQOBJECT(this), TQT_SLOT (setCaption (const TQString &))); this, TQT_SLOT (setCaption (const TQString &)));
connect (news, TQT_SIGNAL (startPlaying ()), connect (news, TQT_SIGNAL (startPlaying ()),
TQT_TQOBJECT(this), TQT_SLOT (playerStarted ())); this, TQT_SLOT (playerStarted ()));
viewSyncEditMode->setEnabled (m_view->editMode () || viewSyncEditMode->setEnabled (m_view->editMode () ||
!strcmp (m_player->source ()->name (), "urlsource")); !strcmp (m_player->source ()->name (), "urlsource"));
} }
@ -1238,7 +1238,7 @@ KDE_NO_EXPORT void KMPlayerApp::minimalMode (bool by_user) {
if (m_minimal_mode) { if (m_minimal_mode) {
readOptions (); readOptions ();
if (by_user) if (by_user)
disconnect (m_view->controlPanel ()->button (KMPlayer::ControlPanel::button_playlist), TQT_SIGNAL (clicked ()), TQT_TQOBJECT(this), TQT_SLOT (slotMinimalMode ())); disconnect (m_view->controlPanel ()->button (KMPlayer::ControlPanel::button_playlist), TQT_SIGNAL (clicked ()), this, TQT_SLOT (slotMinimalMode ()));
restoreFromConfig (); restoreFromConfig ();
} else { } else {
saveOptions (); saveOptions ();
@ -1246,7 +1246,7 @@ KDE_NO_EXPORT void KMPlayerApp::minimalMode (bool by_user) {
toolBar("mainToolBar")->hide(); toolBar("mainToolBar")->hide();
statusBar()->hide(); statusBar()->hide();
if (by_user) if (by_user)
connect (m_view->controlPanel ()->button (KMPlayer::ControlPanel::button_playlist), TQT_SIGNAL (clicked ()), TQT_TQOBJECT(this), TQT_SLOT (slotMinimalMode ())); connect (m_view->controlPanel ()->button (KMPlayer::ControlPanel::button_playlist), TQT_SIGNAL (clicked ()), this, TQT_SLOT (slotMinimalMode ()));
} }
m_view->viewArea ()->minimalMode (); m_view->viewArea ()->minimalMode ();
m_minimal_mode = !m_minimal_mode; m_minimal_mode = !m_minimal_mode;
@ -1344,7 +1344,7 @@ KDE_NO_EXPORT bool KMPlayerApp::queryExit()
if (!m_minimal_mode) if (!m_minimal_mode)
saveOptions(); saveOptions();
disconnect (m_player->settings (), TQT_SIGNAL (configChanged ()), disconnect (m_player->settings (), TQT_SIGNAL (configChanged ()),
TQT_TQOBJECT(this), TQT_SLOT (configChanged ())); this, TQT_SLOT (configChanged ()));
m_player->settings ()->writeConfig (); m_player->settings ()->writeConfig ();
return true; return true;
} }
@ -1668,12 +1668,12 @@ KDE_NO_EXPORT void KMPlayerApp::preparePlaylistMenu (KMPlayer::PlayListItem * it
pm->insertSeparator (); pm->insertSeparator ();
manip_node = item->node; manip_node = item->node;
if (ri->flags & KMPlayer::PlayListView::Deleteable) if (ri->flags & KMPlayer::PlayListView::Deleteable)
pm->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("edit-delete"), TDEIcon::Small, 0, true), i18n ("&Delete item"), TQT_TQOBJECT(this), TQT_SLOT (menuDeleteNode ())); pm->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("edit-delete"), TDEIcon::Small, 0, true), i18n ("&Delete item"), this, TQT_SLOT (menuDeleteNode ()));
if (ri->flags & KMPlayer::PlayListView::Moveable) { if (ri->flags & KMPlayer::PlayListView::Moveable) {
if (manip_node->previousSibling ()) if (manip_node->previousSibling ())
pm->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("go-up"), TDEIcon::Small, 0, true), i18n ("&Move up"), TQT_TQOBJECT(this), TQT_SLOT (menuMoveUpNode ())); pm->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("go-up"), TDEIcon::Small, 0, true), i18n ("&Move up"), this, TQT_SLOT (menuMoveUpNode ()));
if (manip_node->nextSibling ()) if (manip_node->nextSibling ())
pm->insertItem (TDEGlobal::iconLoader()->loadIconSet (TQString ("go-down"), TDEIcon::Small, 0, true), i18n ("Move &down"), TQT_TQOBJECT(this), TQT_SLOT (menuMoveDownNode ())); pm->insertItem (TDEGlobal::iconLoader()->loadIconSet (TQString ("go-down"), TDEIcon::Small, 0, true), i18n ("Move &down"), this, TQT_SLOT (menuMoveDownNode ()));
} }
} }
} }
@ -1890,14 +1890,14 @@ KDE_NO_EXPORT void KMPlayerDVDSource::activate () {
m_menu->insertItem (i18n ("Audio &Language"), m_dvdlanguagemenu); m_menu->insertItem (i18n ("Audio &Language"), m_dvdlanguagemenu);
m_menu->insertItem (i18n ("&SubTitles"), m_dvdsubtitlemenu); m_menu->insertItem (i18n ("&SubTitles"), m_dvdsubtitlemenu);
connect (m_dvdsubtitlemenu, TQT_SIGNAL (activated (int)), connect (m_dvdsubtitlemenu, TQT_SIGNAL (activated (int)),
TQT_TQOBJECT(this), TQT_SLOT (subtitleMenuClicked (int))); this, TQT_SLOT (subtitleMenuClicked (int)));
connect (m_dvdlanguagemenu, TQT_SIGNAL (activated (int)), connect (m_dvdlanguagemenu, TQT_SIGNAL (activated (int)),
TQT_TQOBJECT(this), TQT_SLOT (languageMenuClicked (int))); this, TQT_SLOT (languageMenuClicked (int)));
} }
connect (m_dvdtitlemenu, TQT_SIGNAL (activated (int)), connect (m_dvdtitlemenu, TQT_SIGNAL (activated (int)),
TQT_TQOBJECT(this), TQT_SLOT (titleMenuClicked (int))); this, TQT_SLOT (titleMenuClicked (int)));
connect (m_dvdchaptermenu, TQT_SIGNAL (activated (int)), connect (m_dvdchaptermenu, TQT_SIGNAL (activated (int)),
TQT_TQOBJECT(this), TQT_SLOT (chapterMenuClicked (int))); this, TQT_SLOT (chapterMenuClicked (int)));
if (m_start_play) if (m_start_play)
TQTimer::singleShot (0, m_player, TQT_SLOT (play ())); TQTimer::singleShot (0, m_player, TQT_SLOT (play ()));
} }
@ -1931,14 +1931,14 @@ KDE_NO_EXPORT void KMPlayerDVDSource::deactivate () {
m_menu->removeItemAt (m_menu->count () - 1); m_menu->removeItemAt (m_menu->count () - 1);
m_menu->removeItemAt (m_menu->count () - 1); m_menu->removeItemAt (m_menu->count () - 1);
disconnect (m_dvdsubtitlemenu, TQT_SIGNAL (activated (int)), disconnect (m_dvdsubtitlemenu, TQT_SIGNAL (activated (int)),
TQT_TQOBJECT(this), TQT_SLOT (subtitleMenuClicked (int))); this, TQT_SLOT (subtitleMenuClicked (int)));
disconnect (m_dvdlanguagemenu, TQT_SIGNAL (activated (int)), disconnect (m_dvdlanguagemenu, TQT_SIGNAL (activated (int)),
TQT_TQOBJECT(this), TQT_SLOT (languageMenuClicked (int))); this, TQT_SLOT (languageMenuClicked (int)));
} }
disconnect (m_dvdtitlemenu, TQT_SIGNAL (activated (int)), disconnect (m_dvdtitlemenu, TQT_SIGNAL (activated (int)),
TQT_TQOBJECT(this), TQT_SLOT (titleMenuClicked (int))); this, TQT_SLOT (titleMenuClicked (int)));
disconnect (m_dvdchaptermenu, TQT_SIGNAL (activated (int)), disconnect (m_dvdchaptermenu, TQT_SIGNAL (activated (int)),
TQT_TQOBJECT(this), TQT_SLOT (chapterMenuClicked (int))); this, TQT_SLOT (chapterMenuClicked (int)));
} }
} }
@ -2069,17 +2069,17 @@ KDE_NO_EXPORT void KMPlayerDVDNavSource::deactivate () {
KDE_NO_EXPORT void KMPlayerDVDNavSource::play () { KDE_NO_EXPORT void KMPlayerDVDNavSource::play () {
if (!m_menu->findItem (DVDNav_previous)) { if (!m_menu->findItem (DVDNav_previous)) {
m_menu->insertItem (i18n ("&Previous"), TQT_TQOBJECT(this), TQT_SLOT (navMenuClicked (int)), 0, DVDNav_previous); m_menu->insertItem (i18n ("&Previous"), this, TQT_SLOT (navMenuClicked (int)), 0, DVDNav_previous);
m_menu->insertItem (i18n ("&Next"), TQT_TQOBJECT(this), TQT_SLOT (navMenuClicked (int)), 0, DVDNav_next); m_menu->insertItem (i18n ("&Next"), this, TQT_SLOT (navMenuClicked (int)), 0, DVDNav_next);
m_menu->insertItem (i18n ("&Root"), TQT_TQOBJECT(this), TQT_SLOT (navMenuClicked (int)), 0, DVDNav_root); m_menu->insertItem (i18n ("&Root"), this, TQT_SLOT (navMenuClicked (int)), 0, DVDNav_root);
m_menu->insertItem (i18n ("&Up"), TQT_TQOBJECT(this), TQT_SLOT (navMenuClicked (int)), 0, DVDNav_up); m_menu->insertItem (i18n ("&Up"), this, TQT_SLOT (navMenuClicked (int)), 0, DVDNav_up);
} }
TQTimer::singleShot (0, m_player, TQT_SLOT (play ())); TQTimer::singleShot (0, m_player, TQT_SLOT (play ()));
connect (TQT_TQOBJECT(this), TQT_SIGNAL (stopPlaying ()), TQT_TQOBJECT(this), TQT_SLOT(finished ())); connect (this, TQT_SIGNAL (stopPlaying ()), this, TQT_SLOT(finished ()));
} }
KDE_NO_EXPORT void KMPlayerDVDNavSource::finished () { KDE_NO_EXPORT void KMPlayerDVDNavSource::finished () {
disconnect (TQT_TQOBJECT(this), TQT_SIGNAL (stopPlaying ()), TQT_TQOBJECT(this), TQT_SLOT(finished ())); disconnect (this, TQT_SIGNAL (stopPlaying ()), this, TQT_SLOT(finished ()));
m_menu->removeItem (DVDNav_previous); m_menu->removeItem (DVDNav_previous);
m_menu->removeItem (DVDNav_next); m_menu->removeItem (DVDNav_next);
m_menu->removeItem (DVDNav_root); m_menu->removeItem (DVDNav_root);

2
src/kmplayerpartbase.cpp
Unescape View File

@ -179,7 +179,7 @@ void PartBase::init (TDEActionCollection * action_collection) {
connect (m_view, TQT_SIGNAL (urlDropped (const KURL::List &)), this, TQT_SLOT (openURL (const KURL::List &))); connect (m_view, TQT_SIGNAL (urlDropped (const KURL::List &)), this, TQT_SLOT (openURL (const KURL::List &)));
connectPlaylist (m_view->playList ()); connectPlaylist (m_view->playList ());
connectInfoPanel (m_view->infoPanel ()); connectInfoPanel (m_view->infoPanel ());
new TDEAction (i18n ("Edit playlist &item"), 0, 0, TQT_TQOBJECT(m_view->playList ()), TQT_SLOT (editCurrent ()), action_collection, "edit_playlist_item"); new TDEAction (i18n ("Edit playlist &item"), 0, 0, m_view->playList (), TQT_SLOT (editCurrent ()), action_collection, "edit_playlist_item");
} }
void PartBase::connectPanel (ControlPanel * panel) { void PartBase::connectPanel (ControlPanel * panel) {

4
src/kmplayertvsource.cpp
Unescape View File

@ -298,14 +298,14 @@ KDE_NO_EXPORT void TVDevice::updateDevicePage () {
bool ok; bool ok;
if (input->getAttribute ("tuner").toInt (&ok) && ok) { if (input->getAttribute ("tuner").toInt (&ok) && ok) {
TQWidget * widget = device_page->inputsTab->page (i); TQWidget * widget = device_page->inputsTab->page (i);
TQTable * table = static_cast <TQTable *> (TQT_TQWIDGET(widget->child ("PageTVChannels", "TQTable"))); TQTable * table = static_cast <TQTable *>(widget->child ("PageTVChannels", "TQTable"));
if (table) { if (table) {
input->clearChildren (); input->clearChildren ();
for (int j = 0; j<table->numRows() && table->item (j, 1); ++j) { for (int j = 0; j<table->numRows() && table->item (j, 1); ++j) {
input->appendChild (new TVChannel (m_doc, table->item (j, 0)->text (), table->item (j, 1)->text ().toDouble ())); input->appendChild (new TVChannel (m_doc, table->item (j, 0)->text (), table->item (j, 1)->text ().toDouble ()));
} }
} }
TQComboBox * norms = static_cast <TQComboBox *> (TQT_TQWIDGET(widget->child ("PageTVNorm", "TQComboBox"))); TQComboBox * norms = static_cast <TQComboBox *>(widget->child ("PageTVNorm", "TQComboBox"));
if (norms) { if (norms) {
input->setAttribute ("norm", norms->currentText ()); input->setAttribute ("norm", norms->currentText ());
} }

4
src/playlistview.cpp
Unescape View File

@ -134,8 +134,8 @@ KDE_NO_CDTOR_EXPORT PlayListView::PlayListView (TQWidget * parent, View * view,
menu_pix = TDEGlobal::iconLoader ()->loadIcon (TQString ("player_playlist"), TDEIcon::Small); menu_pix = TDEGlobal::iconLoader ()->loadIcon (TQString ("player_playlist"), TDEIcon::Small);
config_pix = TDEGlobal::iconLoader ()->loadIcon (TQString ("configure"), TDEIcon::Small); config_pix = TDEGlobal::iconLoader ()->loadIcon (TQString ("configure"), TDEIcon::Small);
url_pix = TDEGlobal::iconLoader ()->loadIcon (TQString ("www"), TDEIcon::Small); url_pix = TDEGlobal::iconLoader ()->loadIcon (TQString ("www"), TDEIcon::Small);
m_find = KStdAction::find (TQT_TQOBJECT(this), TQT_SLOT (slotFind ()), ac, "find"); m_find = KStdAction::find (this, TQT_SLOT (slotFind ()), ac, "find");
m_find_next = KStdAction::findNext (TQT_TQOBJECT(this), TQT_SLOT(slotFindNext()), ac, "next"); m_find_next = KStdAction::findNext (this, TQT_SLOT(slotFindNext()), ac, "next");
m_find_next->setEnabled (false); m_find_next->setEnabled (false);
connect (this, TQT_SIGNAL (contextMenuRequested (TQListViewItem *, const TQPoint &, int)), this, TQT_SLOT (contextMenuItem (TQListViewItem *, const TQPoint &, int))); connect (this, TQT_SIGNAL (contextMenuRequested (TQListViewItem *, const TQPoint &, int)), this, TQT_SLOT (contextMenuItem (TQListViewItem *, const TQPoint &, int)));
connect (this, TQT_SIGNAL (expanded (TQListViewItem *)), connect (this, TQT_SIGNAL (expanded (TQListViewItem *)),

2
src/pref.cpp
Unescape View File

@ -138,7 +138,7 @@ KDE_NO_CDTOR_EXPORT Preferences::Preferences(PartBase * player, Settings * setti
KDE_NO_EXPORT void Preferences::setPage (const char * name) { KDE_NO_EXPORT void Preferences::setPage (const char * name) {
TQObject * o = child (name, "TQFrame"); TQObject * o = child (name, "TQFrame");
if (!o) return; if (!o) return;
TQFrame * page = static_cast <TQFrame *> (TQT_TQWIDGET(o)); TQFrame * page = static_cast <TQFrame *>(o);
TQWidget * w = page->parentWidget (); TQWidget * w = page->parentWidget ();
while (w && !w->inherits ("TQTabWidget")) while (w && !w->inherits ("TQTabWidget"))
w = w->parentWidget (); w = w->parentWidget ();

6
src/viewarea.cpp
Unescape View File

@ -1353,7 +1353,7 @@ KDE_NO_CDTOR_EXPORT ViewArea::ViewArea (TQWidget * parent, View * view)
m_minimal (false) { m_minimal (false) {
setEraseColor (TQColor (0, 0, 0)); setEraseColor (TQColor (0, 0, 0));
setAcceptDrops (true); setAcceptDrops (true);
new TDEAction (i18n ("Fullscreen"), TDEShortcut (TQt::Key_F), TQT_TQOBJECT(this), TQT_SLOT (accelActivated ()), m_collection, "view_fullscreen_toggle"); new TDEAction (i18n ("Fullscreen"), TDEShortcut (TQt::Key_F), this, TQT_SLOT (accelActivated ()), m_collection, "view_fullscreen_toggle");
setMouseTracking (true); setMouseTracking (true);
if (!image_data_map) if (!image_data_map)
imageCacheDeleter.setObject (image_data_map, new ImageDataMap); imageCacheDeleter.setObject (image_data_map, new ImageDataMap);
@ -1363,7 +1363,7 @@ KDE_NO_CDTOR_EXPORT ViewArea::~ViewArea () {
} }
KDE_NO_EXPORT void ViewArea::fullScreen () { KDE_NO_EXPORT void ViewArea::fullScreen () {
TQT_TQOBJECT(this)->killTimers (); this->killTimers ();
m_mouse_invisible_timer = m_repaint_timer = 0; m_mouse_invisible_timer = m_repaint_timer = 0;
if (m_fullscreen) { if (m_fullscreen) {
showNormal (); showNormal ();
@ -1413,7 +1413,7 @@ KDE_NO_EXPORT void ViewArea::fullScreen () {
void ViewArea::minimalMode () { void ViewArea::minimalMode () {
m_minimal = !m_minimal; m_minimal = !m_minimal;
TQT_TQOBJECT(this)->killTimers (); this->killTimers ();
m_mouse_invisible_timer = m_repaint_timer = 0; m_mouse_invisible_timer = m_repaint_timer = 0;
if (m_minimal) { if (m_minimal) {
m_view->setViewOnly (); m_view->setViewOnly ();

Write Preview
Loading…
Cancel
Save