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

Replace various '#define' strings - part 6

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/32/head
Michele Calgaro 5 months ago
parent 0c53c58d50
commit cf40f00690
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
41 changed files with 477 additions and 477 deletions
Show Stats Download Patch File Download Diff File

4
kalzium/src/detailinfodlg.cpp
Unescape View File

@ -66,7 +66,7 @@ DetailedInfoDlg::DetailedInfoDlg( Element *el , TQWidget *parent, const char *na
createContent(); createContent();
m_actionCollection = new TDEActionCollection(this); m_actionCollection = new TDEActionCollection(this);
KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotClose()), m_actionCollection); KStdAction::quit(this, TQT_SLOT(slotClose()), m_actionCollection);
setButtonTip( User2, i18n( "Goes to the previous element" ) ); setButtonTip( User2, i18n( "Goes to the previous element" ) );
setButtonTip( User1, i18n( "Goes to the next element" ) ); setButtonTip( User1, i18n( "Goes to the next element" ) );
@ -96,7 +96,7 @@ TDEHTMLPart* DetailedInfoDlg::addHTMLTab( const TQString& title, const TQString&
TQFrame *frame = addPage(title, icontext, BarIcon(iconname)); TQFrame *frame = addPage(title, icontext, BarIcon(iconname));
TQVBoxLayout *layout = new TQVBoxLayout( frame ); TQVBoxLayout *layout = new TQVBoxLayout( frame );
layout->setMargin( 0 ); layout->setMargin( 0 );
TDEHTMLPart *w = new TDEHTMLPart( frame, "html-part", TQT_TQOBJECT(frame) ); TDEHTMLPart *w = new TDEHTMLPart( frame, "html-part", frame );
layout->addWidget( w->view() ); layout->addWidget( w->view() );
return w; return w;

2
kalzium/src/elementdataviewer.cpp
Unescape View File

@ -69,7 +69,7 @@ ElementDataViewer::ElementDataViewer( TQWidget *parent, const char* name )
setButtonText( User1, i18n("&Plot") ); setButtonText( User1, i18n("&Plot") );
m_actionCollection = new TDEActionCollection(this); m_actionCollection = new TDEActionCollection(this);
KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotClose()), m_actionCollection); KStdAction::quit(this, TQT_SLOT(slotClose()), m_actionCollection);
connect ( m_pPlotSetupWidget->KCB_y, TQT_SIGNAL( activated(int) ), connect ( m_pPlotSetupWidget->KCB_y, TQT_SIGNAL( activated(int) ),
this, TQT_SLOT( drawPlot()) ); this, TQT_SLOT( drawPlot()) );

46
kalzium/src/kalzium.cpp
Unescape View File

@ -74,8 +74,8 @@ Kalzium::Kalzium()
m_infoDialog = 0; m_infoDialog = 0;
m_toolboxCurrent = 0; m_toolboxCurrent = 0;
connect( m_PerodicTableView, TQT_SIGNAL( ElementClicked( int ) ), TQT_TQOBJECT(this), TQT_SLOT( openInformationDialog( int ) )); connect( m_PerodicTableView, TQT_SIGNAL( ElementClicked( int ) ), this, TQT_SLOT( openInformationDialog( int ) ));
connect( m_PerodicTableView, TQT_SIGNAL( MouseOver( int ) ), TQT_TQOBJECT(this), TQT_SLOT( slotStatusbar( int ) )); connect( m_PerodicTableView, TQT_SIGNAL( MouseOver( int ) ), this, TQT_SLOT( slotStatusbar( int ) ));
// layouting // layouting
setCentralWidget( centralWidget ); setCentralWidget( centralWidget );
@ -107,14 +107,14 @@ Kalzium::Kalzium()
void Kalzium::setupActions() void Kalzium::setupActions()
{ {
m_actionNoScheme = new TDEToggleAction(i18n("&No Color Scheme"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotNoLook()), actionCollection(), "view_look_noscheme"); m_actionNoScheme = new TDEToggleAction(i18n("&No Color Scheme"), 0, this, TQT_SLOT(slotNoLook()), actionCollection(), "view_look_noscheme");
// the actions for the color schemes // the actions for the color schemes
m_actionGroups = new TDEToggleAction(i18n("Show &Groups"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotLookGroups()), actionCollection(), "view_look_groups"); m_actionGroups = new TDEToggleAction(i18n("Show &Groups"), 0, this, TQT_SLOT(slotLookGroups()), actionCollection(), "view_look_groups");
m_actionBlocks = new TDEToggleAction(i18n("Show &Blocks"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotLookBlocks()), actionCollection(), "view_look_blocks"); m_actionBlocks = new TDEToggleAction(i18n("Show &Blocks"), 0, this, TQT_SLOT(slotLookBlocks()), actionCollection(), "view_look_blocks");
m_actionAcid = new TDEToggleAction(i18n("Show &Acid Behavior"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotLookAcidBehavior()), actionCollection(), "view_look_acid"); m_actionAcid = new TDEToggleAction(i18n("Show &Acid Behavior"), 0, this, TQT_SLOT(slotLookAcidBehavior()), actionCollection(), "view_look_acid");
m_actionFamily = new TDEToggleAction(i18n("Show &Family"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotLookFamily()), actionCollection(), "view_look_family"); m_actionFamily = new TDEToggleAction(i18n("Show &Family"), 0, this, TQT_SLOT(slotLookFamily()), actionCollection(), "view_look_family");
m_actionCrystal = new TDEToggleAction(i18n("Show &Crystal Structures"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotLookCrystal()), actionCollection(), "view_look_crystal"); m_actionCrystal = new TDEToggleAction(i18n("Show &Crystal Structures"), 0, this, TQT_SLOT(slotLookCrystal()), actionCollection(), "view_look_crystal");
//the actions for switching PerodicTableView //the actions for switching PerodicTableView
TQStringList gradientlist; TQStringList gradientlist;
@ -127,9 +127,9 @@ void Kalzium::setupActions()
gradientlist.append(i18n("Melting Point")); gradientlist.append(i18n("Melting Point"));
gradientlist.append(i18n("Electronegativity")); gradientlist.append(i18n("Electronegativity"));
gradientlist.append(i18n("Electron Affinity")); gradientlist.append(i18n("Electron Affinity"));
gradient_action = new TDESelectAction(i18n("&Gradient"), 0, TQT_TQOBJECT(this), 0, actionCollection(), "view_look_gradmenu"); gradient_action = new TDESelectAction(i18n("&Gradient"), 0, this, 0, actionCollection(), "view_look_gradmenu");
gradient_action->setItems(gradientlist); gradient_action->setItems(gradientlist);
connect (gradient_action, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotSwitchtoGradient(int))); connect (gradient_action, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSwitchtoGradient(int)));
// the actions for switching PerodicTableView // the actions for switching PerodicTableView
TQStringList numlist; TQStringList numlist;
@ -137,28 +137,28 @@ void Kalzium::setupActions()
numlist.append(i18n("Show &IUPAC")); numlist.append(i18n("Show &IUPAC"));
numlist.append(i18n("Show &CAS")); numlist.append(i18n("Show &CAS"));
numlist.append(i18n("Show &Old IUPAC")); numlist.append(i18n("Show &Old IUPAC"));
numeration_action = new TDESelectAction (i18n("&Numeration"), 0, TQT_TQOBJECT(this), 0, actionCollection(), "view_numerationtype"); numeration_action = new TDESelectAction (i18n("&Numeration"), 0, this, 0, actionCollection(), "view_numerationtype");
numeration_action->setItems(numlist); numeration_action->setItems(numlist);
numeration_action->setCurrentItem(Prefs::numeration()); numeration_action->setCurrentItem(Prefs::numeration());
connect (numeration_action, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotSwitchtoNumeration(int))); connect (numeration_action, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSwitchtoNumeration(int)));
m_SidebarAction = new TDEAction(i18n("Show &Sidebar"), "sidebar", 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowHideSidebar()), actionCollection(), "view_sidebar"); m_SidebarAction = new TDEAction(i18n("Show &Sidebar"), "sidebar", 0, this, TQT_SLOT(slotShowHideSidebar()), actionCollection(), "view_sidebar");
#ifdef HAVE_FACILE #ifdef HAVE_FACILE
m_EQSolverAction = new TDEAction(i18n("&Equation Solver..."), "eqchem", 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowEQSolver()), actionCollection(), "tools_eqsolver"); m_EQSolverAction = new TDEAction(i18n("&Equation Solver..."), "eqchem", 0, this, TQT_SLOT(slotShowEQSolver()), actionCollection(), "tools_eqsolver");
#endif #endif
// tools actions // tools actions
m_pPlotAction = new TDEAction(i18n("&Plot Data..."), "plot", 0, TQT_TQOBJECT(this), TQT_SLOT(slotPlotData()), actionCollection(), "tools_plotdata"); m_pPlotAction = new TDEAction(i18n("&Plot Data..."), "plot", 0, this, TQT_SLOT(slotPlotData()), actionCollection(), "tools_plotdata");
m_pGlossaryAction = new TDEAction(i18n("&Glossary..."), "glossary", 0, TQT_TQOBJECT(this), TQT_SLOT(slotGlossary()), actionCollection(), "tools_glossary"); m_pGlossaryAction = new TDEAction(i18n("&Glossary..."), "glossary", 0, this, TQT_SLOT(slotGlossary()), actionCollection(), "tools_glossary");
// other period view options // other period view options
m_pLegendAction = new TDEAction(i18n("Show &Legend"), "legend", 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowLegend()), actionCollection(), "view_legend"); m_pLegendAction = new TDEAction(i18n("Show &Legend"), "legend", 0, this, TQT_SLOT(slotShowLegend()), actionCollection(), "view_legend");
m_pTooltipAction = new TDEAction(i18n("Show &Tooltip"), "tooltip", 0, TQT_TQOBJECT(this), TQT_SLOT(slotEnableTooltips()), actionCollection(), "view_tooltip"); m_pTooltipAction = new TDEAction(i18n("Show &Tooltip"), "tooltip", 0, this, TQT_SLOT(slotEnableTooltips()), actionCollection(), "view_tooltip");
// the standard actions // the standard actions
KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(showSettingsDialog()), actionCollection()); KStdAction::preferences(this, TQT_SLOT(showSettingsDialog()), actionCollection());
KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT (closeAllWindows()),actionCollection() ); KStdAction::quit(kapp, TQT_SLOT (closeAllWindows()),actionCollection() );
slotShowScheme( Prefs::colorschemebox() ); slotShowScheme( Prefs::colorschemebox() );
slotSwitchtoNumeration( Prefs::numeration() ); slotSwitchtoNumeration( Prefs::numeration() );
@ -213,7 +213,7 @@ void Kalzium::setupSidebars()
lay->activate(); lay->activate();
m_detailWidget = new DetailedGraphicalOverview( fake, "DetailedGraphicalOverview" ); m_detailWidget = new DetailedGraphicalOverview( fake, "DetailedGraphicalOverview" );
m_detailWidget->setMinimumSize( 200, m_detailWidget->minimumSize().height() ); m_detailWidget->setMinimumSize( 200, m_detailWidget->minimumSize().height() );
connect( m_PerodicTableView, TQT_SIGNAL( MouseOver( int ) ), TQT_TQOBJECT(this), TQT_SLOT( slotSelectedNumber( int ) )); connect( m_PerodicTableView, TQT_SIGNAL( MouseOver( int ) ), this, TQT_SLOT( slotSelectedNumber( int ) ));
lay->addWidget( m_detailWidget ); lay->addWidget( m_detailWidget );
lay->addItem( new TQSpacerItem( 10, 10, TQSizePolicy::Fixed, TQSizePolicy::MinimumExpanding ) ); lay->addItem( new TQSpacerItem( 10, 10, TQSizePolicy::Fixed, TQSizePolicy::MinimumExpanding ) );
m_toolbox->addItem( fake, SmallIcon( "overview" ), i18n( "Overview" ) ); m_toolbox->addItem( fake, SmallIcon( "overview" ), i18n( "Overview" ) );
@ -235,13 +235,13 @@ void Kalzium::setupSidebars()
m_PerodicTableView, TQT_SLOT( setTemperature( int ) ) ); m_PerodicTableView, TQT_SLOT( setTemperature( int ) ) );
m_toolbox->addItem( m_somWidget, SmallIcon( "statematter" ), i18n( "State of Matter" ) ); m_toolbox->addItem( m_somWidget, SmallIcon( "statematter" ), i18n( "State of Matter" ) );
connect( m_toolbox, TQT_SIGNAL( currentChanged( int ) ), TQT_TQOBJECT(this), TQT_SLOT( slotToolboxCurrentChanged( int ) ) ); connect( m_toolbox, TQT_SIGNAL( currentChanged( int ) ), this, TQT_SLOT( slotToolboxCurrentChanged( int ) ) );
moveDockWindow( m_dockWin, DockLeft ); moveDockWindow( m_dockWin, DockLeft );
setDockEnabled( /*m_dockWin, */DockTop, false ); setDockEnabled( /*m_dockWin, */DockTop, false );
setDockEnabled( /*m_dockWin, */DockBottom, false ); setDockEnabled( /*m_dockWin, */DockBottom, false );
m_dockWin->hide(); m_dockWin->hide();
connect( m_dockWin, TQT_SIGNAL(visibilityChanged(bool)), TQT_TQOBJECT(this), TQT_SLOT(slotSidebarVisibilityChanged(bool))); connect( m_dockWin, TQT_SIGNAL(visibilityChanged(bool)), this, TQT_SLOT(slotSidebarVisibilityChanged(bool)));
} }

2
kalzium/src/kalziumtip.cpp
Unescape View File

@ -55,7 +55,7 @@ void KalziumTip::showTip( TQPoint mouse, Element* element, int visibleWidth, int
{ {
TQWidget *p = 0; TQWidget *p = 0;
if ( dynamic_cast<TQWidget*>( parent() ) ) if ( dynamic_cast<TQWidget*>( parent() ) )
p = TQT_TQWIDGET( parent() ); p = static_cast<TQWidget*>( parent() );
if ( p ) if ( p )
{ {

2
kalzium/src/periodictableview.cpp
Unescape View File

@ -172,7 +172,7 @@ void PerodicTableView::slotToolTip( int number )
TQWidget *p = 0; TQWidget *p = 0;
if ( dynamic_cast<TQWidget*>( parent() ) ) if ( dynamic_cast<TQWidget*>( parent() ) )
p = TQT_TQWIDGET( parent() ); p = static_cast<TQWidget*>( parent() );
if( p ) if( p )
m_kalziumTip->showTip( mapFromGlobal(TQCursor::pos()), m_kalziumTip->showTip( mapFromGlobal(TQCursor::pos()),

6
kanagram/src/vocabedit.cpp
Unescape View File

@ -46,7 +46,7 @@ VocabEdit::VocabEdit(TQWidget *parent, TQString fileName) : VocabEditWidget(pare
if(fileName != "") if(fileName != "")
{ {
m_fileName = fileName; m_fileName = fileName;
KEduVocDocument *doc = new KEduVocDocument(TQT_TQOBJECT(this)); KEduVocDocument *doc = new KEduVocDocument(this);
doc->open(KURL(m_fileName), false); doc->open(KURL(m_fileName), false);
for(int i = 0; i < doc->numEntries(); i++) for(int i = 0; i < doc->numEntries(); i++)
{ {
@ -83,7 +83,7 @@ VocabEdit::~VocabEdit()
void VocabEdit::slotSave() void VocabEdit::slotSave()
{ {
KEduVocDocument *doc = new KEduVocDocument(TQT_TQOBJECT(this)); KEduVocDocument *doc = new KEduVocDocument(this);
doc->setTitle(txtVocabName->text()); doc->setTitle(txtVocabName->text());
doc->setDocRemark(txtDescription->text()); doc->setDocRemark(txtDescription->text());
for(uint i = 0; i < m_vocabList.size(); i++) for(uint i = 0; i < m_vocabList.size(); i++)
@ -100,7 +100,7 @@ void VocabEdit::slotSave()
{ {
fileName = m_fileName; fileName = m_fileName;
} }
doc->saveAs(TQT_TQOBJECT(this), KURL(fileName), KEduVocDocument::automatic, "kanagram"); doc->saveAs(this, KURL(fileName), KEduVocDocument::automatic, "kanagram");
VocabSettings *settings = (VocabSettings*)this->parentWidget(); VocabSettings *settings = (VocabSettings*)this->parentWidget();
settings->refreshView(); settings->refreshView();

2
kanagram/src/vocabsettings.cpp
Unescape View File

@ -37,7 +37,7 @@ void VocabSettings::refreshView()
m_fileList = TDEGlobal::dirs()->findAllResources("appdata", "data/" + KanagramSettings::dataLanguage() + "/" + "*.kvtml"); m_fileList = TDEGlobal::dirs()->findAllResources("appdata", "data/" + KanagramSettings::dataLanguage() + "/" + "*.kvtml");
for(uint i = 0; i < m_fileList.size(); i++) for(uint i = 0; i < m_fileList.size(); i++)
{ {
KEduVocDocument *doc = new KEduVocDocument(TQT_TQOBJECT(this)); KEduVocDocument *doc = new KEduVocDocument(this);
doc->open(KURL(m_fileList[i]), false); doc->open(KURL(m_fileList[i]), false);
TQListViewItem *item = new TQListViewItem(lviewVocab, 0); TQListViewItem *item = new TQListViewItem(lviewVocab, 0);
item->setText( 0, doc->getTitle() ); item->setText( 0, doc->getTitle() );

20
kbruch/src/mainqtwidget.cpp
Unescape View File

@ -155,19 +155,19 @@ void MainQtWidget::setupActions()
{ {
// new task action // new task action
m_NewTaskAction = new TDEAction(i18n("&New"), "document-new", TDEStdAccel::shortcut(TDEStdAccel::New), m_NewTaskAction = new TDEAction(i18n("&New"), "document-new", TDEStdAccel::shortcut(TDEStdAccel::New),
TQT_TQOBJECT(this), TQT_SLOT(NewTask()), this, TQT_SLOT(NewTask()),
actionCollection(), "NewTask"); actionCollection(), "NewTask");
// quit action // quit action
KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection()); KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection());
// //
KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT( slotPrefs() ), actionCollection()); KStdAction::preferences(this, TQT_SLOT( slotPrefs() ), actionCollection());
// a label just describing the Number of terms ComboBox // a label just describing the Number of terms ComboBox
m_NrOfTermsLabel = new TQLabel(i18n("Terms:"), 0, "tde toolbar widget"); m_NrOfTermsLabel = new TQLabel(i18n("Terms:"), 0, "tde toolbar widget");
m_NrOfTermsLabelAction = new KWidgetAction(m_NrOfTermsLabel, i18n("Terms:"), ALT+Key_E, m_NrOfTermsLabelAction = new KWidgetAction(m_NrOfTermsLabel, i18n("Terms:"), ALT+Key_E,
TQT_TQOBJECT(this), TQT_SLOT(NrOfTermsBoxSlot()), this, TQT_SLOT(NrOfTermsBoxSlot()),
actionCollection(), "NrOfTermsLabelAction"); actionCollection(), "NrOfTermsLabelAction");
// the ComboBox holding possible values for term number // the ComboBox holding possible values for term number
@ -179,15 +179,15 @@ void MainQtWidget::setupActions()
m_NrOfTermsBox->setCurrentItem(m_nrRatios - 2); m_NrOfTermsBox->setCurrentItem(m_nrRatios - 2);
TQToolTip::add( m_NrOfTermsBox, i18n( "The number of terms you want" ) ); TQToolTip::add( m_NrOfTermsBox, i18n( "The number of terms you want" ) );
TQWhatsThis::add( m_NrOfTermsBox, i18n( "Choose the number of terms (2, 3, 4 or 5) you want for calculating fractions." ) ); TQWhatsThis::add( m_NrOfTermsBox, i18n( "Choose the number of terms (2, 3, 4 or 5) you want for calculating fractions." ) );
m_NrOfTermsBoxAction = new KWidgetAction(m_NrOfTermsBox, i18n("Number of Terms"), ALT+Key_E, TQT_TQOBJECT(this), TQT_SLOT(NrOfTermsBoxSlot()), actionCollection(), "NrOfTermsBoxAction"); m_NrOfTermsBoxAction = new KWidgetAction(m_NrOfTermsBox, i18n("Number of Terms"), ALT+Key_E, this, TQT_SLOT(NrOfTermsBoxSlot()), actionCollection(), "NrOfTermsBoxAction");
// now connect the ComboBox's signal textChanged() to the slot function // now connect the ComboBox's signal textChanged() to the slot function
TQObject::connect(m_NrOfTermsBox, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(NrOfTermsBoxSlot())); TQObject::connect(m_NrOfTermsBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(NrOfTermsBoxSlot()));
// a label just describing the max. main denominator ComboBox // a label just describing the max. main denominator ComboBox
m_MaxMainDenominatorLabel = new TQLabel(i18n("Max. main denominator:"), 0, "tde toolbar widget"); m_MaxMainDenominatorLabel = new TQLabel(i18n("Max. main denominator:"), 0, "tde toolbar widget");
m_MaxMainDenominatorLabelAction = new KWidgetAction(m_MaxMainDenominatorLabel, i18n("Max. main denominator:"), ALT+Key_D, m_MaxMainDenominatorLabelAction = new KWidgetAction(m_MaxMainDenominatorLabel, i18n("Max. main denominator:"), ALT+Key_D,
TQT_TQOBJECT(this), TQT_SLOT(MaxMainDenominatorBoxSlot()), this, TQT_SLOT(MaxMainDenominatorBoxSlot()),
actionCollection(), "MaxMainDenominatorLabelAction"); actionCollection(), "MaxMainDenominatorLabelAction");
// the ComboBox holding possible values for the max. main denominator // the ComboBox holding possible values for the max. main denominator
@ -209,7 +209,7 @@ void MainQtWidget::setupActions()
case 50 : m_MaxMainDenominatorBox->setCurrentItem(3); case 50 : m_MaxMainDenominatorBox->setCurrentItem(3);
break; break;
} }
m_MaxMainDenominatorBoxAction = new KWidgetAction(m_MaxMainDenominatorBox, i18n("Maximal Main Denominator"), ALT+Key_D, TQT_TQOBJECT(this), TQT_SLOT(MaxMainDenominatorBoxSlot()), actionCollection(), "MaxMainDenominatorBoxAction"); m_MaxMainDenominatorBoxAction = new KWidgetAction(m_MaxMainDenominatorBox, i18n("Maximal Main Denominator"), ALT+Key_D, this, TQT_SLOT(MaxMainDenominatorBoxSlot()), actionCollection(), "MaxMainDenominatorBoxAction");
// now connect the ComboBox's signal textChanged() to the slot function // now connect the ComboBox's signal textChanged() to the slot function
TQObject::connect(m_MaxMainDenominatorBox, TQT_SIGNAL(activated(int)), TQObject::connect(m_MaxMainDenominatorBox, TQT_SIGNAL(activated(int)),
@ -218,7 +218,7 @@ void MainQtWidget::setupActions()
// a label just describing the operation ComboBox // a label just describing the operation ComboBox
m_OperationLabel = new TQLabel(i18n("Operations:"), 0, "tde toolbar widget"); m_OperationLabel = new TQLabel(i18n("Operations:"), 0, "tde toolbar widget");
m_OperationLabelAction = new KWidgetAction(m_OperationLabel, i18n("Operations:"), ALT+Key_O, m_OperationLabelAction = new KWidgetAction(m_OperationLabel, i18n("Operations:"), ALT+Key_O,
TQT_TQOBJECT(this), TQT_SLOT(OperationBoxSlot()), this, TQT_SLOT(OperationBoxSlot()),
actionCollection(), "OperationLabelAction"); actionCollection(), "OperationLabelAction");
// the ComboBox holding possible combinations for operations // the ComboBox holding possible combinations for operations
@ -236,7 +236,7 @@ void MainQtWidget::setupActions()
} }
TQToolTip::add( m_OperationBox, i18n( "The operations you want" ) ); TQToolTip::add( m_OperationBox, i18n( "The operations you want" ) );
TQWhatsThis::add( m_OperationBox, i18n( "Choose the type of operations you want for calculating fractions: Addition/Substraction, Multiplication/Division or All Operations Mixed. If you choose All Operations Mixed, the program will randomly choose addition, substraction, multiplication and/or division." ) ); TQWhatsThis::add( m_OperationBox, i18n( "Choose the type of operations you want for calculating fractions: Addition/Substraction, Multiplication/Division or All Operations Mixed. If you choose All Operations Mixed, the program will randomly choose addition, substraction, multiplication and/or division." ) );
m_OperationBoxAction = new KWidgetAction(m_OperationBox, i18n("Operations:"), ALT+Key_O, TQT_TQOBJECT(this), TQT_SLOT(OperationBoxSlot()), actionCollection(), "OperationBoxAction"); m_OperationBoxAction = new KWidgetAction(m_OperationBox, i18n("Operations:"), ALT+Key_O, this, TQT_SLOT(OperationBoxSlot()), actionCollection(), "OperationBoxAction");
// now connect the ComboBox's signal textChanged() to the slot function // now connect the ComboBox's signal textChanged() to the slot function
TQObject::connect(m_OperationBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(OperationBoxSlot())); TQObject::connect(m_OperationBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(OperationBoxSlot()));

10
keduca/keduca/keduca.cpp
Unescape View File

@ -36,7 +36,7 @@ Keduca::Keduca( TQWidget* parent, const char *name, WFlags f )
setXMLFile( "keducaui.rc" ); setXMLFile( "keducaui.rc" );
_part = KParts::ComponentFactory::createPartInstanceFromLibrary< KParts::ReadOnlyPart > _part = KParts::ComponentFactory::createPartInstanceFromLibrary< KParts::ReadOnlyPart >
( "libkeducapart", this, name, TQT_TQOBJECT(this), "KEducaPart" ); ( "libkeducapart", this, name, this, "KEducaPart" );
if ( _part ) if ( _part )
{ {
@ -63,12 +63,12 @@ Keduca::~Keduca()
void Keduca::setupActions() void Keduca::setupActions()
{ {
KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT( slotFileOpen() ), actionCollection() ); KStdAction::open( this, TQT_SLOT( slotFileOpen() ), actionCollection() );
(void)new TDEAction( i18n( "Open &Gallery..." ), 0, 0, TQT_TQOBJECT(this), TQT_SLOT( slotGallery() ), (void)new TDEAction( i18n( "Open &Gallery..." ), 0, 0, this, TQT_SLOT( slotGallery() ),
actionCollection(), "open_gallery" ); actionCollection(), "open_gallery" );
_recentFiles = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT ( slotFileOpenURL(const KURL &) ), _recentFiles = KStdAction::openRecent(this, TQT_SLOT ( slotFileOpenURL(const KURL &) ),
actionCollection()); actionCollection());
KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT( quit() ), actionCollection()); KStdAction::quit(kapp, TQT_SLOT( quit() ), actionCollection());
} }
void Keduca::slotFileOpen() void Keduca::slotFileOpen()

34
keduca/keducabuilder/keducabuilder.cpp
Unescape View File

@ -92,8 +92,8 @@ void KEducaBuilder::init()
_listAnswer = new TDEListBox( _split, "_listAnswer" ); _listAnswer = new TDEListBox( _split, "_listAnswer" );
_listAnswer->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, _listAnswer->sizePolicy().hasHeightForWidth() ) ); _listAnswer->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, _listAnswer->sizePolicy().hasHeightForWidth() ) );
connect( _listAnswer, TQT_SIGNAL( highlighted(TQListBoxItem *) ), TQT_TQOBJECT(this), TQT_SLOT( slotPreview(TQListBoxItem *) ) ); connect( _listAnswer, TQT_SIGNAL( highlighted(TQListBoxItem *) ), this, TQT_SLOT( slotPreview(TQListBoxItem *) ) );
connect( _listAnswer, TQT_SIGNAL( doubleClicked(TQListBoxItem *) ), TQT_TQOBJECT(this), TQT_SLOT( slotEditbyList(TQListBoxItem *) ) ); connect( _listAnswer, TQT_SIGNAL( doubleClicked(TQListBoxItem *) ), this, TQT_SLOT( slotEditbyList(TQListBoxItem *) ) );
_preview = new TQTextView( _split, "_preview" ); _preview = new TQTextView( _split, "_preview" );
_preview->setFrameShape( TQTextView::NoFrame ); _preview->setFrameShape( TQTextView::NoFrame );
@ -111,21 +111,21 @@ void KEducaBuilder::init()
/** Init menu bar settings */ /** Init menu bar settings */
void KEducaBuilder::initMenuBar() void KEducaBuilder::initMenuBar()
{ {
KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT( slotFileOpenNew() ), actionCollection()); KStdAction::openNew(this, TQT_SLOT( slotFileOpenNew() ), actionCollection());
KStdAction::open (TQT_TQOBJECT(this), TQT_SLOT( slotFileOpen() ), actionCollection()); KStdAction::open (this, TQT_SLOT( slotFileOpen() ), actionCollection());
(void)new TDEAction(i18n("Open &Gallery..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT( slotGallery() ), actionCollection(), "open_gallery"); (void)new TDEAction(i18n("Open &Gallery..."), 0, 0, this, TQT_SLOT( slotGallery() ), actionCollection(), "open_gallery");
_recentFiles = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT ( slotFileOpenURL(const KURL &)), actionCollection()); _recentFiles = KStdAction::openRecent(this, TQT_SLOT ( slotFileOpenURL(const KURL &)), actionCollection());
KStdAction::save (TQT_TQOBJECT(this), TQT_SLOT( slotFileSave() ), actionCollection()); KStdAction::save (this, TQT_SLOT( slotFileSave() ), actionCollection());
KStdAction::saveAs (TQT_TQOBJECT(this), TQT_SLOT( slotFileSaveAs() ), actionCollection()); KStdAction::saveAs (this, TQT_SLOT( slotFileSaveAs() ), actionCollection());
KStdAction::print (TQT_TQOBJECT(this), TQT_SLOT( slotFilePrint() ), actionCollection()); KStdAction::print (this, TQT_SLOT( slotFilePrint() ), actionCollection());
(void)new TDEAction(i18n("Document Info"), "application-vnd.tde.info", 0, TQT_TQOBJECT(this), TQT_SLOT( slotHeader() ), actionCollection(), "info_doc"); (void)new TDEAction(i18n("Document Info"), "application-vnd.tde.info", 0, this, TQT_SLOT( slotHeader() ), actionCollection(), "info_doc");
KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection()); KStdAction::quit(this, TQT_SLOT( close() ), actionCollection());
(void)new TDEAction(i18n("&Add..."), "addquestion", 0, TQT_TQOBJECT(this), TQT_SLOT( slotAdd() ), actionCollection(), "question_add"); (void)new TDEAction(i18n("&Add..."), "addquestion", 0, this, TQT_SLOT( slotAdd() ), actionCollection(), "question_add");
(void)new TDEAction(i18n("&Edit..."), "editquestion", 0, TQT_TQOBJECT(this), TQT_SLOT( slotEdit() ), actionCollection(), "question_edit"); (void)new TDEAction(i18n("&Edit..."), "editquestion", 0, this, TQT_SLOT( slotEdit() ), actionCollection(), "question_edit");
(void)new TDEAction(i18n("&Remove"), "delquestion", 0, TQT_TQOBJECT(this), TQT_SLOT( slotRemove() ), actionCollection(), "question_remove"); (void)new TDEAction(i18n("&Remove"), "delquestion", 0, this, TQT_SLOT( slotRemove() ), actionCollection(), "question_remove");
(void)new TDEAction(i18n("&Up"), "go-up", 0, TQT_TQOBJECT(this), TQT_SLOT( slotUp() ), actionCollection(), "question_up"); (void)new TDEAction(i18n("&Up"), "go-up", 0, this, TQT_SLOT( slotUp() ), actionCollection(), "question_up");
(void)new TDEAction(i18n("&Down"), "go-down", 0, TQT_TQOBJECT(this), TQT_SLOT( slotDown() ), actionCollection(), "question_down"); (void)new TDEAction(i18n("&Down"), "go-down", 0, this, TQT_SLOT( slotDown() ), actionCollection(), "question_down");
} }
/** Delete current document and start new */ /** Delete current document and start new */

24
kgeography/src/kgeography.cpp
Unescape View File

@ -65,16 +65,16 @@ kgeography::kgeography() : TDEMainWindow(), p_firstShow(true), p_mustShowResults
setCentralWidget(p_bigWidget); setCentralWidget(p_bigWidget);
connect(p_consult, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(consult())); connect(p_consult, TQT_SIGNAL(clicked()), this, TQT_SLOT(consult()));
connect(p_askMap, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(askMap())); connect(p_askMap, TQT_SIGNAL(clicked()), this, TQT_SLOT(askMap()));
connect(p_askCapitalDivisions, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(askCapitalDivisions())); connect(p_askCapitalDivisions, TQT_SIGNAL(clicked()), this, TQT_SLOT(askCapitalDivisions()));
connect(p_askDivisionCapitals, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(askDivisionCapitals())); connect(p_askDivisionCapitals, TQT_SIGNAL(clicked()), this, TQT_SLOT(askDivisionCapitals()));
connect(p_askFlagDivisions, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(askFlagDivisions())); connect(p_askFlagDivisions, TQT_SIGNAL(clicked()), this, TQT_SLOT(askFlagDivisions()));
connect(p_askDivisionFlags, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(askDivisionFlags())); connect(p_askDivisionFlags, TQT_SIGNAL(clicked()), this, TQT_SLOT(askDivisionFlags()));
TDEAction *a = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(openMap()), actionCollection(), "openMap"); TDEAction *a = KStdAction::open(this, TQT_SLOT(openMap()), actionCollection(), "openMap");
a -> setText(i18n("&Open Map...")); a -> setText(i18n("&Open Map..."));
KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection(), "quit"); KStdAction::quit(this, TQT_SLOT(close()), actionCollection(), "quit");
p_zoom = new TDEToggleAction(i18n("&Zoom"), "zoom-fit-best", 0, 0, 0, actionCollection(), "zoom_select"); p_zoom = new TDEToggleAction(i18n("&Zoom"), "zoom-fit-best", 0, 0, 0, actionCollection(), "zoom_select");
p_zoom -> setEnabled(false); p_zoom -> setEnabled(false);
@ -85,7 +85,7 @@ kgeography::kgeography() : TDEMainWindow(), p_firstShow(true), p_mustShowResults
p_move = new TDEToggleAction(i18n("&Move"), "move", 0, 0, 0, actionCollection(), "move"); p_move = new TDEToggleAction(i18n("&Move"), "move", 0, 0, 0, actionCollection(), "move");
p_move -> setEnabled(false); p_move -> setEnabled(false);
new TDEAction(i18n("Disclaimer"), 0, TQT_TQOBJECT(this), TQT_SLOT(disclaimer()), actionCollection(), "disclaimer"); new TDEAction(i18n("Disclaimer"), 0, this, TQT_SLOT(disclaimer()), actionCollection(), "disclaimer");
setupGUI(Keys | ToolBar | Save | Create); setupGUI(Keys | ToolBar | Save | Create);
@ -132,7 +132,7 @@ void kgeography::showEvent(TQShowEvent *)
} }
// if anyone can explain why with the slot works and now without // if anyone can explain why with the slot works and now without
// i'll be glad to learn // i'll be glad to learn
TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(resizeMainWindow())); TQTimer::singleShot(0, this, TQT_SLOT(resizeMainWindow()));
// resizeMainWindow(); // resizeMainWindow();
p_firstShow = false; p_firstShow = false;
@ -275,7 +275,7 @@ void kgeography::putAskWidget()
connect(p_askWidget, TQT_SIGNAL(setMoveActionEnabled(bool)), p_move, TQT_SLOT(setEnabled(bool))); connect(p_askWidget, TQT_SIGNAL(setMoveActionEnabled(bool)), p_move, TQT_SLOT(setEnabled(bool)));
connect(p_askWidget, TQT_SIGNAL(setMoveActionChecked(bool)), p_move, TQT_SLOT(setChecked(bool))); connect(p_askWidget, TQT_SIGNAL(setMoveActionChecked(bool)), p_move, TQT_SLOT(setChecked(bool)));
connect(p_move, TQT_SIGNAL(toggled(bool)), p_askWidget, TQT_SLOT(setMovement(bool))); connect(p_move, TQT_SIGNAL(toggled(bool)), p_askWidget, TQT_SLOT(setMovement(bool)));
connect(p_askWidget, TQT_SIGNAL(questionsEnded()), TQT_TQOBJECT(this), TQT_SLOT(showResultsDialog())); connect(p_askWidget, TQT_SIGNAL(questionsEnded()), this, TQT_SLOT(showResultsDialog()));
} }
void kgeography::setMap(KGmap *m) void kgeography::setMap(KGmap *m)

18
khangman/khangman/khangman.cpp
Unescape View File

@ -74,30 +74,30 @@ KHangMan::~KHangMan()
void KHangMan::setupActions() void KHangMan::setupActions()
{ {
// Game->New // Game->New
TDEAction *action = new TDEAction(i18n("&New"), "document-new", CTRL+Key_N , TQT_TQOBJECT(m_view), TQT_SLOT(slotNewGame()), actionCollection(), "file_new"); TDEAction *action = new TDEAction(i18n("&New"), "document-new", CTRL+Key_N , m_view, TQT_SLOT(slotNewGame()), actionCollection(), "file_new");
action->setToolTip(i18n( "Play with a new word" )); action->setToolTip(i18n( "Play with a new word" ));
// Game->Get Words in New Language // Game->Get Words in New Language
new TDEAction( i18n("&Get Words in New Language..."), "knewstuff", CTRL+Key_G, TQT_TQOBJECT(this), TQT_SLOT( slotDownloadNewStuff() ), actionCollection(), "downloadnewstuff" ); new TDEAction( i18n("&Get Words in New Language..."), "knewstuff", CTRL+Key_G, this, TQT_SLOT( slotDownloadNewStuff() ), actionCollection(), "downloadnewstuff" );
KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actionCollection()); KStdAction::quit(this, TQT_SLOT(slotQuit()), actionCollection());
m_levelAction = new TDESelectAction(i18n("Le&vel"), 0, actionCollection(), "combo_level"); m_levelAction = new TDESelectAction(i18n("Le&vel"), 0, actionCollection(), "combo_level");
m_levelAction->setToolTip(i18n( "Choose the level" )); m_levelAction->setToolTip(i18n( "Choose the level" ));
m_levelAction->setWhatsThis(i18n( "Choose the level of difficulty" )); m_levelAction->setWhatsThis(i18n( "Choose the level of difficulty" ));
connect(m_levelAction, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotChangeLevel(int))); connect(m_levelAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotChangeLevel(int)));
// Action for selecting language. // Action for selecting language.
m_languageAction = new TDESelectAction(i18n("&Language"), 0, actionCollection(), "languages"); m_languageAction = new TDESelectAction(i18n("&Language"), 0, actionCollection(), "languages");
m_languageAction->setItems(m_languageNames); m_languageAction->setItems(m_languageNames);
m_languageAction->setCurrentItem(m_languages.findIndex(Prefs::selectedLanguage())); m_languageAction->setCurrentItem(m_languages.findIndex(Prefs::selectedLanguage()));
connect(m_languageAction, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotChangeLanguage(int))); connect(m_languageAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotChangeLanguage(int)));
KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(optionsPreferences()), actionCollection()); KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection());
// Mode. Currently hard coded into Sea and Desert themes. // Mode. Currently hard coded into Sea and Desert themes.
TQStringList modes; TQStringList modes;
m_modeAction = new TDESelectAction(i18n("L&ook"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotChangeMode()), actionCollection(), "combo_mode"); m_modeAction = new TDESelectAction(i18n("L&ook"), 0, this, TQT_SLOT(slotChangeMode()), actionCollection(), "combo_mode");
modes += i18n("&Sea Theme"); modes += i18n("&Sea Theme");
modes += i18n("&Desert Theme"); modes += i18n("&Desert Theme");
m_modeAction->setItems(modes); m_modeAction->setItems(modes);
@ -382,7 +382,7 @@ void KHangMan::optionsPreferences()
Timer *m_timer = new Timer(); Timer *m_timer = new Timer();
dialog->addPage(m_timer, i18n("Timers"), "clock"); dialog->addPage(m_timer, i18n("Timers"), "clock");
connect(dialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(this), TQT_SLOT(updateSettings())); connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(updateSettings()));
dialog->show(); dialog->show();
} }
@ -457,7 +457,7 @@ void KHangMan::loadLangToolBar()
for (int i=0; i<(int) m_allData.count(); i++) for (int i=0; i<(int) m_allData.count(); i++)
secondToolbar->insertButton (charIcon(m_allData[i].at(0)), i, secondToolbar->insertButton (charIcon(m_allData[i].at(0)), i,
TQT_SIGNAL( clicked() ), TQT_TQOBJECT(this), TQT_SIGNAL( clicked() ), this,
TQT_SLOT( slotPasteChar()), true, TQT_SLOT( slotPasteChar()), true,
i18n("Inserts the character %1").arg(m_allData[i]), i+1 ); i18n("Inserts the character %1").arg(m_allData[i]), i+1 );
} }

20
kig/kig/kig.cpp
Unescape View File

@ -69,7 +69,7 @@ Kig::Kig()
// now that the Part is loaded, we cast it to a Part to get // now that the Part is loaded, we cast it to a Part to get
// our hands on it // our hands on it
m_part = static_cast<KParts::ReadWritePart*> m_part = static_cast<KParts::ReadWritePart*>
(factory->create(TQT_TQOBJECT(this), "kig_part", "KParts::ReadWritePart" )); (factory->create(this, "kig_part", "KParts::ReadWritePart" ));
if (m_part) if (m_part)
{ {
// tell the KParts::MainWindow that this is indeed the main widget // tell the KParts::MainWindow that this is indeed the main widget
@ -105,30 +105,30 @@ Kig::~Kig()
void Kig::setupActions() void Kig::setupActions()
{ {
KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(fileNew()), actionCollection()); KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection());
KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection()); KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection());
KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); KStdAction::quit(this, TQT_SLOT(close()), actionCollection());
#ifdef KIG_DONT_USE_NEW_KMAINWINDOW_FEATURES #ifdef KIG_DONT_USE_NEW_KMAINWINDOW_FEATURES
m_toolbarAction = KStdAction::showToolbar(TQT_TQOBJECT(this), TQT_SLOT(optionsShowToolbar()), actionCollection()); m_toolbarAction = KStdAction::showToolbar(this, TQT_SLOT(optionsShowToolbar()), actionCollection());
m_statusbarAction = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(optionsShowStatusbar()), actionCollection()); m_statusbarAction = KStdAction::showStatusbar(this, TQT_SLOT(optionsShowStatusbar()), actionCollection());
#else #else
createStandardStatusBarAction(); createStandardStatusBarAction();
setStandardToolBarMenuEnabled(true); setStandardToolBarMenuEnabled(true);
#endif #endif
// FIXME: this (recent files) should be app-wide, not specific to each window... // FIXME: this (recent files) should be app-wide, not specific to each window...
m_recentFilesAction = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(openURL(const KURL&)), actionCollection()); m_recentFilesAction = KStdAction::openRecent(this, TQT_SLOT(openURL(const KURL&)), actionCollection());
m_recentFilesAction->loadEntries(config); m_recentFilesAction->loadEntries(config);
#if KDE_IS_VERSION( 3, 2, 90 ) #if KDE_IS_VERSION( 3, 2, 90 )
KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ), actionCollection() ); KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ), actionCollection() );
#else #else
KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureKeys()), actionCollection()); KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection());
#endif #endif
KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection()); KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection());
KStdAction::tipOfDay( TQT_TQOBJECT(this), TQT_SLOT( tipOfDay() ), actionCollection(), "help_tipofday" ); KStdAction::tipOfDay( this, TQT_SLOT( tipOfDay() ), actionCollection(), "help_tipofday" );
} }
void Kig::saveProperties(TDEConfig* config) void Kig::saveProperties(TDEConfig* config)

12
kig/kig/kig_part.cpp
Unescape View File

@ -258,17 +258,17 @@ void KigPart::setupActions()
KigExportManager::instance()->addMenuAction( this, m_widget->realWidget(), KigExportManager::instance()->addMenuAction( this, m_widget->realWidget(),
actionCollection() ); actionCollection() );
TDEAction* a = KStdAction::zoomIn( TQT_TQOBJECT(m_widget), TQT_SLOT( slotZoomIn() ), TDEAction* a = KStdAction::zoomIn( m_widget, TQT_SLOT( slotZoomIn() ),
actionCollection() ); actionCollection() );
a->setToolTip( i18n( "Zoom in on the document" ) ); a->setToolTip( i18n( "Zoom in on the document" ) );
a->setWhatsThis( i18n( "Zoom in on the document" ) ); a->setWhatsThis( i18n( "Zoom in on the document" ) );
a = KStdAction::zoomOut( TQT_TQOBJECT(m_widget), TQT_SLOT( slotZoomOut() ), a = KStdAction::zoomOut( m_widget, TQT_SLOT( slotZoomOut() ),
actionCollection() ); actionCollection() );
a->setToolTip( i18n( "Zoom out of the document" ) ); a->setToolTip( i18n( "Zoom out of the document" ) );
a->setWhatsThis( i18n( "Zoom out of the document" ) ); a->setWhatsThis( i18n( "Zoom out of the document" ) );
a = KStdAction::fitToPage( TQT_TQOBJECT(m_widget), TQT_SLOT( slotRecenterScreen() ), a = KStdAction::fitToPage( m_widget, TQT_SLOT( slotRecenterScreen() ),
actionCollection() ); actionCollection() );
// grr.. why isn't there an icon for this.. // grr.. why isn't there an icon for this..
a->setIconSet( TQIconSet( l->loadIcon( "view_fit_to_page", TDEIcon::Toolbar ) ) ); a->setIconSet( TQIconSet( l->loadIcon( "view_fit_to_page", TDEIcon::Toolbar ) ) );
@ -281,7 +281,7 @@ void KigPart::setupActions()
#endif #endif
#endif #endif
#ifdef KIG_PART_CPP_STD_FULLSCREEN_ACTION #ifdef KIG_PART_CPP_STD_FULLSCREEN_ACTION
a = KStdAction::fullScreen( TQT_TQOBJECT(m_widget), TQT_SLOT( toggleFullScreen() ), actionCollection(), (TQWidget*)(widget()->parent()),"fullscreen" ); a = KStdAction::fullScreen( m_widget, TQT_SLOT( toggleFullScreen() ), actionCollection(), (TQWidget*)(widget()->parent()),"fullscreen" );
#else #else
tmp = l->loadIcon( "view-fullscreen", TDEIcon::Toolbar ); tmp = l->loadIcon( "view-fullscreen", TDEIcon::Toolbar );
a = new TDEAction( a = new TDEAction(
@ -294,13 +294,13 @@ void KigPart::setupActions()
// TODO: an icon for this.. // TODO: an icon for this..
a = new TDEAction( a = new TDEAction(
i18n( "&Select Shown Area" ), "zoom-fit-best", 0, TQT_TQOBJECT(m_widget), TQT_SLOT( zoomRect() ), i18n( "&Select Shown Area" ), "zoom-fit-best", 0, m_widget, TQT_SLOT( zoomRect() ),
actionCollection(), "view_select_shown_rect" ); actionCollection(), "view_select_shown_rect" );
a->setToolTip( i18n( "Select the area that you want to be shown in the window." ) ); a->setToolTip( i18n( "Select the area that you want to be shown in the window." ) );
a->setWhatsThis( i18n( "Select the area that you want to be shown in the window." ) ); a->setWhatsThis( i18n( "Select the area that you want to be shown in the window." ) );
a = new TDEAction( a = new TDEAction(
i18n( "S&elect Zoom Area" ), "viewmag", 0, TQT_TQOBJECT(m_widget), TQT_SLOT( zoomArea() ), i18n( "S&elect Zoom Area" ), "viewmag", 0, m_widget, TQT_SLOT( zoomArea() ),
actionCollection(), "view_zoom_area" ); actionCollection(), "view_zoom_area" );
// a->setToolTip( i18n( "Select the area that you want to be shown in the window." ) ); // a->setToolTip( i18n( "Select the area that you want to be shown in the window." ) );
// a->setWhatsThis( i18n( "Select the area that you want to be shown in the window." ) ); // a->setWhatsThis( i18n( "Select the area that you want to be shown in the window." ) );

10
kig/scripting/newscriptwizard.cpp
Unescape View File

@ -97,11 +97,11 @@ NewScriptWizard::NewScriptWizard( TQWidget* parent, ScriptModeBase* mode )
TDEPopupMenu* pm = new TDEPopupMenu( editor ); TDEPopupMenu* pm = new TDEPopupMenu( editor );
// creating the actions for the code editor... // creating the actions for the code editor...
TDEActionCollection* ac = new TDEActionCollection( editor ); TDEActionCollection* ac = new TDEActionCollection( editor );
TDEAction* undoAction = KStdAction::undo( TQT_TQOBJECT(this), TQT_SLOT( slotUndo() ), ac ); TDEAction* undoAction = KStdAction::undo( this, TQT_SLOT( slotUndo() ), ac );
TDEAction* redoAction = KStdAction::redo( TQT_TQOBJECT(this), TQT_SLOT( slotRedo() ), ac ); TDEAction* redoAction = KStdAction::redo( this, TQT_SLOT( slotRedo() ), ac );
TDEAction* cutAction = KStdAction::cut( TQT_TQOBJECT(this), TQT_SLOT( slotCut() ), ac ); TDEAction* cutAction = KStdAction::cut( this, TQT_SLOT( slotCut() ), ac );
TDEAction* copyAction = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT( slotCopy() ), ac ); TDEAction* copyAction = KStdAction::copy( this, TQT_SLOT( slotCopy() ), ac );
TDEAction* pasteAction = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT( slotPaste() ), ac ); TDEAction* pasteAction = KStdAction::paste( this, TQT_SLOT( slotPaste() ), ac );
// ... and plugging them into the popup menu (to build it, of course :) ) // ... and plugging them into the popup menu (to build it, of course :) )
undoAction->plug( pm ); undoAction->plug( pm );
redoAction->plug( pm ); redoAction->plug( pm );

70
kiten/kiten.cpp
Unescape View File

@ -54,43 +54,43 @@ TopLevel::TopLevel(TQWidget *parent, const char *name) : TDEMainWindow(parent, n
config = Config::self(); config = Config::self();
config->readConfig(); config->readConfig();
Accel = new TDEGlobalAccel(TQT_TQOBJECT(this)); Accel = new TDEGlobalAccel(this);
(void) Accel->insert("Lookup Kanji (Kanjidic)", i18n("Lookup Kanji (Kanjidic)"), i18n("Gives detailed information about Kanji currently on clipboard."), CTRL + ALT + Key_K, CTRL + ALT + Key_K, TQT_TQOBJECT(this), TQT_SLOT(kanjiSearchAccel())); (void) Accel->insert("Lookup Kanji (Kanjidic)", i18n("Lookup Kanji (Kanjidic)"), i18n("Gives detailed information about Kanji currently on clipboard."), CTRL + ALT + Key_K, CTRL + ALT + Key_K, this, TQT_SLOT(kanjiSearchAccel()));
(void) Accel->insert("Lookup English/Japanese word", i18n("Lookup English/Japanese Word"), i18n("Looks up current text on clipboard in the same way as if you used Kiten's regular search."), CTRL + ALT + Key_S, CTRL + ALT + Key_S, TQT_TQOBJECT(this), TQT_SLOT(searchAccel())); (void) Accel->insert("Lookup English/Japanese word", i18n("Lookup English/Japanese Word"), i18n("Looks up current text on clipboard in the same way as if you used Kiten's regular search."), CTRL + ALT + Key_S, CTRL + ALT + Key_S, this, TQT_SLOT(searchAccel()));
Accel->readSettings(TDEGlobal::config()); Accel->readSettings(TDEGlobal::config());
Accel->updateConnections(); Accel->updateConnections();
_ResultView = new ResultView(true, this, "_ResultView"); _ResultView = new ResultView(true, this, "_ResultView");
setCentralWidget(_ResultView); setCentralWidget(_ResultView);
(void) KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); (void) KStdAction::quit(this, TQT_SLOT(close()), actionCollection());
(void) KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(print()), actionCollection()); (void) KStdAction::print(this, TQT_SLOT(print()), actionCollection());
(void) KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), actionCollection()); (void) KStdAction::preferences(this, TQT_SLOT(slotConfigure()), actionCollection());
KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection()); KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection());
(void) new TDEAction(i18n("&Learn"), "pencil", CTRL+Key_L, TQT_TQOBJECT(this), TQT_SLOT(createLearn()), actionCollection(), "file_learn"); (void) new TDEAction(i18n("&Learn"), "pencil", CTRL+Key_L, this, TQT_SLOT(createLearn()), actionCollection(), "file_learn");
(void) new TDEAction(i18n("&Dictionary Editor..."), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT(createEEdit()), actionCollection(), "dict_editor"); (void) new TDEAction(i18n("&Dictionary Editor..."), "edit", 0, this, TQT_SLOT(createEEdit()), actionCollection(), "dict_editor");
(void) new TDEAction(i18n("Ra&dical Search..."), "gear", CTRL+Key_R, TQT_TQOBJECT(this), TQT_SLOT(radicalSearch()), actionCollection(), "search_radical"); (void) new TDEAction(i18n("Ra&dical Search..."), "gear", CTRL+Key_R, this, TQT_SLOT(radicalSearch()), actionCollection(), "search_radical");
Edit = new EditAction(i18n("Search Edit"), 0, TQT_TQOBJECT(this), TQT_SLOT(search()), actionCollection(), "search_edit"); Edit = new EditAction(i18n("Search Edit"), 0, this, TQT_SLOT(search()), actionCollection(), "search_edit");
(void) new TDEAction(i18n("&Clear Search Bar"), BarIcon("locationbar_erase", 16), CTRL+Key_N, Edit, TQT_SLOT(clear()), actionCollection(), "clear_search"); (void) new TDEAction(i18n("&Clear Search Bar"), BarIcon("locationbar_erase", 16), CTRL+Key_N, Edit, TQT_SLOT(clear()), actionCollection(), "clear_search");
(void) new TDEAction(i18n("S&earch"), "key_enter", 0, TQT_TQOBJECT(this), TQT_SLOT(search()), actionCollection(), "search"); (void) new TDEAction(i18n("S&earch"), "key_enter", 0, this, TQT_SLOT(search()), actionCollection(), "search");
(void) new TDEAction(i18n("Search with &Beginning of Word"), 0, TQT_TQOBJECT(this), TQT_SLOT(searchBeginning()), actionCollection(), "search_beginning"); (void) new TDEAction(i18n("Search with &Beginning of Word"), 0, this, TQT_SLOT(searchBeginning()), actionCollection(), "search_beginning");
(void) new TDEAction(i18n("Search &Anywhere"), 0, TQT_TQOBJECT(this), TQT_SLOT(searchAnywhere()), actionCollection(), "search_anywhere"); (void) new TDEAction(i18n("Search &Anywhere"), 0, this, TQT_SLOT(searchAnywhere()), actionCollection(), "search_anywhere");
(void) new TDEAction(i18n("Stro&kes"), "paintbrush", CTRL+Key_S, TQT_TQOBJECT(this), TQT_SLOT(strokeSearch()), actionCollection(), "search_stroke"); (void) new TDEAction(i18n("Stro&kes"), "paintbrush", CTRL+Key_S, this, TQT_SLOT(strokeSearch()), actionCollection(), "search_stroke");
(void) new TDEAction(i18n("&Grade"), "format-justify-left", CTRL+Key_G, TQT_TQOBJECT(this), TQT_SLOT(gradeSearch()), actionCollection(), "search_grade"); (void) new TDEAction(i18n("&Grade"), "format-justify-left", CTRL+Key_G, this, TQT_SLOT(gradeSearch()), actionCollection(), "search_grade");
kanjiCB = new TDEToggleAction(i18n("&Kanjidic"), "kanjidic", CTRL+Key_K, TQT_TQOBJECT(this), TQT_SLOT(kanjiDictChange()), actionCollection(), "kanji_toggle"); kanjiCB = new TDEToggleAction(i18n("&Kanjidic"), "kanjidic", CTRL+Key_K, this, TQT_SLOT(kanjiDictChange()), actionCollection(), "kanji_toggle");
deinfCB = new TDEToggleAction(i18n("&Deinflect Verbs in Regular Search"), 0, TQT_TQOBJECT(this), TQT_SLOT(kanjiDictChange()), actionCollection(), "deinf_toggle"); deinfCB = new TDEToggleAction(i18n("&Deinflect Verbs in Regular Search"), 0, this, TQT_SLOT(kanjiDictChange()), actionCollection(), "deinf_toggle");
comCB = new TDEToggleAction(i18n("&Filter Rare"), "filter", CTRL+Key_F, TQT_TQOBJECT(this), TQT_SLOT(toggleCom()), actionCollection(), "common"); comCB = new TDEToggleAction(i18n("&Filter Rare"), "filter", CTRL+Key_F, this, TQT_SLOT(toggleCom()), actionCollection(), "common");
autoSearchToggle = new TDEToggleAction(i18n("&Automatically Search Clipboard Selections"), "edit-find", 0, TQT_TQOBJECT(this), TQT_SLOT(kanjiDictChange()), actionCollection(), "autosearch_toggle"); autoSearchToggle = new TDEToggleAction(i18n("&Automatically Search Clipboard Selections"), "edit-find", 0, this, TQT_SLOT(kanjiDictChange()), actionCollection(), "autosearch_toggle");
irAction = new TDEAction(i18n("Search &in Results"), "edit-find", CTRL+Key_I, TQT_TQOBJECT(this), TQT_SLOT(resultSearch()), actionCollection(), "search_in_results"); irAction = new TDEAction(i18n("Search &in Results"), "edit-find", CTRL+Key_I, this, TQT_SLOT(resultSearch()), actionCollection(), "search_in_results");
(void) KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(configureToolBars()), actionCollection()); (void) KStdAction::configureToolbars(this, TQT_SLOT(configureToolBars()), actionCollection());
addAction = new TDEAction(i18n("Add &Kanji to Learning List"), 0, TQT_TQOBJECT(this), TQT_SLOT(addToList()), actionCollection(), "add"); addAction = new TDEAction(i18n("Add &Kanji to Learning List"), 0, this, TQT_SLOT(addToList()), actionCollection(), "add");
addAction->setEnabled(false); addAction->setEnabled(false);
(void) new TDEAction(i18n("Configure &Global Shortcuts..."), "configure_shortcuts", 0, TQT_TQOBJECT(this), TQT_SLOT(configureGlobalKeys()), actionCollection(), "options_configure_keybinding"); (void) new TDEAction(i18n("Configure &Global Shortcuts..."), "configure_shortcuts", 0, this, TQT_SLOT(configureGlobalKeys()), actionCollection(), "options_configure_keybinding");
historyAction = new TDEListAction(i18n("&History"), 0, 0, 0, actionCollection(), "history"); historyAction = new TDEListAction(i18n("&History"), 0, 0, 0, actionCollection(), "history");
connect(historyAction, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(goInHistory(int))); connect(historyAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(goInHistory(int)));
backAction = KStdAction::back(TQT_TQOBJECT(this), TQT_SLOT(back()), actionCollection()); backAction = KStdAction::back(this, TQT_SLOT(back()), actionCollection());
forwardAction = KStdAction::forward(TQT_TQOBJECT(this), TQT_SLOT(forward()), actionCollection()); forwardAction = KStdAction::forward(this, TQT_SLOT(forward()), actionCollection());
backAction->setEnabled(false); backAction->setEnabled(false);
forwardAction->setEnabled(false); forwardAction->setEnabled(false);
currentResult = resultHistory.end(); currentResult = resultHistory.end();
@ -115,9 +115,9 @@ TopLevel::TopLevel(TQWidget *parent, const char *name) : TDEMainWindow(parent, n
applyMainWindowSettings(TDEGlobal::config(), "TopLevelWindow"); applyMainWindowSettings(TDEGlobal::config(), "TopLevelWindow");
connect(_ResultView, TQT_SIGNAL(linkClicked(const TQString &)), TQT_SLOT(ressearch(const TQString &))); connect(_ResultView, TQT_SIGNAL(linkClicked(const TQString &)), TQT_SLOT(ressearch(const TQString &)));
connect(kapp->clipboard(), TQT_SIGNAL(selectionChanged()), TQT_TQOBJECT(this), TQT_SLOT(autoSearch())); connect(kapp->clipboard(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(autoSearch()));
TQTimer::singleShot(10, TQT_TQOBJECT(this), TQT_SLOT(finishInit())); TQTimer::singleShot(10, this, TQT_SLOT(finishInit()));
} }
TopLevel::~TopLevel() TopLevel::~TopLevel()
@ -610,8 +610,8 @@ void TopLevel::slotConfigure()
//ConfigureDialog didn't find an instance of this dialog, so lets create it : //ConfigureDialog didn't find an instance of this dialog, so lets create it :
optionDialog = new ConfigureDialog(this, "settings"); optionDialog = new ConfigureDialog(this, "settings");
connect(optionDialog, TQT_SIGNAL(hidden()),this,TQT_SLOT(slotConfigureHide())); connect(optionDialog, TQT_SIGNAL(hidden()),this,TQT_SLOT(slotConfigureHide()));
connect(optionDialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotConfigurationChanged())); connect(optionDialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(slotConfigurationChanged()));
connect(optionDialog, TQT_SIGNAL(valueChanged()), TQT_TQOBJECT(this), TQT_SIGNAL(quizConfChanged())); connect(optionDialog, TQT_SIGNAL(valueChanged()), this, TQT_SIGNAL(quizConfChanged()));
optionDialog->show(); optionDialog->show();
return; return;
@ -625,7 +625,7 @@ void TopLevel::slotLearnConfigure()
void TopLevel::slotConfigureHide() void TopLevel::slotConfigureHide()
{ {
TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(slotConfigureDestroy())); TQTimer::singleShot(0, this, TQT_SLOT(slotConfigureDestroy()));
} }
void TopLevel::slotConfigureDestroy() void TopLevel::slotConfigureDestroy()
@ -641,9 +641,9 @@ void TopLevel::createLearn()
{ {
Learn *_Learn = new Learn(_Asyndeta.retrieveIndex(), 0); Learn *_Learn = new Learn(_Asyndeta.retrieveIndex(), 0);
connect(_Learn, TQT_SIGNAL(destroyed(Learn *)), TQT_TQOBJECT(this), TQT_SLOT(learnDestroyed(Learn *))); connect(_Learn, TQT_SIGNAL(destroyed(Learn *)), this, TQT_SLOT(learnDestroyed(Learn *)));
connect(_Learn, TQT_SIGNAL(linkClicked(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(ressearch(const TQString &))); connect(_Learn, TQT_SIGNAL(linkClicked(const TQString &)), this, TQT_SLOT(ressearch(const TQString &)));
connect(_Learn, TQT_SIGNAL(configureLearn()), TQT_TQOBJECT(this), TQT_SLOT(slotLearnConfigure())); connect(_Learn, TQT_SIGNAL(configureLearn()), this, TQT_SLOT(slotLearnConfigure()));
connect(this, TQT_SIGNAL(quizConfChanged()), _Learn, TQT_SLOT(updateQuizConfiguration())); connect(this, TQT_SIGNAL(quizConfChanged()), _Learn, TQT_SLOT(updateQuizConfiguration()));
connect(this, TQT_SIGNAL(add(Dict::Entry)), _Learn, TQT_SLOT(add(Dict::Entry))); connect(this, TQT_SIGNAL(add(Dict::Entry)), _Learn, TQT_SLOT(add(Dict::Entry)));
@ -743,7 +743,7 @@ void TopLevel::newToolBarConfig()
RadWidget *TopLevel::radicalSearch() RadWidget *TopLevel::radicalSearch()
{ {
RadWidget *rw = new RadWidget(&_Rad, 0, "rw"); RadWidget *rw = new RadWidget(&_Rad, 0, "rw");
connect(rw, TQT_SIGNAL(set(const TQStringList &, unsigned int, unsigned int)), TQT_TQOBJECT(this), TQT_SLOT(radSearch(const TQStringList &, unsigned int, unsigned int))); connect(rw, TQT_SIGNAL(set(const TQStringList &, unsigned int, unsigned int)), this, TQT_SLOT(radSearch(const TQStringList &, unsigned int, unsigned int)));
rw->show(); rw->show();
return rw; return rw;
} }

28
kiten/learn.cpp
Unescape View File

@ -113,25 +113,25 @@ Learn::Learn(Dict::Index *parentDict, TQWidget *parent, const char *name)
grades.append(i18n("Others in Jouyou")); grades.append(i18n("Others in Jouyou"));
grades.append(i18n("Jinmeiyou")); grades.append(i18n("Jinmeiyou"));
/*TDEAction *closeAction = */(void) KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); /*TDEAction *closeAction = */(void) KStdAction::close(this, TQT_SLOT(close()), actionCollection());
printAct = KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(print()), actionCollection()); printAct = KStdAction::print(this, TQT_SLOT(print()), actionCollection());
forwardAct = KStdAction::forward(TQT_TQOBJECT(this), TQT_SLOT(next()), actionCollection()); forwardAct = KStdAction::forward(this, TQT_SLOT(next()), actionCollection());
forwardAct->plug(toolBar()); forwardAct->plug(toolBar());
backAct = KStdAction::back(TQT_TQOBJECT(this), TQT_SLOT(prev()), actionCollection()); backAct = KStdAction::back(this, TQT_SLOT(prev()), actionCollection());
backAct->plug(toolBar()); backAct->plug(toolBar());
cheatAct = new TDEAction(i18n("&Cheat"), CTRL + Key_C, TQT_TQOBJECT(this), TQT_SLOT(cheat()), actionCollection(), "cheat"); cheatAct = new TDEAction(i18n("&Cheat"), CTRL + Key_C, this, TQT_SLOT(cheat()), actionCollection(), "cheat");
randomAct = new TDEAction(i18n("&Random"), "goto", CTRL + Key_R, TQT_TQOBJECT(this), TQT_SLOT(random()), actionCollection(), "random"); randomAct = new TDEAction(i18n("&Random"), "goto", CTRL + Key_R, this, TQT_SLOT(random()), actionCollection(), "random");
gradeAct = new TDEListAction(i18n("Grade"), 0, 0, 0, actionCollection(), "grade"); gradeAct = new TDEListAction(i18n("Grade"), 0, 0, 0, actionCollection(), "grade");
gradeAct->setItems(grades); gradeAct->setItems(grades);
connect(gradeAct, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(updateGrade())); connect(gradeAct, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(updateGrade()));
removeAct = new TDEAction(i18n("&Delete"), "edit_remove", CTRL + Key_X, TQT_TQOBJECT(this), TQT_SLOT(del()), actionCollection(), "del"); removeAct = new TDEAction(i18n("&Delete"), "edit_remove", CTRL + Key_X, this, TQT_SLOT(del()), actionCollection(), "del");
addAct = new TDEAction(i18n("&Add"), "edit_add", CTRL + Key_A, TQT_TQOBJECT(this), TQT_SLOT(add()), actionCollection(), "add"); addAct = new TDEAction(i18n("&Add"), "edit_add", CTRL + Key_A, this, TQT_SLOT(add()), actionCollection(), "add");
addAllAct = new TDEAction(i18n("Add A&ll"), 0, TQT_TQOBJECT(this), TQT_SLOT(addAll()), actionCollection(), "addall"); addAllAct = new TDEAction(i18n("Add A&ll"), 0, this, TQT_SLOT(addAll()), actionCollection(), "addall");
newAct = KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(openNew()), actionCollection()); newAct = KStdAction::openNew(this, TQT_SLOT(openNew()), actionCollection());
openAct = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(open()), actionCollection()); openAct = KStdAction::open(this, TQT_SLOT(open()), actionCollection());
saveAct = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(save()), actionCollection()); saveAct = KStdAction::save(this, TQT_SLOT(save()), actionCollection());
saveAsAct = KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(saveAs()), actionCollection()); saveAsAct = KStdAction::saveAs(this, TQT_SLOT(saveAs()), actionCollection());
(void) KStdAction::preferences(TQT_TQOBJECT(this), TQT_SIGNAL(configureLearn()), actionCollection()); (void) KStdAction::preferences(this, TQT_SIGNAL(configureLearn()), actionCollection());
removeAct->setEnabled(false); removeAct->setEnabled(false);

12
kiten/widgets.cpp
Unescape View File

@ -317,11 +317,11 @@ eEdit::eEdit(const TQString &_filename, TQWidget *parent, const char *name)
List->setMultiSelection(true); List->setMultiSelection(true);
List->setDragEnabled(true); List->setDragEnabled(true);
saveAct = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(save()), actionCollection()); saveAct = KStdAction::save(this, TQT_SLOT(save()), actionCollection());
removeAct = new TDEAction(i18n("&Delete"), "edit_remove", CTRL + Key_X, TQT_TQOBJECT(this), TQT_SLOT(del()), actionCollection(), "del"); removeAct = new TDEAction(i18n("&Delete"), "edit_remove", CTRL + Key_X, this, TQT_SLOT(del()), actionCollection(), "del");
(void) new TDEAction(i18n("&Disable Dictionary"), 0, TQT_TQOBJECT(this), TQT_SLOT(disable()), actionCollection(), "disable"); (void) new TDEAction(i18n("&Disable Dictionary"), 0, this, TQT_SLOT(disable()), actionCollection(), "disable");
addAct = new TDEAction(i18n("&Add"), "edit_add", CTRL + Key_A, TQT_TQOBJECT(this), TQT_SLOT(add()), actionCollection(), "add"); addAct = new TDEAction(i18n("&Add"), "edit_add", CTRL + Key_A, this, TQT_SLOT(add()), actionCollection(), "add");
(void) KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); (void) KStdAction::close(this, TQT_SLOT(close()), actionCollection());
createGUI("eeditui.rc"); createGUI("eeditui.rc");
//closeAction->plug(toolBar()); //closeAction->plug(toolBar());
@ -462,7 +462,7 @@ int EditAction::plug( TQWidget *w, int index )
addContainer(toolBar, id); addContainer(toolBar, id);
connect( toolBar, TQT_SIGNAL( destroyed() ), TQT_TQOBJECT(this), TQT_SLOT( slotDestroyed() ) ); connect( toolBar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
toolBar->setItemAutoSized( id, true ); toolBar->setItemAutoSized( id, true );

26
klatin/klatin/klatin.cpp
Unescape View File

@ -53,12 +53,12 @@ KLatin::~KLatin()
void KLatin::setupActions() void KLatin::setupActions()
{ {
// Setup various menu actions // Setup various menu actions
KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(loadSettings()), actionCollection()); KStdAction::preferences(this, TQT_SLOT(loadSettings()), actionCollection());
m_loadVocab = new TDEAction(i18n("Load &Vocabulary"), 0, TQT_TQOBJECT(this), TQT_SLOT(loadVocab()), actionCollection(), "go_vocab"); m_loadVocab = new TDEAction(i18n("Load &Vocabulary"), 0, this, TQT_SLOT(loadVocab()), actionCollection(), "go_vocab");
m_loadGrammar = new TDEAction(i18n("Load &Grammar"), 0, TQT_TQOBJECT(this), TQT_SLOT(loadGrammar()), actionCollection(), "go_grammar"); m_loadGrammar = new TDEAction(i18n("Load &Grammar"), 0, this, TQT_SLOT(loadGrammar()), actionCollection(), "go_grammar");
m_loadVerbs = new TDEAction(i18n("Load V&erbs"), 0, TQT_TQOBJECT(this), TQT_SLOT(loadVerbs()), actionCollection(), "go_verbs"); m_loadVerbs = new TDEAction(i18n("Load V&erbs"), 0, this, TQT_SLOT(loadVerbs()), actionCollection(), "go_verbs");
m_loadRevision = new TDEAction(i18n("Load &Revision"), 0, TQT_TQOBJECT(this), TQT_SLOT(loadRevision()), actionCollection(), "go_revision"); m_loadRevision = new TDEAction(i18n("Load &Revision"), 0, this, TQT_SLOT(loadRevision()), actionCollection(), "go_revision");
KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection()); KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection());
} }
void KLatin::startClicked() void KLatin::startClicked()
@ -91,7 +91,7 @@ void KLatin::loadVocab()
// When the child emits the signal exitted(), // When the child emits the signal exitted(),
// then reset the GUI to go back to the menu // then reset the GUI to go back to the menu
connect(klatinvocabsection, TQT_SIGNAL(exited()), TQT_TQOBJECT(this), TQT_SLOT(resetGUI())); connect(klatinvocabsection, TQT_SIGNAL(exited()), this, TQT_SLOT(resetGUI()));
// Set the section variable // Set the section variable
m_section = 1; m_section = 1;
@ -114,8 +114,8 @@ void KLatin::loadGrammar()
// When the child emits the signal exited(), // When the child emits the signal exited(),
// then reset the GUI to go back to the menu // then reset the GUI to go back to the menu
connect(klatingrammarsection, TQT_SIGNAL(exited()), TQT_TQOBJECT(this), TQT_SLOT(resetGUI())); connect(klatingrammarsection, TQT_SIGNAL(exited()), this, TQT_SLOT(resetGUI()));
connect(klatingrammarsection, TQT_SIGNAL(statusMsg(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slotWriteMsg(const TQString&))); connect(klatingrammarsection, TQT_SIGNAL(statusMsg(const TQString&)), this, TQT_SLOT(slotWriteMsg(const TQString&)));
// Set the section variable // Set the section variable
m_section = 2; m_section = 2;
} }
@ -142,8 +142,8 @@ void KLatin::loadVerbs()
// When the child emits the signal exited(), // When the child emits the signal exited(),
// then reset the GUI to go back to the menu // then reset the GUI to go back to the menu
connect(klatinverbssection, TQT_SIGNAL(exited()), TQT_TQOBJECT(this), TQT_SLOT(resetGUI())); connect(klatinverbssection, TQT_SIGNAL(exited()), this, TQT_SLOT(resetGUI()));
connect(klatinverbssection, TQT_SIGNAL(statusMsg(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slotWriteMsg(const TQString&))); connect(klatinverbssection, TQT_SIGNAL(statusMsg(const TQString&)), this, TQT_SLOT(slotWriteMsg(const TQString&)));
// Set the section variable // Set the section variable
m_section = 3; m_section = 3;
@ -166,7 +166,7 @@ void KLatin::loadSettings()
vocabPage->kcfg_DefaultFile->setFilter("*.kvtml"); vocabPage->kcfg_DefaultFile->setFilter("*.kvtml");
vocabPage->kcfg_DefaultFile->setCaption(i18n("Load Vocabulary File")); vocabPage->kcfg_DefaultFile->setCaption(i18n("Load Vocabulary File"));
dialog->addPage(vocabPage, i18n("Vocabulary"), "kdict"); dialog->addPage(vocabPage, i18n("Vocabulary"), "kdict");
connect(dialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(this), TQT_SLOT(settingsChanged())); connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(settingsChanged()));
dialog->show(); dialog->show();
} }
@ -189,7 +189,7 @@ void KLatin::resetGUI()
setCentralWidget(klatinchoose); setCentralWidget(klatinchoose);
// Connect the "Start" button to slot StartPressed() // Connect the "Start" button to slot StartPressed()
connect(klatinchoose->StartButton, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(startClicked())); connect(klatinchoose->StartButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(startClicked()));
// Make the quit button quit the application :) // Make the quit button quit the application :)
connect(klatinchoose->QuitButton, TQT_SIGNAL(clicked()), kapp, TQT_SLOT(quit())); connect(klatinchoose->QuitButton, TQT_SIGNAL(clicked()), kapp, TQT_SLOT(quit()));

18
klettres/klettres/klettres.cpp
Unescape View File

@ -195,16 +195,16 @@ bool KLettres::loadLayout(TQDomDocument &layoutDocument)
void KLettres::setupActions() void KLettres::setupActions()
{ {
TDEAction *m_newAction = new TDEAction(i18n("New Sound"), "file_new", CTRL+Key_N, TQT_TQOBJECT(m_view), TQT_SLOT(game()), actionCollection(), "play_new"); TDEAction *m_newAction = new TDEAction(i18n("New Sound"), "file_new", CTRL+Key_N, m_view, TQT_SLOT(game()), actionCollection(), "play_new");
m_newAction->setToolTip(i18n("Play a new sound")); m_newAction->setToolTip(i18n("Play a new sound"));
m_newAction->setWhatsThis(i18n("You can play a new sound by clicking this button or using the File menu, New Sound.")); m_newAction->setWhatsThis(i18n("You can play a new sound by clicking this button or using the File menu, New Sound."));
new TDEAction( i18n("Get Alphabet in New Language..."), "knewstuff", 0, TQT_TQOBJECT(this), TQT_SLOT( slotDownloadNewStuff() ), actionCollection(), "downloadnewstuff" ); new TDEAction( i18n("Get Alphabet in New Language..."), "knewstuff", 0, this, TQT_SLOT( slotDownloadNewStuff() ), actionCollection(), "downloadnewstuff" );
TDEAction *m_playAgainAction = new TDEAction(i18n("Replay Sound"),"media-playback-start", CTRL+Key_P, TQT_TQOBJECT(m_view), TQT_SLOT(slotPlayAgain()), actionCollection(), "play_again"); TDEAction *m_playAgainAction = new TDEAction(i18n("Replay Sound"),"media-playback-start", CTRL+Key_P, m_view, TQT_SLOT(slotPlayAgain()), actionCollection(), "play_again");
m_playAgainAction->setToolTip(i18n("Play the same sound again")); m_playAgainAction->setToolTip(i18n("Play the same sound again"));
m_playAgainAction->setWhatsThis(i18n("You can replay the same sound again by clicking this button or using the File menu, Replay Sound.")); m_playAgainAction->setWhatsThis(i18n("You can replay the same sound again by clicking this button or using the File menu, Replay Sound."));
KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection()); KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection());
m_menubarAction = new TDEToggleAction(i18n("Show &Menubar"),"edit-clear", CTRL+Key_M, TQT_TQOBJECT(this), TQT_SLOT(slotMenubar()), actionCollection(), "menubar"); m_menubarAction = new TDEToggleAction(i18n("Show &Menubar"),"edit-clear", CTRL+Key_M, this, TQT_SLOT(slotMenubar()), actionCollection(), "menubar");
m_menubarAction->setCheckedState(i18n("Hide &Menubar")); m_menubarAction->setCheckedState(i18n("Hide &Menubar"));
m_menubarAction->setChecked(true); m_menubarAction->setChecked(true);
m_menubarAction->setWhatsThis(i18n("You can show or hide the menubar as you wish by clicking this button.")); m_menubarAction->setWhatsThis(i18n("You can show or hide the menubar as you wish by clicking this button."));
@ -230,16 +230,16 @@ void KLettres::setupActions()
m_themeAction->setToolTip(i18n("Select the theme")); m_themeAction->setToolTip(i18n("Select the theme"));
m_themeAction->setWhatsThis(i18n("Here you can change the theme for KLettres. A theme consists in the background picture and the font color for the letter displayed.")); m_themeAction->setWhatsThis(i18n("Here you can change the theme for KLettres. A theme consists in the background picture and the font color for the letter displayed."));
m_kidAction = new TDEToggleAction(i18n("Mode Kid"), "klettres_kids", CTRL+Key_K, TQT_TQOBJECT(this), TQT_SLOT(slotModeKid()), actionCollection(), "mode_kid"); m_kidAction = new TDEToggleAction(i18n("Mode Kid"), "klettres_kids", CTRL+Key_K, this, TQT_SLOT(slotModeKid()), actionCollection(), "mode_kid");
m_kidAction->setWhatsThis(i18n("If you are in the Grown-up mode, clicking on this button will set up the Kid mode. The Kid mode has no menubar and the font is bigger in the statusbar.")); m_kidAction->setWhatsThis(i18n("If you are in the Grown-up mode, clicking on this button will set up the Kid mode. The Kid mode has no menubar and the font is bigger in the statusbar."));
m_grownupAction = new TDEToggleAction(i18n("Mode Grown-up"), "klettres_grownup", CTRL+Key_G, TQT_TQOBJECT(this), TQT_SLOT(slotModeGrownup()), actionCollection(), "mode_grownup"); m_grownupAction = new TDEToggleAction(i18n("Mode Grown-up"), "klettres_grownup", CTRL+Key_G, this, TQT_SLOT(slotModeGrownup()), actionCollection(), "mode_grownup");
m_grownupAction->setWhatsThis(i18n("The Grown-up mode is the normal mode where you can see the menubar.")); m_grownupAction->setWhatsThis(i18n("The Grown-up mode is the normal mode where you can see the menubar."));
connect(m_levelAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotChangeLevel(int))); connect(m_levelAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotChangeLevel(int)));
connect(m_languageAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotChangeLanguage(int))); connect(m_languageAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotChangeLanguage(int)));
connect(m_themeAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotChangeTheme(int))); connect(m_themeAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotChangeTheme(int)));
KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(optionsPreferences()), actionCollection()); KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection());
setupGUI(); setupGUI();
} }
@ -475,7 +475,7 @@ void KLettres::loadLangToolBar()
openFileStream.close(); openFileStream.close();
for (int i=0; i<(int) allData.count(); i++) { for (int i=0; i<(int) allData.count(); i++) {
if (!allData[i].isEmpty()) if (!allData[i].isEmpty())
m_secondToolbar->insertButton (charIcon(allData[i].at(0)), i, TQT_SIGNAL( clicked() ), TQT_TQOBJECT(this), TQT_SLOT( slotPasteChar()), true, i18n("Inserts the character %1").arg(allData[i]), i+1 ); m_secondToolbar->insertButton (charIcon(allData[i].at(0)), i, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotPasteChar()), true, i18n("Inserts the character %1").arg(allData[i]), i+1 );
} }
} }
} }

22
kmplot/kmplot/MainDlg.cpp
Unescape View File

@ -140,12 +140,12 @@ void MainDlg::setupActions()
( void ) new TDEAction( i18n( "E&xport..." ), 0, this, TQT_SLOT( slotExport() ), actionCollection(), "export"); ( void ) new TDEAction( i18n( "E&xport..." ), 0, this, TQT_SLOT( slotExport() ), actionCollection(), "export");
//zoom menu //zoom menu
m_mnuNoZoom = new TDERadioAction(i18n("&No Zoom") ,"CTRL+0",TQT_TQOBJECT(view), TQT_SLOT( mnuNoZoom_clicked() ),actionCollection(),"no_zoom" ); m_mnuNoZoom = new TDERadioAction(i18n("&No Zoom") ,"CTRL+0",view, TQT_SLOT( mnuNoZoom_clicked() ),actionCollection(),"no_zoom" );
TDERadioAction * mnuRectangular = new TDERadioAction(i18n("Zoom &Rectangular"), "zoom-fit-best", "CTRL+1",TQT_TQOBJECT(view), TQT_SLOT( mnuRectangular_clicked() ),actionCollection(),"zoom_rectangular" ); TDERadioAction * mnuRectangular = new TDERadioAction(i18n("Zoom &Rectangular"), "zoom-fit-best", "CTRL+1",view, TQT_SLOT( mnuRectangular_clicked() ),actionCollection(),"zoom_rectangular" );
TDERadioAction * mnuZoomIn = new TDERadioAction(i18n("Zoom &In"), "zoom-in", "CTRL+2",TQT_TQOBJECT(view), TQT_SLOT( mnuZoomIn_clicked() ),actionCollection(),"zoom_in" ); TDERadioAction * mnuZoomIn = new TDERadioAction(i18n("Zoom &In"), "zoom-in", "CTRL+2",view, TQT_SLOT( mnuZoomIn_clicked() ),actionCollection(),"zoom_in" );
TDERadioAction * mnuZoomOut = new TDERadioAction(i18n("Zoom &Out"), "zoom-out", "CTRL+3",TQT_TQOBJECT(view), TQT_SLOT( mnuZoomOut_clicked() ),actionCollection(),"zoom_out" ); TDERadioAction * mnuZoomOut = new TDERadioAction(i18n("Zoom &Out"), "zoom-out", "CTRL+3",view, TQT_SLOT( mnuZoomOut_clicked() ),actionCollection(),"zoom_out" );
TDERadioAction * mnuZoomCenter = new TDERadioAction(i18n("&Center Point") ,"CTRL+4",TQT_TQOBJECT(view), TQT_SLOT( mnuCenter_clicked() ),actionCollection(),"zoom_center" ); TDERadioAction * mnuZoomCenter = new TDERadioAction(i18n("&Center Point") ,"CTRL+4",view, TQT_SLOT( mnuCenter_clicked() ),actionCollection(),"zoom_center" );
(void ) new TDEAction(i18n("&Fit Widget to Trigonometric Functions") ,0,TQT_TQOBJECT(view), TQT_SLOT( mnuTrig_clicked() ),actionCollection(),"zoom_trig" ); (void ) new TDEAction(i18n("&Fit Widget to Trigonometric Functions") ,0,view, TQT_SLOT( mnuTrig_clicked() ),actionCollection(),"zoom_trig" );
m_mnuNoZoom->setExclusiveGroup("zoom_modes"); m_mnuNoZoom->setExclusiveGroup("zoom_modes");
m_mnuNoZoom->setChecked(true); m_mnuNoZoom->setChecked(true);
mnuRectangular->setExclusiveGroup("zoom_modes"); mnuRectangular->setExclusiveGroup("zoom_modes");
@ -190,16 +190,16 @@ void MainDlg::setupActions()
view->mnuSliders[3] = new TDEToggleAction( i18n( "Show Slider 4" ), 0, this, TQT_SLOT( toggleShowSlider3() ), actionCollection(), TQString( "options_configure_show_slider_3" ).latin1() ); view->mnuSliders[3] = new TDEToggleAction( i18n( "Show Slider 4" ), 0, this, TQT_SLOT( toggleShowSlider3() ), actionCollection(), TQString( "options_configure_show_slider_3" ).latin1() );
// Popup menu // Popup menu
TDEAction *mnuHide = new TDEAction(i18n("&Hide") ,0,TQT_TQOBJECT(view), TQT_SLOT( mnuHide_clicked() ),actionCollection(),"mnuhide" ); TDEAction *mnuHide = new TDEAction(i18n("&Hide") ,0,view, TQT_SLOT( mnuHide_clicked() ),actionCollection(),"mnuhide" );
mnuHide->plug(m_popupmenu); mnuHide->plug(m_popupmenu);
TDEAction *mnuRemove = new TDEAction(i18n("&Remove"),"edit-delete", 0,TQT_TQOBJECT(view), TQT_SLOT( mnuRemove_clicked() ),actionCollection(),"mnuremove" ); TDEAction *mnuRemove = new TDEAction(i18n("&Remove"),"edit-delete", 0,view, TQT_SLOT( mnuRemove_clicked() ),actionCollection(),"mnuremove" );
mnuRemove->plug(m_popupmenu); mnuRemove->plug(m_popupmenu);
TDEAction *mnuEdit = new TDEAction(i18n("&Edit"),"editplots", 0,TQT_TQOBJECT(view), TQT_SLOT( mnuEdit_clicked() ),actionCollection(),"mnuedit" ); TDEAction *mnuEdit = new TDEAction(i18n("&Edit"),"editplots", 0,view, TQT_SLOT( mnuEdit_clicked() ),actionCollection(),"mnuedit" );
mnuEdit->plug(m_popupmenu); mnuEdit->plug(m_popupmenu);
m_popupmenu->insertSeparator(); m_popupmenu->insertSeparator();
TDEAction *mnuCopy = new TDEAction(i18n("&Copy"), 0,TQT_TQOBJECT(view), TQT_SLOT( mnuCopy_clicked() ),actionCollection(),"mnucopy" ); TDEAction *mnuCopy = new TDEAction(i18n("&Copy"), 0,view, TQT_SLOT( mnuCopy_clicked() ),actionCollection(),"mnucopy" );
mnuCopy->plug(m_popupmenu); mnuCopy->plug(m_popupmenu);
TDEAction *mnuMove = new TDEAction(i18n("&Move"), 0,TQT_TQOBJECT(view), TQT_SLOT( mnuMove_clicked() ),actionCollection(),"mnumove" ); TDEAction *mnuMove = new TDEAction(i18n("&Move"), 0,view, TQT_SLOT( mnuMove_clicked() ),actionCollection(),"mnumove" );
mnuMove->plug(m_popupmenu); mnuMove->plug(m_popupmenu);
m_popupmenu->insertSeparator(); m_popupmenu->insertSeparator();
mnuYValue->plug(m_popupmenu); mnuYValue->plug(m_popupmenu);

12
kmplot/kmplot/kmplot.cpp
Unescape View File

@ -59,7 +59,7 @@ KmPlot::KmPlot( TDECmdLineArgs* args)
{ {
// now that the Part is loaded, we cast it to a Part to get // now that the Part is loaded, we cast it to a Part to get
// our hands on it // our hands on it
m_part = static_cast<KParts::ReadOnlyPart *>(factory->create(TQT_TQOBJECT(this), m_part = static_cast<KParts::ReadOnlyPart *>(factory->create(this,
"kmplot_part", "KParts::ReadOnlyPart" )); "kmplot_part", "KParts::ReadOnlyPart" ));
if (m_part) if (m_part)
{ {
@ -135,15 +135,15 @@ bool KmPlot::load(const KURL& url)
void KmPlot::setupActions() void KmPlot::setupActions()
{ {
KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(fileNew()), actionCollection()); KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection());
KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection()); KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection());
KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection()); KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection());
createStandardStatusBarAction(); createStandardStatusBarAction();
setStandardToolBarMenuEnabled(true); setStandardToolBarMenuEnabled(true);
KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureKeys()), actionCollection()); KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection());
KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection()); KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection());
m_fullScreen = KStdAction::fullScreen( NULL, NULL, actionCollection(), this, "fullscreen"); m_fullScreen = KStdAction::fullScreen( NULL, NULL, actionCollection(), this, "fullscreen");
connect( m_fullScreen, TQT_SIGNAL( toggled( bool )), this, TQT_SLOT( slotUpdateFullScreen( bool ))); connect( m_fullScreen, TQT_SIGNAL( toggled( bool )), this, TQT_SLOT( slotUpdateFullScreen( bool )));

4
kmplot/kmplot/ksliderwindow.cpp
Unescape View File

@ -61,9 +61,9 @@ KSliderWindow::KSliderWindow(TQWidget* parent, int num ) :
installEventFilter(this); installEventFilter(this);
m_popupmenu = new TDEPopupMenu(this); m_popupmenu = new TDEPopupMenu(this);
TDEAction *mnuMinValue = new TDEAction(i18n("&Change Minimum Value") ,0,TQT_TQOBJECT(this), TQT_SLOT( mnuMinValue_clicked() ),0); TDEAction *mnuMinValue = new TDEAction(i18n("&Change Minimum Value") ,0,this, TQT_SLOT( mnuMinValue_clicked() ),0);
mnuMinValue->plug(m_popupmenu); mnuMinValue->plug(m_popupmenu);
TDEAction *mnuMaxValue = new TDEAction(i18n("&Change Maximum Value") ,0,TQT_TQOBJECT(this), TQT_SLOT( mnuMaxValue_clicked() ),0 ); TDEAction *mnuMaxValue = new TDEAction(i18n("&Change Maximum Value") ,0,this, TQT_SLOT( mnuMaxValue_clicked() ),0 );
mnuMaxValue->plug(m_popupmenu); mnuMaxValue->plug(m_popupmenu);
} }

4
kpercentage/kpercentage/kanswer.cpp
Unescape View File

@ -217,7 +217,7 @@ void KAnswer::setupSprite()
advPer = 80; advPer = 80;
canvas = new TQCanvas( TQT_TQOBJECT(this) ); canvas = new TQCanvas( this );
canvas->resize( size().width(), size().height() ); canvas->resize( size().width(), size().height() );
pixs = new TQCanvasPixmapArray( locate( "data", "kpercentage/pics/" )+"smily%1.png", 7 ); pixs = new TQCanvasPixmapArray( locate( "data", "kpercentage/pics/" )+"smily%1.png", 7 );
@ -241,7 +241,7 @@ void KAnswer::timerEvent( TQTimerEvent *event )
int KAnswer::exec() int KAnswer::exec()
{ {
TQT_TQOBJECT(this)->killTimers(); this->killTimers();
startTimer( 3000 ); // 5 seconds startTimer( 3000 ); // 5 seconds
return KDialog::exec(); return KDialog::exec();
} }

2
kpercentage/kpercentage/ksplashscreen.cpp
Unescape View File

@ -39,7 +39,7 @@ KSplashScreen::KSplashScreen( KPercentage *percentage, const char *name ) :
/* load the background pixmap */ /* load the background pixmap */
TQPixmap bgp( locate( "data", "kpercentage/pics/splash.png" ) ); TQPixmap bgp( locate( "data", "kpercentage/pics/splash.png" ) );
/* wait some time and start the main window */ /* wait some time and start the main window */
TQCanvas *canvas = new TQCanvas( TQT_TQOBJECT(this) ); TQCanvas *canvas = new TQCanvas( this );
canvas->resize( 400, 300 ); canvas->resize( 400, 300 );
/* set the background pixmap */ /* set the background pixmap */
canvas->setBackgroundPixmap( bgp ); canvas->setBackgroundPixmap( bgp );

34
kstars/kstars/fitsviewer.cpp
Unescape View File

@ -131,39 +131,39 @@ FITSViewer::FITSViewer (const KURL *url, TQWidget *parent, const char *name)
if (KSUtils::openDataFile( tempFile, "imgreduction.png" ) ) if (KSUtils::openDataFile( tempFile, "imgreduction.png" ) )
{ {
new TDEAction( i18n("Image Reduction"), tempFile.name(), TDEShortcut( "Ctrl+R" ), TQT_TQOBJECT(this), TQT_SLOT( imageReduction()), actionCollection(), "image_reduce"); new TDEAction( i18n("Image Reduction"), tempFile.name(), TDEShortcut( "Ctrl+R" ), this, TQT_SLOT( imageReduction()), actionCollection(), "image_reduce");
tempFile.close(); tempFile.close();
} }
else else
new TDEAction( i18n("Image Reduction"), "blend", TDEShortcut( "Ctrl+R" ), TQT_TQOBJECT(this), TQT_SLOT( imageReduction()), actionCollection(), "image_reduce"); new TDEAction( i18n("Image Reduction"), "blend", TDEShortcut( "Ctrl+R" ), this, TQT_SLOT( imageReduction()), actionCollection(), "image_reduce");
/*if (KSUtils::openDataFile( tempFile, "bricon.png" ) ) /*if (KSUtils::openDataFile( tempFile, "bricon.png" ) )
{ {
new TDEAction( i18n("Brightness/Contrast"), tempFile.name(), TDEShortcut( "Ctrl+T" ), TQT_TQOBJECT(this), TQT_SLOT( BrightContrastDlg()), actionCollection(), "image_brightness_contrast"); new TDEAction( i18n("Brightness/Contrast"), tempFile.name(), TDEShortcut( "Ctrl+T" ), this, TQT_SLOT( BrightContrastDlg()), actionCollection(), "image_brightness_contrast");
tempFile.close(); tempFile.close();
} }
else*/ else*/
new TDEAction( i18n("Brightness/Contrast"), "contrast+", TDEShortcut( "Ctrl+T" ), TQT_TQOBJECT(this), TQT_SLOT( BrightContrastDlg()), actionCollection(), "image_brightness_contrast"); new TDEAction( i18n("Brightness/Contrast"), "contrast+", TDEShortcut( "Ctrl+T" ), this, TQT_SLOT( BrightContrastDlg()), actionCollection(), "image_brightness_contrast");
if (KSUtils::openDataFile( tempFile, "histogram.png" ) ) if (KSUtils::openDataFile( tempFile, "histogram.png" ) )
{ {
new TDEAction ( i18n("Histogram"), tempFile.name(), TDEShortcut("Ctrl+H"), TQT_TQOBJECT(this), TQT_SLOT (imageHistogram()), actionCollection(), "image_histogram"); new TDEAction ( i18n("Histogram"), tempFile.name(), TDEShortcut("Ctrl+H"), this, TQT_SLOT (imageHistogram()), actionCollection(), "image_histogram");
tempFile.close(); tempFile.close();
} }
else else
new TDEAction ( i18n("Histogram"), "wizard", TDEShortcut("Ctrl+H"), TQT_TQOBJECT(this), TQT_SLOT (imageHistogram()), actionCollection(), "image_histogram"); new TDEAction ( i18n("Histogram"), "wizard", TDEShortcut("Ctrl+H"), this, TQT_SLOT (imageHistogram()), actionCollection(), "image_histogram");
KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection()); KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection());
KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(fileSave()), actionCollection()); KStdAction::save(this, TQT_SLOT(fileSave()), actionCollection());
KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(fileSaveAs()), actionCollection()); KStdAction::saveAs(this, TQT_SLOT(fileSaveAs()), actionCollection());
KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(slotClose()), actionCollection()); KStdAction::close(this, TQT_SLOT(slotClose()), actionCollection());
KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(fitsCOPY()), actionCollection()); KStdAction::copy(this, TQT_SLOT(fitsCOPY()), actionCollection());
KStdAction::zoomIn(TQT_TQOBJECT(image), TQT_SLOT(fitsZoomIn()), actionCollection()); KStdAction::zoomIn(image, TQT_SLOT(fitsZoomIn()), actionCollection());
KStdAction::zoomOut(TQT_TQOBJECT(image), TQT_SLOT(fitsZoomOut()), actionCollection()); KStdAction::zoomOut(image, TQT_SLOT(fitsZoomOut()), actionCollection());
new TDEAction( i18n( "&Default Zoom" ), "viewmagfit.png", TDEShortcut( "Ctrl+D" ), new TDEAction( i18n( "&Default Zoom" ), "viewmagfit.png", TDEShortcut( "Ctrl+D" ),
TQT_TQOBJECT(image), TQT_SLOT(fitsZoomDefault()), actionCollection(), "zoom_default" ); image, TQT_SLOT(fitsZoomDefault()), actionCollection(), "zoom_default" );
new TDEAction( i18n( "Statistics"), "sum", 0, TQT_TQOBJECT(this), TQT_SLOT(fitsStatistics()), actionCollection(), "image_stats"); new TDEAction( i18n( "Statistics"), "sum", 0, this, TQT_SLOT(fitsStatistics()), actionCollection(), "image_stats");
new TDEAction( i18n( "FITS Header"), "frame_spreadsheet.png", 0, TQT_TQOBJECT(this), TQT_SLOT(fitsHeader()), actionCollection(), "fits_editor"); new TDEAction( i18n( "FITS Header"), "frame_spreadsheet.png", 0, this, TQT_SLOT(fitsHeader()), actionCollection(), "fits_editor");
/* Create GUI */ /* Create GUI */
createGUI("fitsviewer.rc"); createGUI("fitsviewer.rc");
@ -557,7 +557,7 @@ void FITSViewer::fileSave()
if (TQFile::exists(currentURL.path())) if (TQFile::exists(currentURL.path()))
{ {
int r=KMessageBox::warningContinueCancel(TQT_TQWIDGET(parent()), int r=KMessageBox::warningContinueCancel(static_cast<TQWidget*>(parent()),
i18n( "A file named \"%1\" already exists. " i18n( "A file named \"%1\" already exists. "
"Overwrite it?" ).arg(currentURL.fileName()), "Overwrite it?" ).arg(currentURL.fileName()),
i18n( "Overwrite File?" ), i18n( "Overwrite File?" ),

2
kstars/kstars/focusdialog.cpp
Unescape View File

@ -42,7 +42,7 @@ FocusDialog::FocusDialog( TQWidget *parent )
setMainWidget(page); setMainWidget(page);
TQVBoxLayout *vlay = new TQVBoxLayout( page, 0, spacingHint() ); TQVBoxLayout *vlay = new TQVBoxLayout( page, 0, spacingHint() );
fdlg = new FocusDialogDlg(page); fdlg = new FocusDialogDlg(page);
fdlg->epochName->setValidator( new KDoubleValidator( TQT_TQOBJECT(fdlg->epochName) ) ); fdlg->epochName->setValidator( new KDoubleValidator( fdlg->epochName ) );
vlay->addWidget( fdlg ); vlay->addWidget( fdlg );
connect( fdlg->raBox, TQT_SIGNAL(textChanged( const TQString & ) ), this, TQT_SLOT( checkLineEdits() ) ); connect( fdlg->raBox, TQT_SIGNAL(textChanged( const TQString & ) ), this, TQT_SLOT( checkLineEdits() ) );

2
kstars/kstars/fovdialog.cpp
Unescape View File

@ -42,7 +42,7 @@
FOVDialog::FOVDialog( TQWidget *parent ) FOVDialog::FOVDialog( TQWidget *parent )
: KDialogBase( KDialogBase::Plain, i18n( "Set FOV Indicator" ), Ok|Cancel, Ok, parent ) { : KDialogBase( KDialogBase::Plain, i18n( "Set FOV Indicator" ), Ok|Cancel, Ok, parent ) {
ks = (KStars*)TQT_TQWIDGET(parent); ks = (KStars*)parent;
TQFrame *page = plainPage(); TQFrame *page = plainPage();
TQVBoxLayout *vlay = new TQVBoxLayout( page, 0, 0 ); TQVBoxLayout *vlay = new TQVBoxLayout( page, 0, 0 );

6
kstars/kstars/imageviewer.cpp
Unescape View File

@ -37,9 +37,9 @@ ImageViewer::ImageViewer (const KURL *url, const TQString &capText, TQWidget *pa
// JH: easier to just disable its mobility // JH: easier to just disable its mobility
toolBar()->setMovingEnabled( false ); toolBar()->setMovingEnabled( false );
TDEAction *action = new TDEAction (i18n ("Close Window"), "window-close", CTRL+Key_Q, TQT_TQOBJECT(this), TQT_SLOT (close()), actionCollection()); TDEAction *action = new TDEAction (i18n ("Close Window"), "window-close", CTRL+Key_Q, this, TQT_SLOT (close()), actionCollection());
action->plug (toolBar()); action->plug (toolBar());
action = new TDEAction (i18n ("Save Image"), "document-save", CTRL+Key_S, TQT_TQOBJECT(this), TQT_SLOT (saveFileToDisc()), actionCollection()); action = new TDEAction (i18n ("Save Image"), "document-save", CTRL+Key_S, this, TQT_SLOT (saveFileToDisc()), actionCollection());
action->plug (toolBar()); action->plug (toolBar());
statusBar()->insertItem( capText, 0, 1, true ); statusBar()->insertItem( capText, 0, 1, true );
@ -208,7 +208,7 @@ void ImageViewer::saveFileToDisc()
TQFile f (newURL.directory() + "/" + newURL.fileName()); TQFile f (newURL.directory() + "/" + newURL.fileName());
if (f.exists()) if (f.exists())
{ {
int r=KMessageBox::warningContinueCancel(TQT_TQWIDGET(parent()), int r=KMessageBox::warningContinueCancel(static_cast<TQWidget*>(parent()),
i18n( "A file named \"%1\" already exists. " i18n( "A file named \"%1\" already exists. "
"Overwrite it?" ).arg(newURL.fileName()), "Overwrite it?" ).arg(newURL.fileName()),
i18n( "Overwrite File?" ), i18n( "Overwrite File?" ),

14
kstars/kstars/kstarsactions.cpp
Unescape View File

@ -198,7 +198,7 @@ void KStars::slotWUT() {
//FIXME GLOSSARY //FIXME GLOSSARY
// void KStars::slotGlossary(){ // void KStars::slotGlossary(){
// GlossaryDialog *dlg = new GlossaryDialog( true, TQT_TQOBJECT(this), "glossary" ); // GlossaryDialog *dlg = new GlossaryDialog( true, this, "glossary" );
// TQString glossaryfile =data()->stdDirs->findResource( "data", "kstars/glossary.xml" ); // TQString glossaryfile =data()->stdDirs->findResource( "data", "kstars/glossary.xml" );
// KURL u = glossaryfile; // KURL u = glossaryfile;
// Glossary *g = Glossary::readFromXML( u ); // Glossary *g = Glossary::readFromXML( u );
@ -356,8 +356,8 @@ void KStars::slotViewOps() {
TDEConfigDialog* dialog = new TDEConfigDialog( this, "settings", TDEConfigDialog* dialog = new TDEConfigDialog( this, "settings",
Options::self() ); Options::self() );
connect( dialog, TQT_SIGNAL( applyClicked() ), TQT_TQOBJECT(this), TQT_SLOT( slotApplySettings() ) ); connect( dialog, TQT_SIGNAL( applyClicked() ), this, TQT_SLOT( slotApplySettings() ) );
connect( dialog, TQT_SIGNAL( okClicked() ), TQT_TQOBJECT(this), TQT_SLOT( slotApplySettings() ) ); connect( dialog, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotApplySettings() ) );
OpsCatalog *opcatalog = new OpsCatalog( this, "catalogs" ); OpsCatalog *opcatalog = new OpsCatalog( this, "catalogs" );
OpsGuides *opguides = new OpsGuides( this, "guides" ); OpsGuides *opguides = new OpsGuides( this, "guides" );
@ -450,7 +450,7 @@ void KStars::slotExportImage() {
//Warn user if file exists! //Warn user if file exists!
if (TQFile::exists(fileURL.path())) if (TQFile::exists(fileURL.path()))
{ {
int r=KMessageBox::warningContinueCancel(TQT_TQWIDGET(parent()), int r=KMessageBox::warningContinueCancel(static_cast<TQWidget*>(parent()),
i18n( "A file named \"%1\" already exists. " i18n( "A file named \"%1\" already exists. "
"Overwrite it?" ).arg(fileURL.fileName()), "Overwrite it?" ).arg(fileURL.fileName()),
i18n( "Overwrite File?" ), i18n( "Overwrite File?" ),
@ -873,7 +873,7 @@ void KStars::slotFOVEdit() {
if ( fields.count() == 4 ) { if ( fields.count() == 4 ) {
TQString nm = fields[0].stripWhiteSpace(); TQString nm = fields[0].stripWhiteSpace();
TDEToggleAction *kta = new TDEToggleAction( nm, 0, TQT_TQOBJECT(this), TQT_SLOT( slotTargetSymbol() ), TDEToggleAction *kta = new TDEToggleAction( nm, 0, this, TQT_SLOT( slotTargetSymbol() ),
actionCollection(), nm.utf8() ); actionCollection(), nm.utf8() );
kta->setExclusiveGroup( "fovsymbol" ); kta->setExclusiveGroup( "fovsymbol" );
fovActionMenu->insert( kta ); fovActionMenu->insert( kta );
@ -884,7 +884,7 @@ void KStars::slotFOVEdit() {
} }
fovActionMenu->popupMenu()->insertSeparator(); fovActionMenu->popupMenu()->insertSeparator();
fovActionMenu->insert( new TDEAction( i18n( "Edit FOV Symbols..." ), 0, TQT_TQOBJECT(this), fovActionMenu->insert( new TDEAction( i18n( "Edit FOV Symbols..." ), 0, this,
TQT_SLOT( slotFOVEdit() ), actionCollection(), "edit_fov" ) ); TQT_SLOT( slotFOVEdit() ), actionCollection(), "edit_fov" ) );
//set FOV to whatever was highlighted in FOV dialog //set FOV to whatever was highlighted in FOV dialog
@ -1020,7 +1020,7 @@ void KStars::slotShowGUIItem( bool show ) {
void KStars::addColorMenuItem( TQString name, TQString actionName ) { void KStars::addColorMenuItem( TQString name, TQString actionName ) {
colorActionMenu->insert( new TDEAction( name, 0, colorActionMenu->insert( new TDEAction( name, 0,
TQT_TQOBJECT(this), TQT_SLOT( slotColorScheme() ), actionCollection(), actionName.local8Bit() ) ); this, TQT_SLOT( slotColorScheme() ), actionCollection(), actionName.local8Bit() ) );
} }
void KStars::removeColorMenuItem( TQString actionName ) { void KStars::removeColorMenuItem( TQString actionName ) {

110
kstars/kstars/kstarsinit.cpp
Unescape View File

@ -49,27 +49,27 @@
void KStars::initActions() { void KStars::initActions() {
//File Menu: //File Menu:
new TDEAction(i18n("&New Window"), "window-new", TDEShortcut( "Ctrl+N" ), new TDEAction(i18n("&New Window"), "window-new", TDEShortcut( "Ctrl+N" ),
TQT_TQOBJECT(this), TQT_SLOT( newWindow() ), actionCollection(), "new_window"); this, TQT_SLOT( newWindow() ), actionCollection(), "new_window");
new TDEAction(i18n("&Close Window"), "window-close", TDEShortcut( "Ctrl+W" ), new TDEAction(i18n("&Close Window"), "window-close", TDEShortcut( "Ctrl+W" ),
TQT_TQOBJECT(this), TQT_SLOT( closeWindow() ), actionCollection(), "close_window"); this, TQT_SLOT( closeWindow() ), actionCollection(), "close_window");
new TDEAction( i18n( "&Download Data..." ), "knewstuff", TDEShortcut( "Ctrl+D" ), new TDEAction( i18n( "&Download Data..." ), "knewstuff", TDEShortcut( "Ctrl+D" ),
TQT_TQOBJECT(this), TQT_SLOT( slotDownload() ), actionCollection(), "get_data" ); this, TQT_SLOT( slotDownload() ), actionCollection(), "get_data" );
new TDEAction( i18n( "Open FITS..."), "document-open", TDEShortcut( "Ctrl+O"), TQT_TQOBJECT(this), TQT_SLOT( slotOpenFITS()), actionCollection(), "open_file"); new TDEAction( i18n( "Open FITS..."), "document-open", TDEShortcut( "Ctrl+O"), this, TQT_SLOT( slotOpenFITS()), actionCollection(), "open_file");
new TDEAction( i18n( "&Save Sky Image..." ), "fileexport", TDEShortcut( "Ctrl+I" ), new TDEAction( i18n( "&Save Sky Image..." ), "fileexport", TDEShortcut( "Ctrl+I" ),
TQT_TQOBJECT(this), TQT_SLOT( slotExportImage() ), actionCollection(), "export_image" ); this, TQT_SLOT( slotExportImage() ), actionCollection(), "export_image" );
new TDEAction( i18n( "&Run Script..." ), "launch", TDEShortcut( "Ctrl+R" ), new TDEAction( i18n( "&Run Script..." ), "launch", TDEShortcut( "Ctrl+R" ),
TQT_TQOBJECT(this), TQT_SLOT( slotRunScript() ), actionCollection(), "run_script" ); this, TQT_SLOT( slotRunScript() ), actionCollection(), "run_script" );
KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT( slotPrint() ), actionCollection(), "print" ); KStdAction::print(this, TQT_SLOT( slotPrint() ), actionCollection(), "print" );
KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection(), "quit" ); KStdAction::quit(this, TQT_SLOT( close() ), actionCollection(), "quit" );
//Time Menu: //Time Menu:
new TDEAction( i18n( "Set Time to &Now" ), TDEShortcut( "Ctrl+E" ), new TDEAction( i18n( "Set Time to &Now" ), TDEShortcut( "Ctrl+E" ),
TQT_TQOBJECT(this), TQT_SLOT( slotSetTimeToNow() ), actionCollection(), "time_to_now" ); this, TQT_SLOT( slotSetTimeToNow() ), actionCollection(), "time_to_now" );
new TDEAction( i18n( "set Clock to New Time", "&Set Time..." ), "clock", TDEShortcut( "Ctrl+S" ), new TDEAction( i18n( "set Clock to New Time", "&Set Time..." ), "clock", TDEShortcut( "Ctrl+S" ),
TQT_TQOBJECT(this), TQT_SLOT( slotSetTime() ), actionCollection(), "time_dialog" ); this, TQT_SLOT( slotSetTime() ), actionCollection(), "time_dialog" );
ToggleAction *actTimeRun = new ToggleAction( i18n( "Stop &Clock" ), BarIcon("media-playback-pause"), ToggleAction *actTimeRun = new ToggleAction( i18n( "Stop &Clock" ), BarIcon("media-playback-pause"),
i18n("Start &Clock"), BarIcon("1rightarrow"), i18n("Start &Clock"), BarIcon("1rightarrow"),
0, TQT_TQOBJECT(this), TQT_SLOT( slotToggleTimer() ), actionCollection(), "timer_control" ); 0, this, TQT_SLOT( slotToggleTimer() ), actionCollection(), "timer_control" );
actTimeRun->setOffToolTip( i18n( "Start Clock" ) ); actTimeRun->setOffToolTip( i18n( "Start Clock" ) );
actTimeRun->setOnToolTip( i18n( "Stop Clock" ) ); actTimeRun->setOnToolTip( i18n( "Stop Clock" ) );
TQObject::connect(data()->clock(), TQT_SIGNAL(clockStarted()), actTimeRun, TQT_SLOT(turnOn()) ); TQObject::connect(data()->clock(), TQT_SIGNAL(clockStarted()), actTimeRun, TQT_SLOT(turnOn()) );
@ -79,36 +79,36 @@ void KStars::initActions() {
//Focus Menu: //Focus Menu:
new TDEAction(i18n( "&Zenith" ), TDEShortcut( "Z" ), new TDEAction(i18n( "&Zenith" ), TDEShortcut( "Z" ),
TQT_TQOBJECT(this), TQT_SLOT( slotPointFocus() ), actionCollection(), "zenith"); this, TQT_SLOT( slotPointFocus() ), actionCollection(), "zenith");
new TDEAction(i18n( "&North" ), TDEShortcut( "N" ), new TDEAction(i18n( "&North" ), TDEShortcut( "N" ),
TQT_TQOBJECT(this), TQT_SLOT( slotPointFocus() ), actionCollection(), "north"); this, TQT_SLOT( slotPointFocus() ), actionCollection(), "north");
new TDEAction(i18n( "&East" ), TDEShortcut( "E" ), new TDEAction(i18n( "&East" ), TDEShortcut( "E" ),
TQT_TQOBJECT(this), TQT_SLOT( slotPointFocus() ), actionCollection(), "east"); this, TQT_SLOT( slotPointFocus() ), actionCollection(), "east");
new TDEAction(i18n( "&South" ), TDEShortcut( "S" ), new TDEAction(i18n( "&South" ), TDEShortcut( "S" ),
TQT_TQOBJECT(this), TQT_SLOT( slotPointFocus() ), actionCollection(), "south"); this, TQT_SLOT( slotPointFocus() ), actionCollection(), "south");
new TDEAction(i18n( "&West" ), TDEShortcut( "W" ), new TDEAction(i18n( "&West" ), TDEShortcut( "W" ),
TQT_TQOBJECT(this), TQT_SLOT( slotPointFocus() ), actionCollection(), "west"); this, TQT_SLOT( slotPointFocus() ), actionCollection(), "west");
TDEAction *tmpAction = KStdAction::find( TQT_TQOBJECT(this), TQT_SLOT( slotFind() ), TDEAction *tmpAction = KStdAction::find( this, TQT_SLOT( slotFind() ),
actionCollection(), "find_object" ); actionCollection(), "find_object" );
tmpAction->setText( i18n( "&Find Object..." ) ); tmpAction->setText( i18n( "&Find Object..." ) );
tmpAction->setToolTip( i18n( "Find object" ) ); tmpAction->setToolTip( i18n( "Find object" ) );
new TDEAction( i18n( "Engage &Tracking" ), "decrypted", TDEShortcut( "Ctrl+T" ), new TDEAction( i18n( "Engage &Tracking" ), "decrypted", TDEShortcut( "Ctrl+T" ),
TQT_TQOBJECT(this), TQT_SLOT( slotTrack() ), actionCollection(), "track_object" ); this, TQT_SLOT( slotTrack() ), actionCollection(), "track_object" );
new TDEAction( i18n( "Set Focus &Manually..." ), TDEShortcut( "Ctrl+M" ), new TDEAction( i18n( "Set Focus &Manually..." ), TDEShortcut( "Ctrl+M" ),
TQT_TQOBJECT(this), TQT_SLOT( slotManualFocus() ), actionCollection(), "manual_focus" ); this, TQT_SLOT( slotManualFocus() ), actionCollection(), "manual_focus" );
//View Menu: //View Menu:
KStdAction::zoomIn(TQT_TQOBJECT(this), TQT_SLOT( slotZoomIn() ), actionCollection(), "zoom_in" ); KStdAction::zoomIn(this, TQT_SLOT( slotZoomIn() ), actionCollection(), "zoom_in" );
KStdAction::zoomOut(TQT_TQOBJECT(this), TQT_SLOT( slotZoomOut() ), actionCollection(), "zoom_out" ); KStdAction::zoomOut(this, TQT_SLOT( slotZoomOut() ), actionCollection(), "zoom_out" );
new TDEAction( i18n( "&Default Zoom" ), "viewmagfit.png", TDEShortcut( "Ctrl+Z" ), new TDEAction( i18n( "&Default Zoom" ), "viewmagfit.png", TDEShortcut( "Ctrl+Z" ),
TQT_TQOBJECT(this), TQT_SLOT( slotDefaultZoom() ), actionCollection(), "zoom_default" ); this, TQT_SLOT( slotDefaultZoom() ), actionCollection(), "zoom_default" );
new TDEAction( i18n( "&Zoom to Angular Size..." ), "viewmag.png", TDEShortcut( "Ctrl+Shift+Z" ), new TDEAction( i18n( "&Zoom to Angular Size..." ), "viewmag.png", TDEShortcut( "Ctrl+Shift+Z" ),
TQT_TQOBJECT(this), TQT_SLOT( slotSetZoom() ), actionCollection(), "zoom_set" ); this, TQT_SLOT( slotSetZoom() ), actionCollection(), "zoom_set" );
actCoordSys = new ToggleAction( i18n("Horizontal &Coordinates"), i18n( "Equatorial &Coordinates" ), actCoordSys = new ToggleAction( i18n("Horizontal &Coordinates"), i18n( "Equatorial &Coordinates" ),
Key_Space, TQT_TQOBJECT(this), TQT_SLOT( slotCoordSys() ), actionCollection(), "coordsys" ); Key_Space, this, TQT_SLOT( slotCoordSys() ), actionCollection(), "coordsys" );
KStdAction::fullScreen( TQT_TQOBJECT(this), TQT_SLOT( slotFullScreen() ), actionCollection(), 0 ); KStdAction::fullScreen( this, TQT_SLOT( slotFullScreen() ), actionCollection(), 0 );
//Settings Menu: //Settings Menu:
@ -191,62 +191,62 @@ void KStars::initActions() {
initFOV(); initFOV();
new TDEAction( i18n( "Location on Earth", "&Geographic..." ), new TDEAction( i18n( "Location on Earth", "&Geographic..." ),
"kstars_geo", TDEShortcut( "Ctrl+G" ), TQT_TQOBJECT(this), "kstars_geo", TDEShortcut( "Ctrl+G" ), this,
TQT_SLOT( slotGeoLocator() ), actionCollection(), "geolocation" ); TQT_SLOT( slotGeoLocator() ), actionCollection(), "geolocation" );
KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT( slotViewOps() ), actionCollection(), "configure" ); KStdAction::preferences( this, TQT_SLOT( slotViewOps() ), actionCollection(), "configure" );
new TDEAction(i18n( "Startup Wizard..." ), "wizard", TDEShortcut(), new TDEAction(i18n( "Startup Wizard..." ), "wizard", TDEShortcut(),
TQT_TQOBJECT(this), TQT_SLOT( slotWizard() ), actionCollection(), "startwizard" ); this, TQT_SLOT( slotWizard() ), actionCollection(), "startwizard" );
//Tools Menu: //Tools Menu:
new TDEAction(i18n( "Calculator..."), TDEShortcut( "Ctrl+C"), new TDEAction(i18n( "Calculator..."), TDEShortcut( "Ctrl+C"),
TQT_TQOBJECT(this), TQT_SLOT( slotCalculator() ), actionCollection(), "astrocalculator"); this, TQT_SLOT( slotCalculator() ), actionCollection(), "astrocalculator");
new TDEAction(i18n( "Observing List..."), TDEShortcut( "Ctrl+L"), new TDEAction(i18n( "Observing List..."), TDEShortcut( "Ctrl+L"),
TQT_TQOBJECT(this), TQT_SLOT( slotObsList() ), actionCollection(), "obslist"); this, TQT_SLOT( slotObsList() ), actionCollection(), "obslist");
// enable action only if file was loaded and processed successfully. // enable action only if file was loaded and processed successfully.
if (!data()->VariableStarsList.isEmpty()) if (!data()->VariableStarsList.isEmpty())
new TDEAction(i18n( "AAVSO Light Curves..."), TDEShortcut( "Ctrl+V"), new TDEAction(i18n( "AAVSO Light Curves..."), TDEShortcut( "Ctrl+V"),
TQT_TQOBJECT(this), TQT_SLOT( slotLCGenerator() ), actionCollection(), "lightcurvegenerator"); this, TQT_SLOT( slotLCGenerator() ), actionCollection(), "lightcurvegenerator");
new TDEAction(i18n( "Altitude vs. Time..."), TDEShortcut( "Ctrl+A"), new TDEAction(i18n( "Altitude vs. Time..."), TDEShortcut( "Ctrl+A"),
TQT_TQOBJECT(this), TQT_SLOT( slotAVT() ), actionCollection(), "altitude_vs_time"); this, TQT_SLOT( slotAVT() ), actionCollection(), "altitude_vs_time");
new TDEAction(i18n( "What's up Tonight..."), TDEShortcut("Ctrl+U"), new TDEAction(i18n( "What's up Tonight..."), TDEShortcut("Ctrl+U"),
TQT_TQOBJECT(this), TQT_SLOT(slotWUT()), actionCollection(), "whats_up_tonight"); this, TQT_SLOT(slotWUT()), actionCollection(), "whats_up_tonight");
//FIXME GLOSSARY //FIXME GLOSSARY
// new TDEAction(i18n( "Glossary..."), TDEShortcut("Ctrl+K"), // new TDEAction(i18n( "Glossary..."), TDEShortcut("Ctrl+K"),
// this, TQT_SLOT(slotGlossary()), actionCollection(), "glossary"); // this, TQT_SLOT(slotGlossary()), actionCollection(), "glossary");
new TDEAction(i18n( "Script Builder..."), TDEShortcut("Ctrl+B"), new TDEAction(i18n( "Script Builder..."), TDEShortcut("Ctrl+B"),
TQT_TQOBJECT(this), TQT_SLOT(slotScriptBuilder()), actionCollection(), "scriptbuilder"); this, TQT_SLOT(slotScriptBuilder()), actionCollection(), "scriptbuilder");
new TDEAction(i18n( "Solar System..."), TDEShortcut("Ctrl+Y"), new TDEAction(i18n( "Solar System..."), TDEShortcut("Ctrl+Y"),
TQT_TQOBJECT(this), TQT_SLOT(slotSolarSystem()), actionCollection(), "solarsystem"); this, TQT_SLOT(slotSolarSystem()), actionCollection(), "solarsystem");
new TDEAction(i18n( "Jupiter's Moons..."), TDEShortcut("Ctrl+J"), new TDEAction(i18n( "Jupiter's Moons..."), TDEShortcut("Ctrl+J"),
TQT_TQOBJECT(this), TQT_SLOT(slotJMoonTool()), actionCollection(), "jmoontool"); this, TQT_SLOT(slotJMoonTool()), actionCollection(), "jmoontool");
// devices Menu // devices Menu
new TDEAction(i18n("Telescope Wizard..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotTelescopeWizard()), actionCollection(), "telescope_wizard"); new TDEAction(i18n("Telescope Wizard..."), 0, this, TQT_SLOT(slotTelescopeWizard()), actionCollection(), "telescope_wizard");
new TDEAction(i18n("Telescope Properties..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotTelescopeProperties()), actionCollection(), "telescope_properties"); new TDEAction(i18n("Telescope Properties..."), 0, this, TQT_SLOT(slotTelescopeProperties()), actionCollection(), "telescope_properties");
new TDEAction(i18n("Device Manager..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotINDIDriver()), actionCollection(), "device_manager"); new TDEAction(i18n("Device Manager..."), 0, this, TQT_SLOT(slotINDIDriver()), actionCollection(), "device_manager");
tmpAction = new TDEAction(i18n("Capture Image Sequence..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotImageSequence()), actionCollection(), "capture_sequence"); tmpAction = new TDEAction(i18n("Capture Image Sequence..."), 0, this, TQT_SLOT(slotImageSequence()), actionCollection(), "capture_sequence");
tmpAction->setEnabled(false); tmpAction->setEnabled(false);
tmpAction = new TDEAction(i18n("INDI Control Panel..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotINDIPanel()), actionCollection(), "indi_control_panel"); tmpAction = new TDEAction(i18n("INDI Control Panel..."), 0, this, TQT_SLOT(slotINDIPanel()), actionCollection(), "indi_control_panel");
tmpAction->setEnabled(false); tmpAction->setEnabled(false);
new TDEAction(i18n("Configure INDI..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotINDIConf()), actionCollection(), "configure_indi"); new TDEAction(i18n("Configure INDI..."), 0, this, TQT_SLOT(slotINDIConf()), actionCollection(), "configure_indi");
//Help Menu: //Help Menu:
new TDEAction( i18n( "Tip of the Day" ), "idea", 0, new TDEAction( i18n( "Tip of the Day" ), "idea", 0,
TQT_TQOBJECT(this), TQT_SLOT( slotTipOfDay() ), actionCollection(), "help_tipofday" ); this, TQT_SLOT( slotTipOfDay() ), actionCollection(), "help_tipofday" );
//Handbook toolBar item: //Handbook toolBar item:
new TDEAction( i18n( "&Handbook" ), "contents", TDEShortcut( "F1" ), new TDEAction( i18n( "&Handbook" ), "contents", TDEShortcut( "F1" ),
TQT_TQOBJECT(this), TQT_SLOT( appHelpActivated() ), actionCollection(), "handbook" ); this, TQT_SLOT( appHelpActivated() ), actionCollection(), "handbook" );
// //
//viewToolBar actions: //viewToolBar actions:
@ -254,39 +254,39 @@ void KStars::initActions() {
//show_stars: //show_stars:
a = new TDEToggleAction( i18n( "Toggle Stars" ), "kstars_stars", a = new TDEToggleAction( i18n( "Toggle Stars" ), "kstars_stars",
0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_stars" ); 0, this, TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_stars" );
//show_deepsky: //show_deepsky:
a = new TDEToggleAction( i18n( "Toggle Deep Sky Objects" ), "kstars_deepsky", a = new TDEToggleAction( i18n( "Toggle Deep Sky Objects" ), "kstars_deepsky",
0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_deepsky" ); 0, this, TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_deepsky" );
//show_planets: //show_planets:
a = new TDEToggleAction( i18n( "Toggle Solar System" ), "kstars_planets", a = new TDEToggleAction( i18n( "Toggle Solar System" ), "kstars_planets",
0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_planets" ); 0, this, TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_planets" );
//show_clines: //show_clines:
a = new TDEToggleAction( i18n( "Toggle Constellation Lines" ), "kstars_clines", a = new TDEToggleAction( i18n( "Toggle Constellation Lines" ), "kstars_clines",
0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_clines" ); 0, this, TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_clines" );
//show_cnames: //show_cnames:
a = new TDEToggleAction( i18n( "Toggle Constellation Names" ), "kstars_cnames", a = new TDEToggleAction( i18n( "Toggle Constellation Names" ), "kstars_cnames",
0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_cnames" ); 0, this, TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_cnames" );
//show_cbound: //show_cbound:
a = new TDEToggleAction( i18n( "Toggle Constellation Boundaries" ), "kstars_cbound", a = new TDEToggleAction( i18n( "Toggle Constellation Boundaries" ), "kstars_cbound",
0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_cbounds" ); 0, this, TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_cbounds" );
//show_mw: //show_mw:
a = new TDEToggleAction( i18n( "Toggle Milky Way" ), "kstars_mw", a = new TDEToggleAction( i18n( "Toggle Milky Way" ), "kstars_mw",
0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_mw" ); 0, this, TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_mw" );
//show_grid: //show_grid:
a = new TDEToggleAction( i18n( "Toggle Coordinate Grid" ), "kstars_grid", a = new TDEToggleAction( i18n( "Toggle Coordinate Grid" ), "kstars_grid",
0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_grid" ); 0, this, TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_grid" );
//show_horizon: //show_horizon:
a = new TDEToggleAction( i18n( "Toggle Ground" ), "kstars_horizon", a = new TDEToggleAction( i18n( "Toggle Ground" ), "kstars_horizon",
0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_horizon" ); 0, this, TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_horizon" );
if (Options::fitsSaveDirectory().isEmpty()) if (Options::fitsSaveDirectory().isEmpty())
Options::setFitsSaveDirectory(TQDir:: homeDirPath()); Options::setFitsSaveDirectory(TQDir:: homeDirPath());
@ -327,7 +327,7 @@ void KStars::initFOV() {
if ( fields.count() == 4 ) { if ( fields.count() == 4 ) {
nm = fields[0].stripWhiteSpace(); nm = fields[0].stripWhiteSpace();
TDEToggleAction *kta = new TDEToggleAction( nm, 0, TQT_TQOBJECT(this), TQT_SLOT( slotTargetSymbol() ), TDEToggleAction *kta = new TDEToggleAction( nm, 0, this, TQT_SLOT( slotTargetSymbol() ),
actionCollection(), nm.utf8() ); actionCollection(), nm.utf8() );
kta->setExclusiveGroup( "fovsymbol" ); kta->setExclusiveGroup( "fovsymbol" );
if ( nm == Options::fOVName() ) kta->setChecked( true ); if ( nm == Options::fOVName() ) kta->setChecked( true );
@ -339,7 +339,7 @@ void KStars::initFOV() {
} }
fovActionMenu->popupMenu()->insertSeparator(); fovActionMenu->popupMenu()->insertSeparator();
fovActionMenu->insert( new TDEAction( i18n( "Edit FOV Symbols..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotFOVEdit() ), actionCollection(), "edit_fov" ) ); fovActionMenu->insert( new TDEAction( i18n( "Edit FOV Symbols..." ), 0, this, TQT_SLOT( slotFOVEdit() ), actionCollection(), "edit_fov" ) );
} }
void KStars::initStatusBar() { void KStars::initStatusBar() {

2
kstars/kstars/tools/scriptbuilder.cpp
Unescape View File

@ -803,7 +803,7 @@ void ScriptBuilder::slotSave() {
//Warn user if file exists //Warn user if file exists
if (TQFile::exists(currentFileURL.path())) { if (TQFile::exists(currentFileURL.path())) {
int r=KMessageBox::warningContinueCancel(TQT_TQWIDGET(parent()), int r=KMessageBox::warningContinueCancel(static_cast<TQWidget*>(parent()),
i18n( "A file named \"%1\" already exists. " i18n( "A file named \"%1\" already exists. "
"Overwrite it?" ).arg(currentFileURL.fileName()), "Overwrite it?" ).arg(currentFileURL.fileName()),
i18n( "Overwrite File?" ), i18n( "Overwrite File?" ),

40
ktouch/src/ktouch.cpp
Unescape View File

@ -431,16 +431,16 @@ void KTouch::optionsPreferences() {
dialog->addPage(m_pageKeyboard, i18n("Keyboard Settings"), "keyboard_layout"); dialog->addPage(m_pageKeyboard, i18n("Keyboard Settings"), "keyboard_layout");
m_pageColors = new KTouchPrefColorsLayout(0, "Colors"); m_pageColors = new KTouchPrefColorsLayout(0, "Colors");
dialog->addPage(m_pageColors, i18n("Color Settings"), "applications-graphics"); dialog->addPage(m_pageColors, i18n("Color Settings"), "applications-graphics");
connect(dialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(this), TQT_SLOT(applyPreferences())); connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(applyPreferences()));
// TODO : Connect some other buttons/check boxes of the dialog // TODO : Connect some other buttons/check boxes of the dialog
connect(m_pageGeneral->kcfg_OverrideLectureFont, TQT_SIGNAL(toggled(bool)), connect(m_pageGeneral->kcfg_OverrideLectureFont, TQT_SIGNAL(toggled(bool)),
TQT_TQOBJECT(this), TQT_SLOT(configOverrideLectureFontToggled(bool))); this, TQT_SLOT(configOverrideLectureFontToggled(bool)));
connect(m_pageKeyboard->kcfg_OverrideKeyboardFont, TQT_SIGNAL(toggled(bool)), connect(m_pageKeyboard->kcfg_OverrideKeyboardFont, TQT_SIGNAL(toggled(bool)),
TQT_TQOBJECT(this), TQT_SLOT(configOverrideKeyboardFontToggled(bool))); this, TQT_SLOT(configOverrideKeyboardFontToggled(bool)));
connect(m_pageTraining->kcfg_AutoLevelChange, TQT_SIGNAL(toggled(bool)), connect(m_pageTraining->kcfg_AutoLevelChange, TQT_SIGNAL(toggled(bool)),
TQT_TQOBJECT(this), TQT_SLOT(configAutoLevelChangeToggled(bool))); this, TQT_SLOT(configAutoLevelChangeToggled(bool)));
connect(m_pageColors->kcfg_CommonTypingLineColors, TQT_SIGNAL(toggled(bool)), connect(m_pageColors->kcfg_CommonTypingLineColors, TQT_SIGNAL(toggled(bool)),
TQT_TQOBJECT(this), TQT_SLOT(configCommonColorsToggled(bool))); this, TQT_SLOT(configCommonColorsToggled(bool)));
// call the functions to enable/disable controls depending on settings // call the functions to enable/disable controls depending on settings
configOverrideLectureFontToggled(Prefs::overrideLectureFont()); configOverrideLectureFontToggled(Prefs::overrideLectureFont());
configOverrideKeyboardFontToggled(Prefs::overrideKeyboardFont()); configOverrideKeyboardFontToggled(Prefs::overrideKeyboardFont());
@ -684,40 +684,40 @@ void KTouch::initTrainingSession() {
void KTouch::setupActions() { void KTouch::setupActions() {
// *** File menu *** // *** File menu ***
new TDEAction(i18n("&Open lecture..."), "open_lecture", 0, new TDEAction(i18n("&Open lecture..."), "open_lecture", 0,
TQT_TQOBJECT(this), TQT_SLOT(fileOpenLecture()), actionCollection(), "file_openlecture"); this, TQT_SLOT(fileOpenLecture()), actionCollection(), "file_openlecture");
new TDEAction(i18n("&Edit lecture..."), "edit_lecture", 0, new TDEAction(i18n("&Edit lecture..."), "edit_lecture", 0,
TQT_TQOBJECT(this), TQT_SLOT(fileEditLecture()), actionCollection(), "file_editlecture"); this, TQT_SLOT(fileEditLecture()), actionCollection(), "file_editlecture");
new TDEAction(i18n("&Edit color scheme..."), "edit_colors", 0, new TDEAction(i18n("&Edit color scheme..."), "edit_colors", 0,
TQT_TQOBJECT(this), TQT_SLOT(fileEditColors()), actionCollection(), "file_editcolors"); this, TQT_SLOT(fileEditColors()), actionCollection(), "file_editcolors");
// new TDEAction(i18n("&Edit Keyboard..."), "edit_keyboard", 0, // new TDEAction(i18n("&Edit Keyboard..."), "edit_keyboard", 0,
// TQT_TQOBJECT(this), TQT_SLOT(fileEditKeyboard()), actionCollection(), "file_editkeyboard"); // this, TQT_SLOT(fileEditKeyboard()), actionCollection(), "file_editkeyboard");
KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(fileQuit()), actionCollection()); KStdAction::quit(this, TQT_SLOT(fileQuit()), actionCollection());
// *** Training menu *** // *** Training menu ***
new TDEAction(i18n("&Start New Session"), "launch", 0, new TDEAction(i18n("&Start New Session"), "launch", 0,
TQT_TQOBJECT(this), TQT_SLOT(trainingNewSession()), actionCollection(), "training_newsession"); this, TQT_SLOT(trainingNewSession()), actionCollection(), "training_newsession");
m_trainingPause = new TDEAction(i18n("&Pause Session"), "media-playback-pause", 0, m_trainingPause = new TDEAction(i18n("&Pause Session"), "media-playback-pause", 0,
TQT_TQOBJECT(this), TQT_SLOT(trainingPause()), actionCollection(), "training_pause"); this, TQT_SLOT(trainingPause()), actionCollection(), "training_pause");
new TDEAction(i18n("&Lecture Statistics"), "kalarm", 0, new TDEAction(i18n("&Lecture Statistics"), "kalarm", 0,
TQT_TQOBJECT(this), TQT_SLOT(trainingStatistics()), actionCollection(), "training_stats"); this, TQT_SLOT(trainingStatistics()), actionCollection(), "training_stats");
// Setup menu entries for the training lectures // Setup menu entries for the training lectures
m_defaultLectureAction = new TDESelectAction(i18n("Default &Lectures"), 0, TQT_TQOBJECT(this), 0, actionCollection(), "default_lectures"); m_defaultLectureAction = new TDESelectAction(i18n("Default &Lectures"), 0, this, 0, actionCollection(), "default_lectures");
m_defaultLectureAction->setMenuAccelsEnabled(false); m_defaultLectureAction->setMenuAccelsEnabled(false);
m_defaultLectureAction->setItems(m_lectureTitles); m_defaultLectureAction->setItems(m_lectureTitles);
m_defaultLectureAction->setCurrentItem(0); m_defaultLectureAction->setCurrentItem(0);
connect (m_defaultLectureAction, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(changeLecture(int))); connect (m_defaultLectureAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changeLecture(int)));
// *** Settings menu *** // *** Settings menu ***
KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(optionsPreferences()), actionCollection()); KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection());
// Setup menu entries for keyboard layouts // Setup menu entries for keyboard layouts
m_keyboardLayoutAction= new TDESelectAction(i18n("&Keyboard Layouts"), 0, TQT_TQOBJECT(this), 0, actionCollection(), "keyboard_layouts"); m_keyboardLayoutAction= new TDESelectAction(i18n("&Keyboard Layouts"), 0, this, 0, actionCollection(), "keyboard_layouts");
m_keyboardLayoutAction->setMenuAccelsEnabled(false); m_keyboardLayoutAction->setMenuAccelsEnabled(false);
m_keyboardLayoutAction->setItems(m_keyboardTitles); m_keyboardLayoutAction->setItems(m_keyboardTitles);
connect (m_keyboardLayoutAction, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(changeKeyboard(int))); connect (m_keyboardLayoutAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changeKeyboard(int)));
// Setup menu entries for colour schemes // Setup menu entries for colour schemes
m_keyboardColorAction = new TDESelectAction(i18n("&Color Schemes"), 0, TQT_TQOBJECT(this), 0, actionCollection(), "keyboard_schemes"); m_keyboardColorAction = new TDESelectAction(i18n("&Color Schemes"), 0, this, 0, actionCollection(), "keyboard_schemes");
TQStringList schemes_list; TQStringList schemes_list;
for (unsigned int i=0; i<KTouchColorScheme::m_colorSchemes.count(); ++i) for (unsigned int i=0; i<KTouchColorScheme::m_colorSchemes.count(); ++i)
schemes_list.append(KTouchColorScheme::m_colorSchemes[i].m_name); schemes_list.append(KTouchColorScheme::m_colorSchemes[i].m_name);
@ -726,7 +726,7 @@ void KTouch::setupActions() {
if (static_cast<unsigned int>(Prefs::currentColorScheme()) >= schemes_list.count()) if (static_cast<unsigned int>(Prefs::currentColorScheme()) >= schemes_list.count())
Prefs::setCurrentColorScheme(1); Prefs::setCurrentColorScheme(1);
m_keyboardColorAction->setCurrentItem(Prefs::currentColorScheme()); m_keyboardColorAction->setCurrentItem(Prefs::currentColorScheme());
connect (m_keyboardColorAction, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(changeColor(int))); connect (m_keyboardColorAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changeColor(int)));
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

2
kturtle/src/canvas.cpp
Unescape View File

@ -78,7 +78,7 @@ const double DEG2RAD = 3.14159265358979323846/180;
Canvas::Canvas(TQWidget *parent, const char *name) : TQCanvasView(0, parent, name) Canvas::Canvas(TQWidget *parent, const char *name) : TQCanvasView(0, parent, name)
{ {
// Create a new canvas for this view // Create a new canvas for this view
canvas = new TQCanvas(TQT_TQOBJECT(parent)); canvas = new TQCanvas(parent);
canvas->setAdvancePeriod(250); // refresh-rate in [ms] canvas->setAdvancePeriod(250); // refresh-rate in [ms]
// set initial values // set initial values

72
kturtle/src/kturtle.cpp
Unescape View File

@ -123,59 +123,59 @@ void MainWindow::setupActions()
TDEActionCollection *ac = actionCollection(); // abbreviation TDEActionCollection *ac = actionCollection(); // abbreviation
// File actions // File actions
KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(slotNewFile()), ac); KStdAction::openNew(this, TQT_SLOT(slotNewFile()), ac);
openExAction = new TDEAction(i18n("Open Exa&mples..."), "bookmark_folder", CTRL+Key_E, TQT_TQOBJECT(this), TQT_SLOT(slotOpenExample()), ac, "open_examples"); openExAction = new TDEAction(i18n("Open Exa&mples..."), "bookmark_folder", CTRL+Key_E, this, TQT_SLOT(slotOpenExample()), ac, "open_examples");
KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(slotOpenFile()), ac); KStdAction::open(this, TQT_SLOT(slotOpenFile()), ac);
m_recentFiles = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(slotOpenFile(const KURL&)), ac); m_recentFiles = KStdAction::openRecent(this, TQT_SLOT(slotOpenFile(const KURL&)), ac);
KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotSaveFile()), ac); KStdAction::save(this, TQT_SLOT(slotSaveFile()), ac);
KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(slotSaveAs()), ac); KStdAction::saveAs(this, TQT_SLOT(slotSaveAs()), ac);
new TDEAction(i18n("Save &Canvas..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveCanvas()), ac, "save_canvas"); new TDEAction(i18n("Save &Canvas..."), 0, 0, this, TQT_SLOT(slotSaveCanvas()), ac, "save_canvas");
speed = new TDESelectAction(i18n("Execution Speed"), 0, ALT+Key_S, TQT_TQOBJECT(this), TQT_SLOT( slotChangeSpeed() ), ac, "speed"); speed = new TDESelectAction(i18n("Execution Speed"), 0, ALT+Key_S, this, TQT_SLOT( slotChangeSpeed() ), ac, "speed");
TQStringList speeds; speeds << i18n("Full Speed") << i18n("Slow") << i18n("Slower") << i18n("Slowest"); TQStringList speeds; speeds << i18n("Full Speed") << i18n("Slow") << i18n("Slower") << i18n("Slowest");
speed->setItems(speeds); speed->setItems(speeds);
speed->setCurrentItem(0); speed->setCurrentItem(0);
run = new TDEAction(i18n("&Execute Commands"), "gear", ALT+Key_Return, TQT_TQOBJECT(this), TQT_SLOT( slotExecute() ), ac, "run"); run = new TDEAction(i18n("&Execute Commands"), "gear", ALT+Key_Return, this, TQT_SLOT( slotExecute() ), ac, "run");
pause = new TDEToggleAction(i18n("Pause E&xecution"), "media-playback-pause", Key_Pause, TQT_TQOBJECT(this), TQT_SLOT( slotPauseExecution() ), ac, "pause"); pause = new TDEToggleAction(i18n("Pause E&xecution"), "media-playback-pause", Key_Pause, this, TQT_SLOT( slotPauseExecution() ), ac, "pause");
pause->setChecked(false); pause->setChecked(false);
pause->setEnabled(false); pause->setEnabled(false);
stop = new TDEAction(i18n("Stop E&xecution"), "process-stop", Key_Escape, TQT_TQOBJECT(this), TQT_SLOT( slotAbortExecution() ), ac, "stop"); stop = new TDEAction(i18n("Stop E&xecution"), "process-stop", Key_Escape, this, TQT_SLOT( slotAbortExecution() ), ac, "stop");
stop->setEnabled(false); stop->setEnabled(false);
KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(slotPrint()), ac); KStdAction::print(this, TQT_SLOT(slotPrint()), ac);
KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), ac); KStdAction::quit(this, TQT_SLOT(close()), ac);
// Edit actions // Edit actions
KStdAction::undo(TQT_TQOBJECT(this), TQT_SLOT(slotUndo()), ac); KStdAction::undo(this, TQT_SLOT(slotUndo()), ac);
KStdAction::redo(TQT_TQOBJECT(this), TQT_SLOT(slotRedo()), ac); KStdAction::redo(this, TQT_SLOT(slotRedo()), ac);
KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(slotCut()), ac); KStdAction::cut(this, TQT_SLOT(slotCut()), ac);
KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), ac); KStdAction::copy(this, TQT_SLOT(slotCopy()), ac);
KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), ac); KStdAction::paste(this, TQT_SLOT(slotPaste()), ac);
KStdAction::selectAll(TQT_TQOBJECT(this), TQT_SLOT(slotSelectAll()), ac); KStdAction::selectAll(this, TQT_SLOT(slotSelectAll()), ac);
KStdAction::deselect(TQT_TQOBJECT(this), TQT_SLOT(slotClearSelection()), ac); KStdAction::deselect(this, TQT_SLOT(slotClearSelection()), ac);
new TDEToggleAction(i18n("Toggle Insert"), Key_Insert, TQT_TQOBJECT(this), TQT_SLOT(slotToggleInsert()), ac, "set_insert"); new TDEToggleAction(i18n("Toggle Insert"), Key_Insert, this, TQT_SLOT(slotToggleInsert()), ac, "set_insert");
KStdAction::find(TQT_TQOBJECT(this), TQT_SLOT(slotFind()), ac); KStdAction::find(this, TQT_SLOT(slotFind()), ac);
KStdAction::findNext(TQT_TQOBJECT(this), TQT_SLOT(slotFindNext()), ac); KStdAction::findNext(this, TQT_SLOT(slotFindNext()), ac);
KStdAction::findPrev(TQT_TQOBJECT(this), TQT_SLOT(slotFindPrevious()), ac); KStdAction::findPrev(this, TQT_SLOT(slotFindPrevious()), ac);
KStdAction::replace(TQT_TQOBJECT(this), TQT_SLOT(slotReplace()), ac); KStdAction::replace(this, TQT_SLOT(slotReplace()), ac);
// View actions // View actions
new TDEToggleAction(i18n("Show &Line Numbers"), 0, Key_F11, TQT_TQOBJECT(this), TQT_SLOT(slotToggleLineNumbers()), ac, "line_numbers"); new TDEToggleAction(i18n("Show &Line Numbers"), 0, Key_F11, this, TQT_SLOT(slotToggleLineNumbers()), ac, "line_numbers");
m_fullscreen = KStdAction::fullScreen(TQT_TQOBJECT(this), TQT_SLOT(slotToggleFullscreen()), ac, this, "full_screen"); m_fullscreen = KStdAction::fullScreen(this, TQT_SLOT(slotToggleFullscreen()), ac, this, "full_screen");
m_fullscreen->setChecked(b_fullscreen); m_fullscreen->setChecked(b_fullscreen);
// Tools actions // Tools actions
colorpicker = new TDEToggleAction(i18n("&Color Picker"), "colorize", ALT+Key_C, TQT_TQOBJECT(this), TQT_SLOT(slotColorPicker()), ac, "color_picker"); colorpicker = new TDEToggleAction(i18n("&Color Picker"), "colorize", ALT+Key_C, this, TQT_SLOT(slotColorPicker()), ac, "color_picker");
new TDEAction(i18n("&Indent"), "format-indent-more", CTRL+Key_I, TQT_TQOBJECT(this), TQT_SLOT(slotIndent()), ac, "edit_indent"); new TDEAction(i18n("&Indent"), "format-indent-more", CTRL+Key_I, this, TQT_SLOT(slotIndent()), ac, "edit_indent");
new TDEAction(i18n("&Unindent"), "format-indent-less", CTRL+SHIFT+Key_I, TQT_TQOBJECT(this), TQT_SLOT(slotUnIndent()), ac, "edit_unindent"); new TDEAction(i18n("&Unindent"), "format-indent-less", CTRL+SHIFT+Key_I, this, TQT_SLOT(slotUnIndent()), ac, "edit_unindent");
new TDEAction(i18n("Cl&ean Indentation"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotCleanIndent()), ac, "edit_cleanIndent"); new TDEAction(i18n("Cl&ean Indentation"), 0, 0, this, TQT_SLOT(slotCleanIndent()), ac, "edit_cleanIndent");
new TDEAction(i18n("Co&mment"), 0, CTRL+Key_D, TQT_TQOBJECT(this), TQT_SLOT(slotComment()), ac, "edit_comment"); new TDEAction(i18n("Co&mment"), 0, CTRL+Key_D, this, TQT_SLOT(slotComment()), ac, "edit_comment");
new TDEAction(i18n("Unc&omment"), 0, CTRL+SHIFT+Key_D, TQT_TQOBJECT(this), TQT_SLOT(slotUnComment()), ac, "edit_uncomment"); new TDEAction(i18n("Unc&omment"), 0, CTRL+SHIFT+Key_D, this, TQT_SLOT(slotUnComment()), ac, "edit_uncomment");
// Settings actions // Settings actions
KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT(slotSettings()), ac ); KStdAction::preferences( this, TQT_SLOT(slotSettings()), ac );
new TDEAction(i18n("&Configure Editor..."), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditor()), ac, "set_confdlg"); new TDEAction(i18n("&Configure Editor..."), "configure", 0, this, TQT_SLOT(slotEditor()), ac, "set_confdlg");
// Help actions // Help actions
ContextHelp = new TDEAction(0, 0, Key_F2, TQT_TQOBJECT(this), TQT_SLOT(slotContextHelp()), ac, "context_help"); ContextHelp = new TDEAction(0, 0, Key_F2, this, TQT_SLOT(slotContextHelp()), ac, "context_help");
slotContextHelpUpdate(); // this sets the label of this action slotContextHelpUpdate(); // this sets the label of this action
// other // other

52
kverbos/kverbos/kverbos.cpp
Unescape View File

@ -108,7 +108,7 @@ KVerbosApp::~KVerbosApp()
kverbosCounter--; kverbosCounter--;
if (kfeederControl) if (kfeederControl)
{ {
disconnect(view, TQT_SIGNAL(informKFeeder(int)), TQT_TQOBJECT(this), TQT_SLOT(slotFeedIt(int))); disconnect(view, TQT_SIGNAL(informKFeeder(int)), this, TQT_SLOT(slotFeedIt(int)));
delete kfeederControl; delete kfeederControl;
kfeederControl = 0; kfeederControl = 0;
}; };
@ -116,25 +116,25 @@ KVerbosApp::~KVerbosApp()
void KVerbosApp::initActions() void KVerbosApp::initActions()
{ {
fileNewWindow = new TDEAction(i18n("New &Window"), "window_new.png", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileNewWindow()), actionCollection(),"file_new_window"); fileNewWindow = new TDEAction(i18n("New &Window"), "window_new.png", 0, this, TQT_SLOT(slotFileNewWindow()), actionCollection(),"file_new_window");
fileNew = KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(slotFileNew()), actionCollection()); fileNew = KStdAction::openNew(this, TQT_SLOT(slotFileNew()), actionCollection());
fileOpen = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpen()), actionCollection()); fileOpen = KStdAction::open(this, TQT_SLOT(slotFileOpen()), actionCollection());
fileOpenRecent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpenRecent(const KURL&)), actionCollection()); fileOpenRecent = KStdAction::openRecent(this, TQT_SLOT(slotFileOpenRecent(const KURL&)), actionCollection());
fileOpenStandard = new TDEAction(i18n("Open &Standard Verb File"), "fileopen.png", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileOpenStandard()), actionCollection(),"file_open_standard"); fileOpenStandard = new TDEAction(i18n("Open &Standard Verb File"), "fileopen.png", 0, this, TQT_SLOT(slotFileOpenStandard()), actionCollection(),"file_open_standard");
fileSave = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotFileSave()), actionCollection()); fileSave = KStdAction::save(this, TQT_SLOT(slotFileSave()), actionCollection());
fileSaveAs = KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(slotFileSaveAs()), actionCollection()); fileSaveAs = KStdAction::saveAs(this, TQT_SLOT(slotFileSaveAs()), actionCollection());
fileClose = KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(slotFileClose()), actionCollection()); fileClose = KStdAction::close(this, TQT_SLOT(slotFileClose()), actionCollection());
filePrint = KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(slotFilePrint()), actionCollection()); filePrint = KStdAction::print(this, TQT_SLOT(slotFilePrint()), actionCollection());
fileQuit = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotFileQuit()), actionCollection()); fileQuit = KStdAction::quit(this, TQT_SLOT(slotFileQuit()), actionCollection());
editCut = KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(slotEditCut()), actionCollection()); editCut = KStdAction::cut(this, TQT_SLOT(slotEditCut()), actionCollection());
editCopy = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotEditCopy()), actionCollection()); editCopy = KStdAction::copy(this, TQT_SLOT(slotEditCopy()), actionCollection());
editPaste = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotEditPaste()), actionCollection()); editPaste = KStdAction::paste(this, TQT_SLOT(slotEditPaste()), actionCollection());
editErfassen = new TDEAction(i18n("E&nter New Verb..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditErfassen()), actionCollection(),"edit_erfassen"); editErfassen = new TDEAction(i18n("E&nter New Verb..."), 0, 0, this, TQT_SLOT(slotEditErfassen()), actionCollection(),"edit_erfassen");
editBearbeiten = new TDEAction(i18n("&Edit Verb List..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditBearbeiten()), actionCollection(), "edit_bearbeiten"); editBearbeiten = new TDEAction(i18n("&Edit Verb List..."), 0, 0, this, TQT_SLOT(slotEditBearbeiten()), actionCollection(), "edit_bearbeiten");
settingOptions = new TDEAction(i18n("&Configure KVerbos..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotSettingsOptions()), actionCollection(), "settings_options"); settingOptions = new TDEAction(i18n("&Configure KVerbos..."), 0, 0, this, TQT_SLOT(slotSettingsOptions()), actionCollection(), "settings_options");
userUsername = new TDEAction(i18n("&Username..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotSettingsUsername()), actionCollection(), "user_username"); userUsername = new TDEAction(i18n("&Username..."), 0, 0, this, TQT_SLOT(slotSettingsUsername()), actionCollection(), "user_username");
userResults = new TDEAction(i18n("&Results"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotUserResults()), actionCollection(), "user_results"); userResults = new TDEAction(i18n("&Results"), 0, 0, this, TQT_SLOT(slotUserResults()), actionCollection(), "user_results");
fileNewWindow->setToolTip(i18n("Opens a new application window")); fileNewWindow->setToolTip(i18n("Opens a new application window"));
fileOpenStandard->setToolTip(i18n("Opens the standard KVerbos verb file")); fileOpenStandard->setToolTip(i18n("Opens the standard KVerbos verb file"));
@ -182,8 +182,8 @@ void KVerbosApp::initDocument()
{ {
doc = new KVerbosDoc(this); doc = new KVerbosDoc(this);
doc->newDocument(); doc->newDocument();
connect(doc, TQT_SIGNAL(anzahlVerbenGeaendert(int)), TQT_TQOBJECT(this), TQT_SLOT(slotStatusVerbMsg(int))); connect(doc, TQT_SIGNAL(anzahlVerbenGeaendert(int)), this, TQT_SLOT(slotStatusVerbMsg(int)));
connect(this, TQT_SIGNAL(testAnzahl(int)), TQT_TQOBJECT(this), TQT_SLOT(slotStatusVerbMsg(int))); connect(this, TQT_SIGNAL(testAnzahl(int)), this, TQT_SLOT(slotStatusVerbMsg(int)));
} }
void KVerbosApp::initView() void KVerbosApp::initView()
@ -197,9 +197,9 @@ void KVerbosApp::initView()
setCentralWidget(view); setCentralWidget(view);
setCaption(doc->URL().fileName(),false); setCaption(doc->URL().fileName(),false);
// //
connect(view, TQT_SIGNAL(numberTrainedChanged(int)), TQT_TQOBJECT(this), TQT_SLOT(slotStatusTrainedMsg(int))); connect(view, TQT_SIGNAL(numberTrainedChanged(int)), this, TQT_SLOT(slotStatusTrainedMsg(int)));
connect(view, TQT_SIGNAL(numberCorrectChanged(int)), TQT_TQOBJECT(this), TQT_SLOT(slotStatusCorrectMsg(int))); connect(view, TQT_SIGNAL(numberCorrectChanged(int)), this, TQT_SLOT(slotStatusCorrectMsg(int)));
connect(view, TQT_SIGNAL(informKFeeder(int)), TQT_TQOBJECT(this), TQT_SLOT(slotFeedIt(int))); connect(view, TQT_SIGNAL(informKFeeder(int)), this, TQT_SLOT(slotFeedIt(int)));
} }
void KVerbosApp::openDocumentFile(const KURL& url) void KVerbosApp::openDocumentFile(const KURL& url)
@ -710,7 +710,7 @@ void KVerbosApp::slotSettingsOptions()
if ((pDlgEdit->CheckBoxKFeeder->isChecked() == false) && (useKFeeder)) if ((pDlgEdit->CheckBoxKFeeder->isChecked() == false) && (useKFeeder))
{ {
// kfeeder anhalten // kfeeder anhalten
disconnect(view, TQT_SIGNAL(informKFeeder(int)), TQT_TQOBJECT(this), TQT_SLOT(slotFeedIt(int))); disconnect(view, TQT_SIGNAL(informKFeeder(int)), this, TQT_SLOT(slotFeedIt(int)));
delete kfeederControl; delete kfeederControl;
kfeederControl = 0; kfeederControl = 0;
}; };

6
kvoctrain/kvoctrain/kva_config.cpp
Unescape View File

@ -128,7 +128,7 @@ void kvoctrainApp::saveProperties(TDEConfig *config )
TQString filename=doc->URL().path(); TQString filename=doc->URL().path();
TQString tempname = kapp->tempSaveName(filename); TQString tempname = kapp->tempSaveName(filename);
saveDocProps(doc); saveDocProps(doc);
doc->saveAs(TQT_TQOBJECT(this), KURL(tempname), doc->getTitle(), kvoctrainDoc::automatic); doc->saveAs(this, KURL(tempname), doc->getTitle(), kvoctrainDoc::automatic);
} }
} }
@ -147,7 +147,7 @@ void kvoctrainApp::readProperties(TDEConfig *config)
if(b_canRecover){ if(b_canRecover){
pdlg = new ProgressDlg(TQString(), TQString(), kapp->makeStdCaption("")); pdlg = new ProgressDlg(TQString(), TQString(), kapp->makeStdCaption(""));
pdlg->show(); pdlg->show();
doc = new kvoctrainDoc(TQT_TQOBJECT(this), KURL(tempname)); doc = new kvoctrainDoc(this, KURL(tempname));
removeProgressBar(); removeProgressBar();
doc->setModified(); doc->setModified();
doc->setTitle(title); doc->setTitle(title);
@ -160,7 +160,7 @@ void kvoctrainApp::readProperties(TDEConfig *config)
pdlg = new ProgressDlg (TQString(), TQString(), pdlg = new ProgressDlg (TQString(), TQString(),
kapp->makeStdCaption("")); kapp->makeStdCaption(""));
pdlg->show(); pdlg->show();
doc = new kvoctrainDoc(TQT_TQOBJECT(this), KURL(filename)); doc = new kvoctrainDoc(this, KURL(filename));
removeProgressBar(); removeProgressBar();
setCaption(kapp->makeStdCaption(doc->getTitle(), false, doc->isModified())); setCaption(kapp->makeStdCaption(doc->getTitle(), false, doc->isModified()));
} }

72
kvoctrain/kvoctrain/kva_init.cpp
Unescape View File

@ -98,110 +98,110 @@ kvoctrainApp::kvoctrainApp(TQWidget *parent, const char *name)
void kvoctrainApp::initActions() void kvoctrainApp::initActions()
{ {
fileNew = KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(slotFileNew()), actionCollection()); fileNew = KStdAction::openNew(this, TQT_SLOT(slotFileNew()), actionCollection());
fileNew->setWhatsThis(i18n("Creates a new blank vocabulary document")); fileNew->setWhatsThis(i18n("Creates a new blank vocabulary document"));
fileNew->setToolTip(fileNew->whatsThis()); fileNew->setToolTip(fileNew->whatsThis());
fileOpen = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpen()), actionCollection()); fileOpen = KStdAction::open(this, TQT_SLOT(slotFileOpen()), actionCollection());
fileOpen->setWhatsThis(i18n("Opens an existing vocabulary document")); fileOpen->setWhatsThis(i18n("Opens an existing vocabulary document"));
fileOpen->setToolTip(fileOpen->whatsThis()); fileOpen->setToolTip(fileOpen->whatsThis());
fileOpenExample = new TDEAction(i18n("Open &Example..."), "document-open", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileOpenExample()), actionCollection(), "file_open_example"); fileOpenExample = new TDEAction(i18n("Open &Example..."), "document-open", 0, this, TQT_SLOT(slotFileOpenExample()), actionCollection(), "file_open_example");
fileOpen->setWhatsThis(i18n("Open a vocabulary document")); fileOpen->setWhatsThis(i18n("Open a vocabulary document"));
fileOpen->setToolTip(fileOpen->whatsThis()); fileOpen->setToolTip(fileOpen->whatsThis());
fileGHNS = new TDEAction(i18n("&Get New Vocabularies..."), "knewstuff", CTRL+Key_G, TQT_TQOBJECT(this), TQT_SLOT(slotGHNS()), actionCollection(), "file_ghns"); fileGHNS = new TDEAction(i18n("&Get New Vocabularies..."), "knewstuff", CTRL+Key_G, this, TQT_SLOT(slotGHNS()), actionCollection(), "file_ghns");
fileGHNS->setWhatsThis(i18n("Downloads new vocabularies")); fileGHNS->setWhatsThis(i18n("Downloads new vocabularies"));
fileGHNS->setToolTip(fileGHNS->whatsThis()); fileGHNS->setToolTip(fileGHNS->whatsThis());
fileOpenRecent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpenRecent(const KURL&)), actionCollection()); fileOpenRecent = KStdAction::openRecent(this, TQT_SLOT(slotFileOpenRecent(const KURL&)), actionCollection());
fileMerge = new TDEAction(i18n("&Merge..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileMerge()), actionCollection(), "file_merge"); fileMerge = new TDEAction(i18n("&Merge..."), 0, 0, this, TQT_SLOT(slotFileMerge()), actionCollection(), "file_merge");
fileMerge->setWhatsThis(i18n("Merge an existing vocabulary document with the current one")); fileMerge->setWhatsThis(i18n("Merge an existing vocabulary document with the current one"));
fileMerge->setToolTip(fileOpen->whatsThis()); fileMerge->setToolTip(fileOpen->whatsThis());
fileSave = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotFileSave()), actionCollection()); fileSave = KStdAction::save(this, TQT_SLOT(slotFileSave()), actionCollection());
fileSave->setWhatsThis(i18n("Save the active vocabulary document")); fileSave->setWhatsThis(i18n("Save the active vocabulary document"));
fileSave->setToolTip(fileSave->whatsThis()); fileSave->setToolTip(fileSave->whatsThis());
fileSaveAs = KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(slotFileSaveAs()), actionCollection()); fileSaveAs = KStdAction::saveAs(this, TQT_SLOT(slotFileSaveAs()), actionCollection());
fileSaveAs->setWhatsThis(i18n("Save the active vocabulary document with a different name")); fileSaveAs->setWhatsThis(i18n("Save the active vocabulary document with a different name"));
fileSaveAs->setToolTip(fileSaveAs->whatsThis()); fileSaveAs->setToolTip(fileSaveAs->whatsThis());
filePrint = KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(slotFilePrint()), actionCollection()); filePrint = KStdAction::print(this, TQT_SLOT(slotFilePrint()), actionCollection());
filePrint->setWhatsThis(i18n("Print the active vocabulary document")); filePrint->setWhatsThis(i18n("Print the active vocabulary document"));
filePrint->setToolTip(filePrint->whatsThis()); filePrint->setToolTip(filePrint->whatsThis());
fileQuit = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotFileQuit()), actionCollection()); fileQuit = KStdAction::quit(this, TQT_SLOT(slotFileQuit()), actionCollection());
fileQuit->setWhatsThis(i18n("Quit KVocTrain")); fileQuit->setWhatsThis(i18n("Quit KVocTrain"));
fileQuit->setToolTip(fileQuit->whatsThis()); fileQuit->setToolTip(fileQuit->whatsThis());
editCopy = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotEditCopy()), actionCollection()); editCopy = KStdAction::copy(this, TQT_SLOT(slotEditCopy()), actionCollection());
editCopy->setWhatsThis(i18n("Copy")); editCopy->setWhatsThis(i18n("Copy"));
editCopy->setToolTip(editCopy->whatsThis()); editCopy->setToolTip(editCopy->whatsThis());
editPaste = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotEditPaste()), actionCollection()); editPaste = KStdAction::paste(this, TQT_SLOT(slotEditPaste()), actionCollection());
editPaste->setWhatsThis(i18n("Paste")); editPaste->setWhatsThis(i18n("Paste"));
editPaste->setToolTip(editPaste->whatsThis()); editPaste->setToolTip(editPaste->whatsThis());
editSelectAll = KStdAction::selectAll(TQT_TQOBJECT(this), TQT_SLOT(slotSelectAll()), actionCollection()); editSelectAll = KStdAction::selectAll(this, TQT_SLOT(slotSelectAll()), actionCollection());
editSelectAll->setWhatsThis(i18n("Select all rows")); editSelectAll->setWhatsThis(i18n("Select all rows"));
editSelectAll->setToolTip(editSelectAll->whatsThis()); editSelectAll->setToolTip(editSelectAll->whatsThis());
editClearSelection = KStdAction::deselect(TQT_TQOBJECT(this), TQT_SLOT(slotCancelSelection()), actionCollection()); editClearSelection = KStdAction::deselect(this, TQT_SLOT(slotCancelSelection()), actionCollection());
editClearSelection->setWhatsThis(i18n("Deselect all rows")); editClearSelection->setWhatsThis(i18n("Deselect all rows"));
editClearSelection->setToolTip(editClearSelection->whatsThis()); editClearSelection->setToolTip(editClearSelection->whatsThis());
editSearchFromClipboard = KStdAction::find(TQT_TQOBJECT(this), TQT_SLOT(slotSmartSearchClip()), actionCollection()); editSearchFromClipboard = KStdAction::find(this, TQT_SLOT(slotSmartSearchClip()), actionCollection());
editSearchFromClipboard->setWhatsThis(i18n("Search for the clipboard contents in the vocabulary")); editSearchFromClipboard->setWhatsThis(i18n("Search for the clipboard contents in the vocabulary"));
editSearchFromClipboard->setToolTip(editSearchFromClipboard->whatsThis()); editSearchFromClipboard->setToolTip(editSearchFromClipboard->whatsThis());
editAppend = new TDEAction(i18n("&Append New Entry"), "insert_table_row", "Insert", TQT_TQOBJECT(this), TQT_SLOT(slotAppendRow()), actionCollection(),"edit_append"); editAppend = new TDEAction(i18n("&Append New Entry"), "insert_table_row", "Insert", this, TQT_SLOT(slotAppendRow()), actionCollection(),"edit_append");
editAppend->setWhatsThis(i18n("Append a new row to the vocabulary")); editAppend->setWhatsThis(i18n("Append a new row to the vocabulary"));
editAppend->setToolTip(editAppend->whatsThis()); editAppend->setToolTip(editAppend->whatsThis());
editEditSelectedArea = new TDEAction(i18n("&Edit Selected Area..."), "edit_table_row", "Ctrl+Return", TQT_TQOBJECT(this), TQT_SLOT(slotEditRow()), actionCollection(),"edit_edit_selected_area"); editEditSelectedArea = new TDEAction(i18n("&Edit Selected Area..."), "edit_table_row", "Ctrl+Return", this, TQT_SLOT(slotEditRow()), actionCollection(),"edit_edit_selected_area");
editEditSelectedArea->setWhatsThis(i18n("Edit the entries in the selected rows")); editEditSelectedArea->setWhatsThis(i18n("Edit the entries in the selected rows"));
editEditSelectedArea->setToolTip(editEditSelectedArea->whatsThis()); editEditSelectedArea->setToolTip(editEditSelectedArea->whatsThis());
editRemoveSelectedArea = new TDEAction(i18n("&Remove Selected Area"), "delete_table_row", "Delete", TQT_TQOBJECT(this), TQT_SLOT(slotRemoveRow()), actionCollection(),"edit_remove_selected_area"); editRemoveSelectedArea = new TDEAction(i18n("&Remove Selected Area"), "delete_table_row", "Delete", this, TQT_SLOT(slotRemoveRow()), actionCollection(),"edit_remove_selected_area");
editRemoveSelectedArea->setWhatsThis(i18n("Delete the selected rows")); editRemoveSelectedArea->setWhatsThis(i18n("Delete the selected rows"));
editRemoveSelectedArea->setToolTip(editRemoveSelectedArea->whatsThis()); editRemoveSelectedArea->setToolTip(editRemoveSelectedArea->whatsThis());
editSaveSelectedArea = new TDEAction(i18n("Save E&ntries in Query As..."), TDEGlobal::iconLoader()->loadIcon("document-save-as", TDEIcon::Small), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveSelection()), actionCollection(),"edit_save_selected_area"); editSaveSelectedArea = new TDEAction(i18n("Save E&ntries in Query As..."), TDEGlobal::iconLoader()->loadIcon("document-save-as", TDEIcon::Small), 0, this, TQT_SLOT(slotSaveSelection()), actionCollection(),"edit_save_selected_area");
editSaveSelectedArea->setWhatsThis(i18n("Save the entries in the query as a new vocabulary")); editSaveSelectedArea->setWhatsThis(i18n("Save the entries in the query as a new vocabulary"));
editSaveSelectedArea->setToolTip(editSaveSelectedArea->whatsThis()); editSaveSelectedArea->setToolTip(editSaveSelectedArea->whatsThis());
vocabShowStatistics = new TDEAction(i18n("Show &Statistics"), "statistics", 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowStatist()), actionCollection(),"vocab_show_statistics"); vocabShowStatistics = new TDEAction(i18n("Show &Statistics"), "statistics", 0, this, TQT_SLOT(slotShowStatist()), actionCollection(),"vocab_show_statistics");
vocabShowStatistics->setWhatsThis(i18n("Show statistics for the current vocabulary")); vocabShowStatistics->setWhatsThis(i18n("Show statistics for the current vocabulary"));
vocabShowStatistics->setToolTip(vocabShowStatistics->whatsThis()); vocabShowStatistics->setToolTip(vocabShowStatistics->whatsThis());
vocabAssignLessons = new TDEAction(i18n("Assign L&essons..."), "rand_less", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCreateRandom()), actionCollection(),"vocab_assign_lessons"); vocabAssignLessons = new TDEAction(i18n("Assign L&essons..."), "rand_less", 0, this, TQT_SLOT(slotCreateRandom()), actionCollection(),"vocab_assign_lessons");
vocabAssignLessons->setWhatsThis(i18n("Create random lessons with unassigned entries")); vocabAssignLessons->setWhatsThis(i18n("Create random lessons with unassigned entries"));
vocabAssignLessons->setToolTip(vocabAssignLessons->whatsThis()); vocabAssignLessons->setToolTip(vocabAssignLessons->whatsThis());
vocabCleanUp = new TDEAction(i18n("&Clean Up"), "cleanup", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCleanVocabulary()), actionCollection(),"vocab_clean_up"); vocabCleanUp = new TDEAction(i18n("&Clean Up"), "cleanup", 0, this, TQT_SLOT(slotCleanVocabulary()), actionCollection(),"vocab_clean_up");
vocabCleanUp->setWhatsThis(i18n("Remove entries with same content from vocabulary")); vocabCleanUp->setWhatsThis(i18n("Remove entries with same content from vocabulary"));
vocabCleanUp->setToolTip(vocabCleanUp->whatsThis()); vocabCleanUp->setToolTip(vocabCleanUp->whatsThis());
vocabAppendLanguage = new TDESelectAction(i18n("&Append Language"), "insert_table_col", 0, actionCollection(), "vocab_append_language"); vocabAppendLanguage = new TDESelectAction(i18n("&Append Language"), "insert_table_col", 0, actionCollection(), "vocab_append_language");
connect(vocabAppendLanguage->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(aboutToShowVocabAppendLanguage())); connect(vocabAppendLanguage->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(aboutToShowVocabAppendLanguage()));
connect (vocabAppendLanguage->popupMenu(), TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotAppendLang(int))); connect (vocabAppendLanguage->popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotAppendLang(int)));
connect (vocabAppendLanguage->popupMenu(), TQT_SIGNAL(highlighted(int)), TQT_TQOBJECT(this), TQT_SLOT(slotHeaderStatus(int))); connect (vocabAppendLanguage->popupMenu(), TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int)));
vocabSetLanguage = new TDESelectAction(i18n("Set &Language"), "set_language", 0, actionCollection(), "vocab_set_language"); vocabSetLanguage = new TDESelectAction(i18n("Set &Language"), "set_language", 0, actionCollection(), "vocab_set_language");
connect(vocabSetLanguage->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(aboutToShowVocabSetLanguage())); connect(vocabSetLanguage->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(aboutToShowVocabSetLanguage()));
vocabRemoveLanguage = new TDESelectAction(i18n("&Remove Language"), "delete_table_col", 0, actionCollection(), "vocab_remove_language"); vocabRemoveLanguage = new TDESelectAction(i18n("&Remove Language"), "delete_table_col", 0, actionCollection(), "vocab_remove_language");
connect(vocabRemoveLanguage->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(aboutToShowVocabRemoveLanguage())); connect(vocabRemoveLanguage->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(aboutToShowVocabRemoveLanguage()));
connect(vocabRemoveLanguage->popupMenu(), TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotHeaderCallBack(int))); connect(vocabRemoveLanguage->popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int)));
connect(vocabRemoveLanguage->popupMenu(), TQT_SIGNAL(highlighted(int)), TQT_TQOBJECT(this), TQT_SLOT(slotHeaderStatus(int))); connect(vocabRemoveLanguage->popupMenu(), TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int)));
vocabDocumentProperties = new TDEAction(i18n("Document &Properties"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotDocProps()), actionCollection(), "vocab_document_properties"); vocabDocumentProperties = new TDEAction(i18n("Document &Properties"), 0, 0, this, TQT_SLOT(slotDocProps()), actionCollection(), "vocab_document_properties");
vocabDocumentProperties->setWhatsThis(i18n("Edit document properties")); vocabDocumentProperties->setWhatsThis(i18n("Edit document properties"));
vocabDocumentProperties->setToolTip(vocabAppendLanguage->whatsThis()); vocabDocumentProperties->setToolTip(vocabAppendLanguage->whatsThis());
vocabLanguageProperties = new TDEAction(i18n("Lan&guage Properties"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotDocPropsLang()), actionCollection(), "vocab_language_properties"); vocabLanguageProperties = new TDEAction(i18n("Lan&guage Properties"), 0, 0, this, TQT_SLOT(slotDocPropsLang()), actionCollection(), "vocab_language_properties");
vocabLanguageProperties->setWhatsThis(i18n("Edit language properties in current document")); vocabLanguageProperties->setWhatsThis(i18n("Edit language properties in current document"));
vocabLanguageProperties->setToolTip(vocabSetLanguage->whatsThis()); vocabLanguageProperties->setToolTip(vocabSetLanguage->whatsThis());
@ -210,7 +210,7 @@ void kvoctrainApp::initActions()
connect(lessons, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotChooseLesson(int))); connect(lessons, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotChooseLesson(int)));
lessons->setFocusPolicy(TQWidget::NoFocus); lessons->setFocusPolicy(TQWidget::NoFocus);
vocabLessons = new KWidgetAction(lessons, i18n("Lessons"), 0, TQT_TQOBJECT(this), 0, actionCollection(), "vocab_lessons"); vocabLessons = new KWidgetAction(lessons, i18n("Lessons"), 0, this, 0, actionCollection(), "vocab_lessons");
vocabLessons->setWhatsThis(i18n("Choose current lesson")); vocabLessons->setWhatsThis(i18n("Choose current lesson"));
vocabLessons->setToolTip(vocabLessons->whatsThis()); vocabLessons->setToolTip(vocabLessons->whatsThis());
@ -219,7 +219,7 @@ void kvoctrainApp::initActions()
connect (searchLine, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotSearchNext())); connect (searchLine, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotSearchNext()));
connect (searchLine, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotResumeSearch(const TQString&))); connect (searchLine, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotResumeSearch(const TQString&)));
vocabSearch = new KWidgetAction(searchLine, i18n("Smart Search"), 0, TQT_TQOBJECT(this), 0, actionCollection(), "vocab_search"); vocabSearch = new KWidgetAction(searchLine, i18n("Smart Search"), 0, this, 0, actionCollection(), "vocab_search");
vocabSearch->setAutoSized(true); vocabSearch->setAutoSized(true);
vocabSearch->setWhatsThis(i18n("Search vocabulary for specified text ")); vocabSearch->setWhatsThis(i18n("Search vocabulary for specified text "));
vocabSearch->setToolTip(vocabSearch->whatsThis()); vocabSearch->setToolTip(vocabSearch->whatsThis());
@ -232,7 +232,7 @@ void kvoctrainApp::initActions()
//learningResumeMultipleChoice->setWhatsThis(i18n("")); //learningResumeMultipleChoice->setWhatsThis(i18n(""));
learningResumeMultipleChoice->setToolTip(learningResumeMultipleChoice->whatsThis()); learningResumeMultipleChoice->setToolTip(learningResumeMultipleChoice->whatsThis());
*/ */
configApp = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT( slotGeneralOptions()), actionCollection()); configApp = KStdAction::preferences(this, TQT_SLOT( slotGeneralOptions()), actionCollection());
configApp->setWhatsThis(i18n("Show the configuration dialog")); configApp->setWhatsThis(i18n("Show the configuration dialog"));
configApp->setToolTip(configApp->whatsThis()); configApp->setToolTip(configApp->whatsThis());
@ -280,9 +280,9 @@ void kvoctrainApp::initStatusBar()
void kvoctrainApp::initDoc( ) void kvoctrainApp::initDoc( )
{ {
if (fileOpenRecent->items().count() > 0) if (fileOpenRecent->items().count() > 0)
doc = new kvoctrainDoc(TQT_TQOBJECT(this), fileOpenRecent->items()[0]); doc = new kvoctrainDoc(this, fileOpenRecent->items()[0]);
else else
doc = new kvoctrainDoc(TQT_TQOBJECT(this), KURL("")); doc = new kvoctrainDoc(this, KURL(""));
loadDocProps(doc); loadDocProps(doc);
if (doc->numLangs() == 0) if (doc->numLangs() == 0)

14
kvoctrain/kvoctrain/kva_io.cpp
Unescape View File

@ -160,7 +160,7 @@ void kvoctrainApp::slotFileNew()
view->setView (0, langset); view->setView (0, langset);
delete doc; delete doc;
TQString name = ""; TQString name = "";
doc = new kvoctrainDoc (TQT_TQOBJECT(this), 0 /*KURL(name)*/); doc = new kvoctrainDoc (this, 0 /*KURL(name)*/);
loadDocProps(doc); loadDocProps(doc);
if (doc->numLangs() == 0) { if (doc->numLangs() == 0) {
TQString l = "en"; TQString l = "en";
@ -202,7 +202,7 @@ void kvoctrainApp::loadfileFromPath(const KURL & url, bool addRecent)
slotStatusMsg(msg); slotStatusMsg(msg);
prepareProgressBar(); prepareProgressBar();
doc = new kvoctrainDoc (TQT_TQOBJECT(this), url); doc = new kvoctrainDoc (this, url);
removeProgressBar(); removeProgressBar();
loadDocProps(doc); loadDocProps(doc);
view->setView(doc, langset); view->setView(doc, langset);
@ -253,7 +253,7 @@ void kvoctrainApp::slotFileMerge()
slotStatusMsg(msg); slotStatusMsg(msg);
prepareProgressBar(); prepareProgressBar();
kvoctrainDoc *new_doc = new kvoctrainDoc (TQT_TQOBJECT(this), url); kvoctrainDoc *new_doc = new kvoctrainDoc (this, url);
connect (new_doc, TQT_SIGNAL (docModified(bool)), this, TQT_SLOT(slotModifiedDoc(bool))); connect (new_doc, TQT_SIGNAL (docModified(bool)), this, TQT_SLOT(slotModifiedDoc(bool)));
doc->setModified(false); doc->setModified(false);
removeProgressBar(); removeProgressBar();
@ -510,7 +510,7 @@ void kvoctrainApp::slotFileSave()
prepareProgressBar(); prepareProgressBar();
saveDocProps(doc); saveDocProps(doc);
doc->saveAs(TQT_TQOBJECT(this), doc->URL(), doc->getTitle(), kvoctrainDoc::automatic); doc->saveAs(this, doc->URL(), doc->getTitle(), kvoctrainDoc::automatic);
fileOpenRecent->addURL(doc->URL()); fileOpenRecent->addURL(doc->URL());
removeProgressBar(); removeProgressBar();
@ -614,7 +614,7 @@ void kvoctrainApp::slotFileSaveAs()
saveDocProps(doc); saveDocProps(doc);
prepareProgressBar(); prepareProgressBar();
doc->saveAs(TQT_TQOBJECT(this), url, doc->getTitle(), kvoctrainDoc::automatic); doc->saveAs(this, url, doc->getTitle(), kvoctrainDoc::automatic);
fileOpenRecent->addURL(doc->URL()); fileOpenRecent->addURL(doc->URL());
removeProgressBar(); removeProgressBar();
} }
@ -631,7 +631,7 @@ void kvoctrainApp::slotSaveSelection ()
slotStatusMsg(i18n("Saving selected area under new filename...")); slotStatusMsg(i18n("Saving selected area under new filename..."));
TQString save_separator = Prefs::separator(); TQString save_separator = Prefs::separator();
Prefs::setSeparator("\t"); Prefs::setSeparator("\t");
kvoctrainDoc seldoc(TQT_TQOBJECT(this), ""); kvoctrainDoc seldoc(this, "");
// transfer most important parts // transfer most important parts
seldoc.appendLang(doc->getOriginalIdent()); seldoc.appendLang(doc->getOriginalIdent());
for (int i = 1; i < doc->numLangs(); i++) for (int i = 1; i < doc->numLangs(); i++)
@ -667,7 +667,7 @@ void kvoctrainApp::slotSaveSelection ()
saveDocProps(&seldoc); saveDocProps(&seldoc);
prepareProgressBar(); prepareProgressBar();
seldoc.saveAs(TQT_TQOBJECT(this), url, i18n ("Part of: ") + doc->getTitle(), kvoctrainDoc::automatic); seldoc.saveAs(this, url, i18n ("Part of: ") + doc->getTitle(), kvoctrainDoc::automatic);
removeProgressBar(); removeProgressBar();
} }
} }

110
kwordquiz/src/kwordquiz.cpp
Unescape View File

@ -105,117 +105,117 @@ void KWordQuizApp::initActions()
TDEAction* configNotifications; TDEAction* configNotifications;
TDEAction* configApp; TDEAction* configApp;
fileNew = KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(slotFileNew()), actionCollection()); fileNew = KStdAction::openNew(this, TQT_SLOT(slotFileNew()), actionCollection());
fileNew->setWhatsThis(i18n("Creates a new blank vocabulary document")); fileNew->setWhatsThis(i18n("Creates a new blank vocabulary document"));
fileNew->setToolTip(fileNew->whatsThis()); fileNew->setToolTip(fileNew->whatsThis());
fileOpen = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpen()), actionCollection()); fileOpen = KStdAction::open(this, TQT_SLOT(slotFileOpen()), actionCollection());
fileOpen->setWhatsThis(i18n("Opens an existing vocabulary document")); fileOpen->setWhatsThis(i18n("Opens an existing vocabulary document"));
fileOpen->setToolTip(fileOpen->whatsThis()); fileOpen->setToolTip(fileOpen->whatsThis());
fileOpenRecent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpenRecent(const KURL&)), actionCollection()); fileOpenRecent = KStdAction::openRecent(this, TQT_SLOT(slotFileOpenRecent(const KURL&)), actionCollection());
fileGHNS = new TDEAction(i18n("&Get New Vocabularies..."), "knewstuff", "CTRL+G", TQT_TQOBJECT(this), TQT_SLOT(slotFileGHNS()), actionCollection(), "file_ghns"); fileGHNS = new TDEAction(i18n("&Get New Vocabularies..."), "knewstuff", "CTRL+G", this, TQT_SLOT(slotFileGHNS()), actionCollection(), "file_ghns");
fileGHNS->setWhatsThis(i18n("Downloads new vocabularies")); fileGHNS->setWhatsThis(i18n("Downloads new vocabularies"));
fileGHNS->setToolTip(fileGHNS->whatsThis()); fileGHNS->setToolTip(fileGHNS->whatsThis());
fileSave = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotFileSave()), actionCollection()); fileSave = KStdAction::save(this, TQT_SLOT(slotFileSave()), actionCollection());
fileSave->setWhatsThis(i18n("Saves the active vocabulary document")); fileSave->setWhatsThis(i18n("Saves the active vocabulary document"));
fileSave->setToolTip(fileSave->whatsThis()); fileSave->setToolTip(fileSave->whatsThis());
fileSaveAs = KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(slotFileSaveAs()), actionCollection()); fileSaveAs = KStdAction::saveAs(this, TQT_SLOT(slotFileSaveAs()), actionCollection());
fileSaveAs->setWhatsThis(i18n("Saves the active vocabulary document with a different name")); fileSaveAs->setWhatsThis(i18n("Saves the active vocabulary document with a different name"));
fileSaveAs->setToolTip(fileSaveAs->whatsThis()); fileSaveAs->setToolTip(fileSaveAs->whatsThis());
fileClose = KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(slotFileClose()), actionCollection()); fileClose = KStdAction::close(this, TQT_SLOT(slotFileClose()), actionCollection());
fileClose->setWhatsThis(i18n("Closes the active vocabulary document")); fileClose->setWhatsThis(i18n("Closes the active vocabulary document"));
fileClose->setToolTip(fileClose->whatsThis()); fileClose->setToolTip(fileClose->whatsThis());
filePrint = KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(slotFilePrint()), actionCollection()); filePrint = KStdAction::print(this, TQT_SLOT(slotFilePrint()), actionCollection());
filePrint->setWhatsThis(i18n("Prints the active vocabulary document")); filePrint->setWhatsThis(i18n("Prints the active vocabulary document"));
filePrint->setToolTip(filePrint->whatsThis()); filePrint->setToolTip(filePrint->whatsThis());
fileQuit = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotFileQuit()), actionCollection()); fileQuit = KStdAction::quit(this, TQT_SLOT(slotFileQuit()), actionCollection());
fileQuit->setWhatsThis(i18n("Quits KWordQuiz")); fileQuit->setWhatsThis(i18n("Quits KWordQuiz"));
fileQuit->setToolTip(fileQuit->whatsThis()); fileQuit->setToolTip(fileQuit->whatsThis());
editUndo = KStdAction::undo(TQT_TQOBJECT(this), TQT_SLOT(slotEditUndo()), actionCollection()); editUndo = KStdAction::undo(this, TQT_SLOT(slotEditUndo()), actionCollection());
editUndo->setWhatsThis(i18n("Undoes the last command")); editUndo->setWhatsThis(i18n("Undoes the last command"));
editUndo->setToolTip(editUndo->whatsThis()); editUndo->setToolTip(editUndo->whatsThis());
editCut = KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(slotEditCut()), actionCollection()); editCut = KStdAction::cut(this, TQT_SLOT(slotEditCut()), actionCollection());
editCut->setWhatsThis(i18n("Cuts the text from the selected cells and places it on the clipboard")); editCut->setWhatsThis(i18n("Cuts the text from the selected cells and places it on the clipboard"));
editCut->setToolTip(editCut->whatsThis()); editCut->setToolTip(editCut->whatsThis());
editCopy = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotEditCopy()), actionCollection()); editCopy = KStdAction::copy(this, TQT_SLOT(slotEditCopy()), actionCollection());
editCopy->setWhatsThis(i18n("Copies the text from the selected cells and places it on the clipboard")); editCopy->setWhatsThis(i18n("Copies the text from the selected cells and places it on the clipboard"));
editCopy->setToolTip(editCopy->whatsThis()); editCopy->setToolTip(editCopy->whatsThis());
editPaste = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotEditPaste()), actionCollection()); editPaste = KStdAction::paste(this, TQT_SLOT(slotEditPaste()), actionCollection());
editPaste->setWhatsThis(i18n("Pastes previously cut or copied text from the clipboard into the selected cells")); editPaste->setWhatsThis(i18n("Pastes previously cut or copied text from the clipboard into the selected cells"));
editPaste->setToolTip(editPaste->whatsThis()); editPaste->setToolTip(editPaste->whatsThis());
editClear = KStdAction::clear(TQT_TQOBJECT(this), TQT_SLOT(slotEditClear()), actionCollection()); editClear = KStdAction::clear(this, TQT_SLOT(slotEditClear()), actionCollection());
editClear->setWhatsThis(i18n("Clears the content of the selected cells")); editClear->setWhatsThis(i18n("Clears the content of the selected cells"));
editClear->setToolTip(editClear->whatsThis()); editClear->setToolTip(editClear->whatsThis());
editInsert = new TDEAction(i18n("&Insert Row"), "insert_table_row", "CTRL+I", TQT_TQOBJECT(this), TQT_SLOT(slotEditInsert()), actionCollection(),"edit_insert"); editInsert = new TDEAction(i18n("&Insert Row"), "insert_table_row", "CTRL+I", this, TQT_SLOT(slotEditInsert()), actionCollection(),"edit_insert");
editInsert->setWhatsThis(i18n("Inserts a new row above the current row")); editInsert->setWhatsThis(i18n("Inserts a new row above the current row"));
editInsert->setToolTip(editInsert->whatsThis()); editInsert->setToolTip(editInsert->whatsThis());
editDelete = new TDEAction(i18n("&Delete Row"), "delete_table_row", "CTRL+K", TQT_TQOBJECT(this), TQT_SLOT(slotEditDelete()), actionCollection(),"edit_delete"); editDelete = new TDEAction(i18n("&Delete Row"), "delete_table_row", "CTRL+K", this, TQT_SLOT(slotEditDelete()), actionCollection(),"edit_delete");
editDelete->setWhatsThis(i18n("Deletes the selected row(s)")); editDelete->setWhatsThis(i18n("Deletes the selected row(s)"));
editDelete->setToolTip(editDelete->whatsThis()); editDelete->setToolTip(editDelete->whatsThis());
editMarkBlank = new TDEAction(i18n("&Mark as Blank"), "markasblank", "CTRL+M", TQT_TQOBJECT(this), TQT_SLOT(slotEditMarkBlank()), actionCollection(),"edit_mark_blank"); editMarkBlank = new TDEAction(i18n("&Mark as Blank"), "markasblank", "CTRL+M", this, TQT_SLOT(slotEditMarkBlank()), actionCollection(),"edit_mark_blank");
editMarkBlank->setWhatsThis(i18n("Marks the current or selected word as a blank for Fill-in-the-blank")); editMarkBlank->setWhatsThis(i18n("Marks the current or selected word as a blank for Fill-in-the-blank"));
editMarkBlank->setToolTip(editMarkBlank->whatsThis()); editMarkBlank->setToolTip(editMarkBlank->whatsThis());
editUnmarkBlank = new TDEAction(i18n("&Unmark Blanks"), "unmarkasblank", 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditUnmarkBlank()), actionCollection(),"edit_unmark_blank"); editUnmarkBlank = new TDEAction(i18n("&Unmark Blanks"), "unmarkasblank", 0, this, TQT_SLOT(slotEditUnmarkBlank()), actionCollection(),"edit_unmark_blank");
editUnmarkBlank->setWhatsThis(i18n("Removes blanks from the current or selected word")); editUnmarkBlank->setWhatsThis(i18n("Removes blanks from the current or selected word"));
editUnmarkBlank->setToolTip(editUnmarkBlank->whatsThis()); editUnmarkBlank->setToolTip(editUnmarkBlank->whatsThis());
//@todo implement editFind = KStdAction::find(this, TQT_SLOT(slotEditFind()), actionCollection()); //@todo implement editFind = KStdAction::find(this, TQT_SLOT(slotEditFind()), actionCollection());
vocabLanguages = new TDEAction(i18n("&Column Titles..."), "languages", "CTRL+L", TQT_TQOBJECT(this), TQT_SLOT(slotVocabLanguages()), actionCollection(),"vocab_languages"); vocabLanguages = new TDEAction(i18n("&Column Titles..."), "languages", "CTRL+L", this, TQT_SLOT(slotVocabLanguages()), actionCollection(),"vocab_languages");
vocabLanguages->setWhatsThis(i18n("Defines the column titles for the active vocabulary")); vocabLanguages->setWhatsThis(i18n("Defines the column titles for the active vocabulary"));
vocabLanguages->setToolTip(vocabLanguages->whatsThis()); vocabLanguages->setToolTip(vocabLanguages->whatsThis());
vocabFont = new TDEAction(i18n("&Font..."), "fonts", 0, TQT_TQOBJECT(this), TQT_SLOT(slotVocabFont()), actionCollection(),"vocab_font"); vocabFont = new TDEAction(i18n("&Font..."), "fonts", 0, this, TQT_SLOT(slotVocabFont()), actionCollection(),"vocab_font");
vocabFont->setWhatsThis(i18n("Defines the font used by the editor")); vocabFont->setWhatsThis(i18n("Defines the font used by the editor"));
vocabFont->setToolTip(vocabFont->whatsThis()); vocabFont->setToolTip(vocabFont->whatsThis());
//@todo implement vocabKeyboard = new TDEAction(i18n("&Keyboard..."), "kxkb", 0, TQT_TQOBJECT(this), TQT_SLOT(slotVocabKeyboard()), actionCollection(),"vocab_keyboard"); //@todo implement vocabKeyboard = new TDEAction(i18n("&Keyboard..."), "kxkb", 0, this, TQT_SLOT(slotVocabKeyboard()), actionCollection(),"vocab_keyboard");
vocabRC = new TDEAction(i18n("&Rows/Columns..."), "rowcol", 0, TQT_TQOBJECT(this), TQT_SLOT(slotVocabRC()), actionCollection(),"vocab_rc"); vocabRC = new TDEAction(i18n("&Rows/Columns..."), "rowcol", 0, this, TQT_SLOT(slotVocabRC()), actionCollection(),"vocab_rc");
vocabRC->setWhatsThis(i18n("Defines the number of rows, row heights, and column widths for the active vocabulary")); vocabRC->setWhatsThis(i18n("Defines the number of rows, row heights, and column widths for the active vocabulary"));
vocabRC->setToolTip(vocabRC->whatsThis()); vocabRC->setToolTip(vocabRC->whatsThis());
vocabSort = new TDEAction(i18n("&Sort..."), "sort_incr", 0, TQT_TQOBJECT(this), TQT_SLOT(slotVocabSort()), actionCollection(),"vocab_sort"); vocabSort = new TDEAction(i18n("&Sort..."), "sort_incr", 0, this, TQT_SLOT(slotVocabSort()), actionCollection(),"vocab_sort");
vocabSort->setWhatsThis(i18n("Sorts the vocabulary in ascending or descending order based on the left or right column")); vocabSort->setWhatsThis(i18n("Sorts the vocabulary in ascending or descending order based on the left or right column"));
vocabSort->setToolTip(vocabSort->whatsThis()); vocabSort->setToolTip(vocabSort->whatsThis());
vocabShuffle = new TDEAction(i18n("Sh&uffle"), "shuffle", 0, TQT_TQOBJECT(this), TQT_SLOT(slotVocabShuffle()), actionCollection(),"vocab_shuffle"); vocabShuffle = new TDEAction(i18n("Sh&uffle"), "shuffle", 0, this, TQT_SLOT(slotVocabShuffle()), actionCollection(),"vocab_shuffle");
vocabShuffle->setWhatsThis(i18n("Shuffles the entries of the active vocabulary")); vocabShuffle->setWhatsThis(i18n("Shuffles the entries of the active vocabulary"));
vocabShuffle->setToolTip(vocabShuffle->whatsThis()); vocabShuffle->setToolTip(vocabShuffle->whatsThis());
mode = new TDEToolBarPopupAction(i18n("Change Mode"), "mode1", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMode0()), actionCollection(),"mode_0"); mode = new TDEToolBarPopupAction(i18n("Change Mode"), "mode1", 0, this, TQT_SLOT(slotMode0()), actionCollection(),"mode_0");
mode->setWhatsThis(i18n("Changes the mode used in quiz sessions")); mode->setWhatsThis(i18n("Changes the mode used in quiz sessions"));
mode->setToolTip(mode->whatsThis()); mode->setToolTip(mode->whatsThis());
TDEPopupMenu *popup = mode->popupMenu(); TDEPopupMenu *popup = mode->popupMenu();
popup->clear(); popup->clear();
popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode1", TDEIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode1()), 0, 0); popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode1", TDEIcon::Toolbar), "", this, TQT_SLOT(slotMode1()), 0, 0);
popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode2", TDEIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode2()), 0, 1); popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode2", TDEIcon::Toolbar), "", this, TQT_SLOT(slotMode2()), 0, 1);
popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode3", TDEIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode3()), 0, 2); popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode3", TDEIcon::Toolbar), "", this, TQT_SLOT(slotMode3()), 0, 2);
popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode4", TDEIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode4()), 0, 3); popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode4", TDEIcon::Toolbar), "", this, TQT_SLOT(slotMode4()), 0, 3);
popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode5", TDEIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode5()), 0, 4); popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode5", TDEIcon::Toolbar), "", this, TQT_SLOT(slotMode5()), 0, 4);
mode1 = new TDEToggleAction("", "mode1", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMode1()), actionCollection(),"mode_1"); mode1 = new TDEToggleAction("", "mode1", 0, this, TQT_SLOT(slotMode1()), actionCollection(),"mode_1");
mode2 = new TDEToggleAction("", "mode2", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMode2()), actionCollection(),"mode_2"); mode2 = new TDEToggleAction("", "mode2", 0, this, TQT_SLOT(slotMode2()), actionCollection(),"mode_2");
mode3 = new TDEToggleAction("", "mode3", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMode3()), actionCollection(),"mode_3"); mode3 = new TDEToggleAction("", "mode3", 0, this, TQT_SLOT(slotMode3()), actionCollection(),"mode_3");
mode4 = new TDEToggleAction("", "mode4", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMode4()), actionCollection(),"mode_4"); mode4 = new TDEToggleAction("", "mode4", 0, this, TQT_SLOT(slotMode4()), actionCollection(),"mode_4");
mode5 = new TDEToggleAction("", "mode5", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMode5()), actionCollection(),"mode_5"); mode5 = new TDEToggleAction("", "mode5", 0, this, TQT_SLOT(slotMode5()), actionCollection(),"mode_5");
mode1->setWhatsThis(i18n("Selects this mode")); mode1->setWhatsThis(i18n("Selects this mode"));
mode2->setWhatsThis(i18n("Selects this mode")); mode2->setWhatsThis(i18n("Selects this mode"));
mode3->setWhatsThis(i18n("Selects this mode")); mode3->setWhatsThis(i18n("Selects this mode"));
@ -227,56 +227,56 @@ void KWordQuizApp::initActions()
mode4->setToolTip(mode4->whatsThis()); mode4->setToolTip(mode4->whatsThis());
mode5->setToolTip(mode5->whatsThis()); mode5->setToolTip(mode5->whatsThis());
quizEditor = new TDEAction(i18n("&Editor"), "editor", "F6", TQT_TQOBJECT(this), TQT_SLOT(slotQuizEditor()), actionCollection(),"quiz_editor"); quizEditor = new TDEAction(i18n("&Editor"), "editor", "F6", this, TQT_SLOT(slotQuizEditor()), actionCollection(),"quiz_editor");
quizEditor->setWhatsThis(i18n("Activates the vocabulary editor")); quizEditor->setWhatsThis(i18n("Activates the vocabulary editor"));
quizEditor->setToolTip(quizEditor->whatsThis()); quizEditor->setToolTip(quizEditor->whatsThis());
quizFlash = new TDEAction(i18n("&Flashcard"), "flash", "F7", TQT_TQOBJECT(this), TQT_SLOT(slotQuizFlash()), actionCollection(),"quiz_flash"); quizFlash = new TDEAction(i18n("&Flashcard"), "flash", "F7", this, TQT_SLOT(slotQuizFlash()), actionCollection(),"quiz_flash");
quizFlash->setWhatsThis(i18n("Starts a flashcard session using the active vocabulary")); quizFlash->setWhatsThis(i18n("Starts a flashcard session using the active vocabulary"));
quizFlash->setToolTip(quizFlash->whatsThis()); quizFlash->setToolTip(quizFlash->whatsThis());
quizMultiple = new TDEAction(i18n("&Multiple Choice"), "multiple", "F8", TQT_TQOBJECT(this), TQT_SLOT(slotQuizMultiple()), actionCollection(),"quiz_multiple"); quizMultiple = new TDEAction(i18n("&Multiple Choice"), "multiple", "F8", this, TQT_SLOT(slotQuizMultiple()), actionCollection(),"quiz_multiple");
quizMultiple->setWhatsThis(i18n("Starts a multiple choice session using the active vocabulary")); quizMultiple->setWhatsThis(i18n("Starts a multiple choice session using the active vocabulary"));
quizMultiple->setToolTip(quizMultiple->whatsThis()); quizMultiple->setToolTip(quizMultiple->whatsThis());
quizQA = new TDEAction(i18n("&Question && Answer"), "qa", "F9", TQT_TQOBJECT(this), TQT_SLOT(slotQuizQA()), actionCollection(),"quiz_qa"); quizQA = new TDEAction(i18n("&Question && Answer"), "qa", "F9", this, TQT_SLOT(slotQuizQA()), actionCollection(),"quiz_qa");
quizQA->setWhatsThis(i18n("Starts a question and answer session using the active vocabulary")); quizQA->setWhatsThis(i18n("Starts a question and answer session using the active vocabulary"));
quizQA->setToolTip(quizQA->whatsThis()); quizQA->setToolTip(quizQA->whatsThis());
quizCheck = new TDEAction(i18n("&Check"), "check", "Return", TQT_TQOBJECT(this), 0, actionCollection(),"quiz_check"); quizCheck = new TDEAction(i18n("&Check"), "check", "Return", this, 0, actionCollection(),"quiz_check");
quizCheck->setWhatsThis(i18n("Checks your answer to this question")); quizCheck->setWhatsThis(i18n("Checks your answer to this question"));
quizCheck->setToolTip(quizCheck->whatsThis()); quizCheck->setToolTip(quizCheck->whatsThis());
flashKnow = new TDEAction(i18n("I &Know"), "know", "K", TQT_TQOBJECT(this), 0, actionCollection(),"flash_know"); flashKnow = new TDEAction(i18n("I &Know"), "know", "K", this, 0, actionCollection(),"flash_know");
flashKnow->setWhatsThis(i18n("Counts this card as correct and shows the next card")); flashKnow->setWhatsThis(i18n("Counts this card as correct and shows the next card"));
flashKnow->setToolTip(flashKnow->whatsThis()); flashKnow->setToolTip(flashKnow->whatsThis());
flashDontKnow = new TDEAction(i18n("I &Do Not Know"), "dontknow", "D", TQT_TQOBJECT(this), 0, actionCollection(),"flash_dont_know"); flashDontKnow = new TDEAction(i18n("I &Do Not Know"), "dontknow", "D", this, 0, actionCollection(),"flash_dont_know");
flashDontKnow->setWhatsThis(i18n("Counts this card as incorrect and shows the next card")); flashDontKnow->setWhatsThis(i18n("Counts this card as incorrect and shows the next card"));
flashDontKnow->setToolTip(flashDontKnow->whatsThis()); flashDontKnow->setToolTip(flashDontKnow->whatsThis());
qaHint = new TDEAction(i18n("&Hint"), "hint", "CTRL+H", TQT_TQOBJECT(this), 0, actionCollection(),"qa_hint"); qaHint = new TDEAction(i18n("&Hint"), "hint", "CTRL+H", this, 0, actionCollection(),"qa_hint");
qaHint->setWhatsThis(i18n("Gets the next correct letter of the answer")); qaHint->setWhatsThis(i18n("Gets the next correct letter of the answer"));
qaHint->setToolTip(qaHint->whatsThis()); qaHint->setToolTip(qaHint->whatsThis());
quizRestart = new TDEAction(i18n("&Restart"), "restart.png", "CTRL+R", TQT_TQOBJECT(this), 0, actionCollection(), "quiz_restart"); quizRestart = new TDEAction(i18n("&Restart"), "restart.png", "CTRL+R", this, 0, actionCollection(), "quiz_restart");
quizRestart->setWhatsThis(i18n("Restarts the quiz session from the beginning")); quizRestart->setWhatsThis(i18n("Restarts the quiz session from the beginning"));
quizRestart->setToolTip(quizRestart->whatsThis()); quizRestart->setToolTip(quizRestart->whatsThis());
quizRepeatErrors = new TDEAction(i18n("Repeat &Errors"), "repeat", "CTRL+E", TQT_TQOBJECT(this), 0, actionCollection(),"quiz_repeat_errors"); quizRepeatErrors = new TDEAction(i18n("Repeat &Errors"), "repeat", "CTRL+E", this, 0, actionCollection(),"quiz_repeat_errors");
quizRepeatErrors->setWhatsThis(i18n("Repeats all incorrectly answered questions")); quizRepeatErrors->setWhatsThis(i18n("Repeats all incorrectly answered questions"));
quizRepeatErrors->setToolTip(quizRepeatErrors->whatsThis()); quizRepeatErrors->setToolTip(quizRepeatErrors->whatsThis());
configNotifications = KStdAction::configureNotifications(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureNotifications()), actionCollection()); configNotifications = KStdAction::configureNotifications(this, TQT_SLOT(slotConfigureNotifications()), actionCollection());
configNotifications->setWhatsThis(i18n("Configures sound and other notifications for certain events")); configNotifications->setWhatsThis(i18n("Configures sound and other notifications for certain events"));
configNotifications->setToolTip(configNotifications->whatsThis()); configNotifications->setToolTip(configNotifications->whatsThis());
configApp = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT( slotConfigure()), actionCollection()); configApp = KStdAction::preferences(this, TQT_SLOT( slotConfigure()), actionCollection());
configApp->setWhatsThis(i18n("Specifies preferences for the vocabulary editor and quiz sessions")); configApp->setWhatsThis(i18n("Specifies preferences for the vocabulary editor and quiz sessions"));
configApp->setToolTip(configApp->whatsThis()); configApp->setToolTip(configApp->whatsThis());
charMapper = new TQSignalMapper(TQT_TQOBJECT(this)); charMapper = new TQSignalMapper(this);
connect(charMapper, TQT_SIGNAL(mapped(int)), TQT_TQOBJECT(this), TQT_SLOT(slotInsertChar(int))); connect(charMapper, TQT_SIGNAL(mapped(int)), this, TQT_SLOT(slotInsertChar(int)));
specialChar1 = new TDEAction(i18n("Special Character 1"), "", "CTRL+1", charMapper, TQT_SLOT(map()), actionCollection(), "char_1") ; specialChar1 = new TDEAction(i18n("Special Character 1"), "", "CTRL+1", charMapper, TQT_SLOT(map()), actionCollection(), "char_1") ;
specialChar2 = new TDEAction(i18n("Special Character 2"), 0, "CTRL+2", charMapper, TQT_SLOT(map()), actionCollection(), "char_2") ; specialChar2 = new TDEAction(i18n("Special Character 2"), 0, "CTRL+2", charMapper, TQT_SLOT(map()), actionCollection(), "char_2") ;
@ -299,8 +299,8 @@ void KWordQuizApp::initActions()
charMapper->setMapping(specialChar9, 9); charMapper->setMapping(specialChar9, 9);
actionCollection()->setHighlightingEnabled(true); actionCollection()->setHighlightingEnabled(true);
connect(actionCollection(), TQT_SIGNAL(actionStatusText(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotStatusMsg(const TQString &))); connect(actionCollection(), TQT_SIGNAL(actionStatusText(const TQString &)), this, TQT_SLOT(slotStatusMsg(const TQString &)));
connect(actionCollection(), TQT_SIGNAL(actionHighlighted(TDEAction *, bool)), TQT_TQOBJECT(this), TQT_SLOT(slotActionHighlighted(TDEAction *, bool))); connect(actionCollection(), TQT_SIGNAL(actionHighlighted(TDEAction *, bool)), this, TQT_SLOT(slotActionHighlighted(TDEAction *, bool)));
updateSpecialCharIcons(); updateSpecialCharIcons();
if (!initialGeometrySet()) if (!initialGeometrySet())
@ -333,8 +333,8 @@ void KWordQuizApp::initView()
setCentralWidget(m_editView); setCentralWidget(m_editView);
setCaption(doc->URL().fileName(),false); setCaption(doc->URL().fileName(),false);
m_editView->setFont(Prefs::editorFont()); m_editView->setFont(Prefs::editorFont());
connect(m_editView, TQT_SIGNAL(undoChange(const TQString&, bool )), TQT_TQOBJECT(this), TQT_SLOT(slotUndoChange(const TQString&, bool))); connect(m_editView, TQT_SIGNAL(undoChange(const TQString&, bool )), this, TQT_SLOT(slotUndoChange(const TQString&, bool)));
connect(m_editView, TQT_SIGNAL(contextMenuRequested(int, int, const TQPoint &)), TQT_TQOBJECT(this), TQT_SLOT(slotContextMenuRequested(int, int, const TQPoint& ))); connect(m_editView, TQT_SIGNAL(contextMenuRequested(int, int, const TQPoint &)), this, TQT_SLOT(slotContextMenuRequested(int, int, const TQPoint& )));
} }
void KWordQuizApp::openURL(const KURL& url) void KWordQuizApp::openURL(const KURL& url)
@ -1055,7 +1055,7 @@ void KWordQuizApp::slotConfigure()
//TDEConfigDialog didn't find an instance of this dialog, so lets create it : //TDEConfigDialog didn't find an instance of this dialog, so lets create it :
KWordQuizPrefs* dialog = new KWordQuizPrefs( this, "settings", Prefs::self() ); KWordQuizPrefs* dialog = new KWordQuizPrefs( this, "settings", Prefs::self() );
connect(dialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotApplyPreferences())); connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(slotApplyPreferences()));
dialog->show(); dialog->show();
} }

6
libtdeedu/extdate/extdatetbl.cpp
Unescape View File

@ -83,7 +83,7 @@ public:
ExtDateValidator::ExtDateValidator(TQWidget* parent, const char* name) ExtDateValidator::ExtDateValidator(TQWidget* parent, const char* name)
: TQValidator(TQT_TQOBJECT(parent), name) : TQValidator(parent, name)
{ {
} }
@ -567,7 +567,7 @@ void ExtDateTable::unsetCustomDatePainting( const ExtDate &date )
ExtDateInternalWeekSelector::ExtDateInternalWeekSelector ExtDateInternalWeekSelector::ExtDateInternalWeekSelector
(TQWidget* parent, const char* name) (TQWidget* parent, const char* name)
: KLineEdit(parent, name), : KLineEdit(parent, name),
val(new TQIntValidator(TQT_TQOBJECT(this))), val(new TQIntValidator(this)),
result(0) result(0)
{ {
TQFont font; TQFont font;
@ -813,7 +813,7 @@ ExtDateInternalMonthPicker::contentsMouseReleaseEvent(TQMouseEvent *e)
ExtDateInternalYearSelector::ExtDateInternalYearSelector ExtDateInternalYearSelector::ExtDateInternalYearSelector
(TQWidget* parent, const char* name) (TQWidget* parent, const char* name)
: TQLineEdit(parent, name), : TQLineEdit(parent, name),
val(new TQIntValidator(TQT_TQOBJECT(this))), val(new TQIntValidator(this)),
result(0), result(0),
d(new ExtDateInternalYearPrivate()) d(new ExtDateInternalYearPrivate())
{ {

Write Preview
Loading…
Cancel
Save