Replace various '#define' strings - part 6

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/14/head
Michele Calgaro 12 months ago
parent d9f688ddbd
commit 95d1e67dc4
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -112,7 +112,7 @@ void BarcodeCombo::setEncodingType( const TQString & type )
} }
BarcodeWidget::BarcodeWidget(TQWidget *parent, const char *name ) BarcodeWidget::BarcodeWidget(TQWidget *parent, const char *name )
: TQWidget( parent, name ), m_validator( TQT_TQOBJECT(this) ) : TQWidget( parent, name ), m_validator( this )
{ {
m_token = NULL; m_token = NULL;

@ -52,7 +52,7 @@ DatabaseBrowser::DatabaseBrowser( TQString _database, TQWidget *parent, const ch
connect( table, TQT_SIGNAL( cursorChanged( TQSql::Op ) ), connect( table, TQT_SIGNAL( cursorChanged( TQSql::Op ) ),
SqlTables::getInstance(), TQT_SIGNAL( tablesChanged() ) ); SqlTables::getInstance(), TQT_SIGNAL( tablesChanged() ) );
connect( TQT_TQOBJECT(this), TQT_SIGNAL( connectedSQL() ), this, TQT_SLOT( setupSql() ) ); connect( this, TQT_SIGNAL( connectedSQL() ), this, TQT_SLOT( setupSql() ) );
findDlg = 0; findDlg = 0;
@ -81,10 +81,10 @@ void DatabaseBrowser::setupActions()
DSMainWindow::setupActions(); DSMainWindow::setupActions();
TDEPopupMenu* editMenu = new TDEPopupMenu( this ); TDEPopupMenu* editMenu = new TDEPopupMenu( this );
TDEAction* acut = KStdAction::cut( TQT_TQOBJECT(this), TQT_SLOT( cut() ), actionCollection() ); TDEAction* acut = KStdAction::cut( this, TQT_SLOT( cut() ), actionCollection() );
TDEAction* acopy = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT( copy() ), actionCollection() ); TDEAction* acopy = KStdAction::copy( this, TQT_SLOT( copy() ), actionCollection() );
TDEAction* apaste = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT( paste() ), actionCollection() ); TDEAction* apaste = KStdAction::paste( this, TQT_SLOT( paste() ), actionCollection() );
TDEAction* afind = KStdAction::find( TQT_TQOBJECT(this), TQT_SLOT( find() ), actionCollection() ); TDEAction* afind = KStdAction::find( this, TQT_SLOT( find() ), actionCollection() );
menuBar()->insertItem( i18n("&Edit"), editMenu, -1, 1 ); menuBar()->insertItem( i18n("&Edit"), editMenu, -1, 1 );
acut->plug( editMenu ); acut->plug( editMenu );
@ -93,10 +93,10 @@ void DatabaseBrowser::setupActions()
editMenu->insertSeparator(); editMenu->insertSeparator();
afind->plug( editMenu ); afind->plug( editMenu );
KStdAction::findNext( TQT_TQOBJECT(this), TQT_SLOT( findNext() ), actionCollection() )->plug( editMenu ); KStdAction::findNext( this, TQT_SLOT( findNext() ), actionCollection() )->plug( editMenu );
editMenu->insertSeparator(); editMenu->insertSeparator();
TDEAction* aimport = new TDEAction( i18n("&Import CSV File..."), "", TDEAction* aimport = new TDEAction( i18n("&Import CSV File..."), "",
0, TQT_TQOBJECT(this), TQT_SLOT(import()), actionCollection(), "import" ); 0, this, TQT_SLOT(import()), actionCollection(), "import" );
aimport->plug( editMenu ); aimport->plug( editMenu );
acut->plug( toolBar() ); acut->plug( toolBar() );

@ -50,7 +50,7 @@ DSMainWindow::DSMainWindow(TQWidget *parent, const char *name, WFlags f)
loadConfig(); loadConfig();
setAutoSaveSettings( TQString("Window") + name, true ); setAutoSaveSettings( TQString("Window") + name, true );
connect( kapp, TQT_SIGNAL( aboutToQuit() ), TQT_TQOBJECT(this), TQT_SLOT( saveConfig() ) ); connect( kapp, TQT_SIGNAL( aboutToQuit() ), this, TQT_SLOT( saveConfig() ) );
if( first && startwizard ) { if( first && startwizard ) {
wizard(); wizard();
@ -65,17 +65,17 @@ DSMainWindow::~DSMainWindow()
void DSMainWindow::setupActions() void DSMainWindow::setupActions()
{ {
TDEAction* quitAct = KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection()); TDEAction* quitAct = KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection());
TDEAction* closeAct = KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection(), "close" ); TDEAction* closeAct = KStdAction::close( this, TQT_SLOT( close() ), actionCollection(), "close" );
TDEAction* configureAct = KStdAction::preferences( KBarcodeSettings::getInstance(), TQT_SLOT(configure()), actionCollection() ); TDEAction* configureAct = KStdAction::preferences( KBarcodeSettings::getInstance(), TQT_SLOT(configure()), actionCollection() );
TDEAction* wizardAct = new TDEAction( i18n("&Start Configuration Wizard..."), BarIcon("wizard"), 0, TQT_TQOBJECT(this), TDEAction* wizardAct = new TDEAction( i18n("&Start Configuration Wizard..."), BarIcon("wizard"), 0, this,
TQT_SLOT(wizard()), actionCollection(), "wizard" ); TQT_SLOT(wizard()), actionCollection(), "wizard" );
connectAct = new TDEAction(i18n("&Connect to Database"), BarIcon("connect_no"), 0, TQT_TQOBJECT(this), TQT_SLOT(connectMySQL()), connectAct = new TDEAction(i18n("&Connect to Database"), BarIcon("connect_no"), 0, this, TQT_SLOT(connectMySQL()),
actionCollection(),"connect" ); actionCollection(),"connect" );
TDEAction* newTablesAct = new TDEAction( i18n("&Create Tables"), "", 0, TQT_TQOBJECT(this), TDEAction* newTablesAct = new TDEAction( i18n("&Create Tables"), "", 0, this,
TQT_SLOT(newTables()), actionCollection(), "tables" ); TQT_SLOT(newTables()), actionCollection(), "tables" );
importLabelDefAct = new TDEAction( i18n("&Import Label Definitions"), "", 0, SqlTables::getInstance(), importLabelDefAct = new TDEAction( i18n("&Import Label Definitions"), "", 0, SqlTables::getInstance(),
@ -106,7 +106,7 @@ void DSMainWindow::setupActions()
configureAct->plug( settings ); configureAct->plug( settings );
wizardAct->plug( settings ); wizardAct->plug( settings );
connectAct->plug( settings ); connectAct->plug( settings );
(new TDEActionSeparator( TQT_TQOBJECT(this) ))->plug( settings ); (new TDEActionSeparator( this ))->plug( settings );
newTablesAct->plug( settings ); newTablesAct->plug( settings );
importLabelDefAct->plug( settings ); importLabelDefAct->plug( settings );
importExampleAct->plug( settings ); importExampleAct->plug( settings );

@ -64,28 +64,28 @@ KBarcode::KBarcode( TQWidget *parent, const char *name, WFlags f)
layout->addWidget( buttonBatch ); layout->addWidget( buttonBatch );
layout->addWidget( buttonData ); layout->addWidget( buttonData );
connect( buttonSingle, TQT_SIGNAL( clicked() ), TQT_TQOBJECT(this), TQT_SLOT( startBarcode() ) ); connect( buttonSingle, TQT_SIGNAL( clicked() ), this, TQT_SLOT( startBarcode() ) );
connect( buttonEditor, TQT_SIGNAL( clicked() ), TQT_TQOBJECT(this), TQT_SLOT( startLabelEditor() ) ); connect( buttonEditor, TQT_SIGNAL( clicked() ), this, TQT_SLOT( startLabelEditor() ) );
connect( buttonBatch, TQT_SIGNAL( clicked() ), TQT_TQOBJECT(this), TQT_SLOT( startBatchPrint() ) ); connect( buttonBatch, TQT_SIGNAL( clicked() ), this, TQT_SLOT( startBatchPrint() ) );
connect( SqlTables::getInstance(), TQT_SIGNAL( connectedSQL() ), TQT_TQOBJECT(this), TQT_SLOT( enableData() ) ); connect( SqlTables::getInstance(), TQT_SIGNAL( connectedSQL() ), this, TQT_SLOT( enableData() ) );
setupActions(); setupActions();
show(); show();
TDEAction* editLabelDefAct = new TDEAction(i18n("&Edit Label Definitions"), "", TDEAction* editLabelDefAct = new TDEAction(i18n("&Edit Label Definitions"), "",
0, TQT_TQOBJECT(this), TQT_SLOT(editLabelDef()), actionCollection(), "design" ); 0, this, TQT_SLOT(editLabelDef()), actionCollection(), "design" );
TDEAction* editArticleAct = new TDEAction(i18n("&Edit Articles"), "", TDEAction* editArticleAct = new TDEAction(i18n("&Edit Articles"), "",
0, TQT_TQOBJECT(this), TQT_SLOT(editArticles()), actionCollection(), "design" ); 0, this, TQT_SLOT(editArticles()), actionCollection(), "design" );
TDEAction* editCustomerAct = new TDEAction(i18n("&Edit Customers"), "", TDEAction* editCustomerAct = new TDEAction(i18n("&Edit Customers"), "",
0, TQT_TQOBJECT(this), TQT_SLOT(editCustomers()), actionCollection(), "design" ); 0, this, TQT_SLOT(editCustomers()), actionCollection(), "design" );
TDEAction* editCustomerTextAct = new TDEAction(i18n("&Edit Customer Text"), "", TDEAction* editCustomerTextAct = new TDEAction(i18n("&Edit Customer Text"), "",
0, TQT_TQOBJECT(this), TQT_SLOT(editCustomerText()), actionCollection() ); 0, this, TQT_SLOT(editCustomerText()), actionCollection() );
TDEAction* importCSVAct = new TDEAction(i18n("&Import CSV File..."), "", TDEAction* importCSVAct = new TDEAction(i18n("&Import CSV File..."), "",
0, TQT_TQOBJECT(this), TQT_SLOT(importCSV()), actionCollection() ); 0, this, TQT_SLOT(importCSV()), actionCollection() );
TDEPopupMenu* data = new TDEPopupMenu( buttonData ); TDEPopupMenu* data = new TDEPopupMenu( buttonData );
editLabelDefAct->plug( data ); editLabelDefAct->plug( data );

@ -139,7 +139,7 @@ LabelEditor::LabelEditor( TQWidget *parent, TQString _filename, const char *name
statusBar()->setSizeGripEnabled( true ); statusBar()->setSizeGripEnabled( true );
statusBar()->show(); statusBar()->show();
c = new MyCanvas( TQT_TQOBJECT(this) ); c = new MyCanvas( this );
c->setDoubleBuffering( true ); c->setDoubleBuffering( true );
c->setUpdatePeriod( CANVAS_UPDATE_PERIOD ); c->setUpdatePeriod( CANVAS_UPDATE_PERIOD );
@ -159,14 +159,14 @@ LabelEditor::LabelEditor( TQWidget *parent, TQString _filename, const char *name
// if( isFirstStart() ) // if( isFirstStart() )
// moveDockWindow( tools, TQt::DockLeft ); // moveDockWindow( tools, TQt::DockLeft );
connect( cv, TQT_SIGNAL( doubleClickedItem(TCanvasItem*) ), TQT_TQOBJECT(this), TQT_SLOT( doubleClickedItem(TCanvasItem*) ) ); connect( cv, TQT_SIGNAL( doubleClickedItem(TCanvasItem*) ), this, TQT_SLOT( doubleClickedItem(TCanvasItem*) ) );
connect( cv, TQT_SIGNAL( showContextMenu(TQPoint) ), TQT_TQOBJECT(this), TQT_SLOT( showContextMenu(TQPoint) ) ); connect( cv, TQT_SIGNAL( showContextMenu(TQPoint) ), this, TQT_SLOT( showContextMenu(TQPoint) ) );
connect( cv, TQT_SIGNAL( movedSomething() ), TQT_TQOBJECT(this), TQT_SLOT( setEdited() ) ); connect( cv, TQT_SIGNAL( movedSomething() ), this, TQT_SLOT( setEdited() ) );
connect( KBarcodeSettings::getInstance(), TQT_SIGNAL( updateGrid( int ) ), cv, TQT_SLOT( updateGUI() ) ); connect( KBarcodeSettings::getInstance(), TQT_SIGNAL( updateGrid( int ) ), cv, TQT_SLOT( updateGUI() ) );
connect( kapp, TQT_SIGNAL( aboutToQuit() ), TQT_TQOBJECT(this), TQT_SLOT( saveConfig() ) ); connect( kapp, TQT_SIGNAL( aboutToQuit() ), this, TQT_SLOT( saveConfig() ) );
connect( history, TQT_SIGNAL( commandExecuted() ), cv, TQT_SLOT( updateGUI() ) ); connect( history, TQT_SIGNAL( commandExecuted() ), cv, TQT_SLOT( updateGUI() ) );
connect( history, TQT_SIGNAL( commandExecuted() ), TQT_TQOBJECT(this), TQT_SLOT( setEdited() ) ); connect( history, TQT_SIGNAL( commandExecuted() ), this, TQT_SLOT( setEdited() ) );
if( !_filename.isEmpty() ) if( !_filename.isEmpty() )
openUrl( _filename ); openUrl( _filename );
@ -248,7 +248,7 @@ void LabelEditor::clearLabel()
createCommandHistoryActions(); createCommandHistoryActions();
connect( history, TQT_SIGNAL( commandExecuted() ), cv, TQT_SLOT( updateGUI() ) ); connect( history, TQT_SIGNAL( commandExecuted() ), cv, TQT_SLOT( updateGUI() ) );
connect( history, TQT_SIGNAL( commandExecuted() ), TQT_TQOBJECT(this), TQT_SLOT( setEdited() ) ); connect( history, TQT_SIGNAL( commandExecuted() ), this, TQT_SLOT( setEdited() ) );
m_edited = false; m_edited = false;
@ -437,47 +437,47 @@ bool LabelEditor::newLabel()
void LabelEditor::setupActions() void LabelEditor::setupActions()
{ {
TDEAction* newAct = KStdAction::openNew( TQT_TQOBJECT(this), TQT_SLOT(startEditor()), actionCollection() ); TDEAction* newAct = KStdAction::openNew( this, TQT_SLOT(startEditor()), actionCollection() );
TDEAction* loadAct = KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT(startLoadEditor()), actionCollection() ); TDEAction* loadAct = KStdAction::open( this, TQT_SLOT(startLoadEditor()), actionCollection() );
TDEAction* quitAct = KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection()); TDEAction* quitAct = KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection());
TDEAction* closeAct = KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection(), "close" ); TDEAction* closeAct = KStdAction::close( this, TQT_SLOT( close() ), actionCollection(), "close" );
closeLabelAct = new TDEAction( i18n("Close &Label" ), 0, 0, TQT_TQOBJECT(this), TQT_SLOT( closeLabel() ), actionCollection() ); closeLabelAct = new TDEAction( i18n("Close &Label" ), 0, 0, this, TQT_SLOT( closeLabel() ), actionCollection() );
recentAct = new TDERecentFilesAction( i18n("&Recent Files"), 0, TQT_TQOBJECT(this), TQT_SLOT( loadRecentEditor( const KURL& ) ) ); recentAct = new TDERecentFilesAction( i18n("&Recent Files"), 0, this, TQT_SLOT( loadRecentEditor( const KURL& ) ) );
TDEAction* importPrintFileAct = new TDEAction( i18n("&Import and Print Batch File..."), BarIconSet( "document-print" ), 0, TQT_TQOBJECT(this), TQT_SLOT( batchPrint() ), actionCollection() ); TDEAction* importPrintFileAct = new TDEAction( i18n("&Import and Print Batch File..."), BarIconSet( "document-print" ), 0, this, TQT_SLOT( batchPrint() ), actionCollection() );
saveAct = KStdAction::save( TQT_TQOBJECT(this), TQT_SLOT( save() ), actionCollection(), "save" ); saveAct = KStdAction::save( this, TQT_SLOT( save() ), actionCollection(), "save" );
saveAsAct = KStdAction::saveAs( TQT_TQOBJECT(this), TQT_SLOT( saveas() ), actionCollection(), "saveas" ); saveAsAct = KStdAction::saveAs( this, TQT_SLOT( saveas() ), actionCollection(), "saveas" );
descriptionAct = new TDEAction( i18n("&Change description..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(changeDes()), actionCollection() ); descriptionAct = new TDEAction( i18n("&Change description..."), 0, 0, this, TQT_SLOT(changeDes()), actionCollection() );
deleteAct = new TDEAction( i18n("&Delete Object"), TQIconSet( BarIcon("edit-delete") ), Key_Delete, TQT_TQOBJECT(cv), TQT_SLOT( deleteCurrent() ), actionCollection() ); deleteAct = new TDEAction( i18n("&Delete Object"), TQIconSet( BarIcon("edit-delete") ), Key_Delete, cv, TQT_SLOT( deleteCurrent() ), actionCollection() );
editPropAct = new TDEAction( i18n("&Properties..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT( doubleClickedCurrent() ), actionCollection() ); editPropAct = new TDEAction( i18n("&Properties..."), 0, 0, this, TQT_SLOT( doubleClickedCurrent() ), actionCollection() );
printAct = KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT( print() ), actionCollection(), "print" ); printAct = KStdAction::print( this, TQT_SLOT( print() ), actionCollection(), "print" );
bcpAct = new TDEAction( i18n("Print to &Barcode Printer..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT( printBCP() ), actionCollection() ); bcpAct = new TDEAction( i18n("Print to &Barcode Printer..."), 0, 0, this, TQT_SLOT( printBCP() ), actionCollection() );
imgAct = new TDEAction( i18n("Print to &Image..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(printImage() ), actionCollection() ); imgAct = new TDEAction( i18n("Print to &Image..."), 0, 0, this, TQT_SLOT(printImage() ), actionCollection() );
changeSizeAct = new TDEAction( i18n("&Change Label..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT( changeSize() ), actionCollection() ); changeSizeAct = new TDEAction( i18n("&Change Label..."), 0, 0, this, TQT_SLOT( changeSize() ), actionCollection() );
barcodeAct = new TDEAction( i18n("Insert &Barcode"), TQIconSet( BarIcon("barcode") ), 0, TQT_TQOBJECT(this), TQT_SLOT( insertBarcode() ), actionCollection() ); barcodeAct = new TDEAction( i18n("Insert &Barcode"), TQIconSet( BarIcon("barcode") ), 0, this, TQT_SLOT( insertBarcode() ), actionCollection() );
barcodeAct->setEnabled( Barkode::haveBarcode() ); barcodeAct->setEnabled( Barkode::haveBarcode() );
pictureAct = new TDEAction( i18n("Insert &Picture"), TQIconSet( BarIcon("inline_image") ), 0, TQT_TQOBJECT(this), TQT_SLOT( insertPicture() ), actionCollection() ); pictureAct = new TDEAction( i18n("Insert &Picture"), TQIconSet( BarIcon("inline_image") ), 0, this, TQT_SLOT( insertPicture() ), actionCollection() );
textAct = new TDEAction( i18n("Insert &Text"), TQIconSet( BarIcon("text") ), 0, TQT_TQOBJECT(this), TQT_SLOT( insertText() ), actionCollection() ); textAct = new TDEAction( i18n("Insert &Text"), TQIconSet( BarIcon("text") ), 0, this, TQT_SLOT( insertText() ), actionCollection() );
textDataAct = new TDEAction( i18n("Insert &Data Field"), TQIconSet( BarIcon("contents") ), 0, TQT_TQOBJECT(this), TQT_SLOT( insertDataText() ), actionCollection() ); textDataAct = new TDEAction( i18n("Insert &Data Field"), TQIconSet( BarIcon("contents") ), 0, this, TQT_SLOT( insertDataText() ), actionCollection() );
textLineAct = new TDEAction( i18n("Insert &Text Line"), TQIconSet( BarIcon("text") ), 0, TQT_TQOBJECT(this), TQT_SLOT( insertTextLine() ), actionCollection() ); textLineAct = new TDEAction( i18n("Insert &Text Line"), TQIconSet( BarIcon("text") ), 0, this, TQT_SLOT( insertTextLine() ), actionCollection() );
lineAct = new TDEAction( i18n("Insert &Line"), TQIconSet( BarIcon("kbarcodelinetool") ), 0, TQT_TQOBJECT(this), TQT_SLOT( insertLine() ), actionCollection() ); lineAct = new TDEAction( i18n("Insert &Line"), TQIconSet( BarIcon("kbarcodelinetool") ), 0, this, TQT_SLOT( insertLine() ), actionCollection() );
rectAct = new TDEAction( i18n("Insert &Rectangle"), TQIconSet( BarIcon("kbarcoderect") ), 0, TQT_TQOBJECT(this), TQT_SLOT( insertRect() ), actionCollection() ); rectAct = new TDEAction( i18n("Insert &Rectangle"), TQIconSet( BarIcon("kbarcoderect") ), 0, this, TQT_SLOT( insertRect() ), actionCollection() );
circleAct = new TDEAction( i18n("Insert &Ellipse"), TQIconSet( BarIcon("kbarcodeellipse") ), 0, TQT_TQOBJECT(this), TQT_SLOT( insertCircle() ), actionCollection() ); circleAct = new TDEAction( i18n("Insert &Ellipse"), TQIconSet( BarIcon("kbarcodeellipse") ), 0, this, TQT_SLOT( insertCircle() ), actionCollection() );
spellAct = KStdAction::spelling( TQT_TQOBJECT(this), TQT_SLOT(spellCheck()), actionCollection(), "spell" ); spellAct = KStdAction::spelling( this, TQT_SLOT(spellCheck()), actionCollection(), "spell" );
gridAct = new TDEToggleAction( i18n("&Grid"), TQIconSet( BarIcon("kbarcodegrid") ), 0, TQT_TQOBJECT(this), TQT_SLOT( toggleGrid() ), actionCollection() ); gridAct = new TDEToggleAction( i18n("&Grid"), TQIconSet( BarIcon("kbarcodegrid") ), 0, this, TQT_SLOT( toggleGrid() ), actionCollection() );
previewAct = new TDEAction( i18n("&Preview..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT( preview() ), actionCollection() ); previewAct = new TDEAction( i18n("&Preview..."), 0, 0, this, TQT_SLOT( preview() ), actionCollection() );
sep = new TDEActionSeparator( TQT_TQOBJECT(this) ); sep = new TDEActionSeparator( this );
cutAct = KStdAction::cut( TQT_TQOBJECT(this), TQT_SLOT( cut() ), actionCollection(), "cut" ); cutAct = KStdAction::cut( this, TQT_SLOT( cut() ), actionCollection(), "cut" );
copyAct = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT( copy() ), actionCollection(), "copy" ); copyAct = KStdAction::copy( this, TQT_SLOT( copy() ), actionCollection(), "copy" );
pasteAct = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT( paste() ), actionCollection(), "paste" ); pasteAct = KStdAction::paste( this, TQT_SLOT( paste() ), actionCollection(), "paste" );
selectAllAct = KStdAction::selectAll( TQT_TQOBJECT(cv), TQT_SLOT( selectAll() ), actionCollection(), "select_all" ); selectAllAct = KStdAction::selectAll( cv, TQT_SLOT( selectAll() ), actionCollection(), "select_all" );
deSelectAllAct = KStdAction::deselect( TQT_TQOBJECT(cv), TQT_SLOT( deSelectAll() ), actionCollection(), "de_select_all" ); deSelectAllAct = KStdAction::deselect( cv, TQT_SLOT( deSelectAll() ), actionCollection(), "de_select_all" );
addressBookAct = new TDEAction( i18n("Address&book"), TQIconSet( BarIcon("kaddressbook") ), 0, TQT_TQOBJECT(this), TQT_SLOT( launchAddressBook() ), actionCollection() ); addressBookAct = new TDEAction( i18n("Address&book"), TQIconSet( BarIcon("kaddressbook") ), 0, this, TQT_SLOT( launchAddressBook() ), actionCollection() );
TDEAction* singleBarcodeAct = new TDEAction(i18n("&Create Single Barcode..."), "", TDEAction* singleBarcodeAct = new TDEAction(i18n("&Create Single Barcode..."), "",
0, TQT_TQOBJECT(this), TQT_SLOT(startBarcodeGen()), 0, this, TQT_SLOT(startBarcodeGen()),
actionCollection(), "create" ); actionCollection(), "create" );
singleBarcodeAct->setEnabled( Barkode::haveBarcode() ); singleBarcodeAct->setEnabled( Barkode::haveBarcode() );
@ -500,12 +500,12 @@ void LabelEditor::setupActions()
lineAct->plug( tools ); lineAct->plug( tools );
rectAct->plug( tools ); rectAct->plug( tools );
circleAct->plug( tools ); circleAct->plug( tools );
(new TDEActionSeparator( TQT_TQOBJECT(this) ))->plug( tools ); (new TDEActionSeparator( this ))->plug( tools );
// spellAct->plug( tools ); // KDE 3.2 // spellAct->plug( tools ); // KDE 3.2
gridAct->plug( tools ); gridAct->plug( tools );
DSMainWindow::setupActions(); DSMainWindow::setupActions();
connect( recentAct, TQT_SIGNAL( urlSelected( const KURL& ) ), TQT_TQOBJECT(this), TQT_SLOT( startLoadRecentEditor( const KURL& ) ) ); connect( recentAct, TQT_SIGNAL( urlSelected( const KURL& ) ), this, TQT_SLOT( startLoadRecentEditor( const KURL& ) ) );
TDEPopupMenu* fileMenu = new TDEPopupMenu( this ); TDEPopupMenu* fileMenu = new TDEPopupMenu( this );
editMenu = new TDEPopupMenu( this ); editMenu = new TDEPopupMenu( this );
@ -579,22 +579,22 @@ void LabelEditor::setupContextMenu()
m_mnuContext->setCheckable( true ); m_mnuContext->setCheckable( true );
TDEPopupMenu* orderMenu = new TDEPopupMenu( m_mnuContext ); TDEPopupMenu* orderMenu = new TDEPopupMenu( m_mnuContext );
orderMenu->insertItem( i18n("&On Top"), TQT_TQOBJECT(this), TQT_SLOT( onTopCurrent() ) ); orderMenu->insertItem( i18n("&On Top"), this, TQT_SLOT( onTopCurrent() ) );
orderMenu->insertItem( i18n("&Raise"), TQT_TQOBJECT(this), TQT_SLOT( raiseCurrent() ) ); orderMenu->insertItem( i18n("&Raise"), this, TQT_SLOT( raiseCurrent() ) );
orderMenu->insertItem( i18n("&Lower"), TQT_TQOBJECT(this), TQT_SLOT( lowerCurrent() ) ); orderMenu->insertItem( i18n("&Lower"), this, TQT_SLOT( lowerCurrent() ) );
orderMenu->insertItem( i18n("&To Background"), TQT_TQOBJECT(this), TQT_SLOT( backCurrent() ) ); orderMenu->insertItem( i18n("&To Background"), this, TQT_SLOT( backCurrent() ) );
TDEPopupMenu* centerMenu = new TDEPopupMenu( m_mnuContext ); TDEPopupMenu* centerMenu = new TDEPopupMenu( m_mnuContext );
centerMenu->insertItem( i18n("Center &Horizontally"), TQT_TQOBJECT(this), TQT_SLOT( centerHorizontal() ) ); centerMenu->insertItem( i18n("Center &Horizontally"), this, TQT_SLOT( centerHorizontal() ) );
centerMenu->insertItem( i18n("Center &Vertically"), TQT_TQOBJECT(this), TQT_SLOT( centerVertical() ) ); centerMenu->insertItem( i18n("Center &Vertically"), this, TQT_SLOT( centerVertical() ) );
m_mnuContext->insertItem( i18n("&Order"), orderMenu ); m_mnuContext->insertItem( i18n("&Order"), orderMenu );
m_mnuContext->insertItem( i18n("&Center"), centerMenu ); m_mnuContext->insertItem( i18n("&Center"), centerMenu );
m_mnuContext->insertSeparator(); m_mnuContext->insertSeparator();
m_mnuContext->insertItem( SmallIcon("edit-delete"), i18n("&Delete"), cv, TQT_SLOT( deleteCurrent() ) ); m_mnuContext->insertItem( SmallIcon("edit-delete"), i18n("&Delete"), cv, TQT_SLOT( deleteCurrent() ) );
m_mnuContext->insertItem( i18n("&Protect Position and Size"), TQT_TQOBJECT(this), TQT_SLOT( lockItem() ), 0, ID_LOCK_ITEM ); m_mnuContext->insertItem( i18n("&Protect Position and Size"), this, TQT_SLOT( lockItem() ), 0, ID_LOCK_ITEM );
m_mnuContext->insertSeparator(); m_mnuContext->insertSeparator();
m_mnuContext->insertItem( i18n("&Properties"), TQT_TQOBJECT(this), TQT_SLOT( doubleClickedCurrent() ) ); m_mnuContext->insertItem( i18n("&Properties"), this, TQT_SLOT( doubleClickedCurrent() ) );
} }
void LabelEditor::insertBarcode() void LabelEditor::insertBarcode()

@ -65,29 +65,29 @@ void MultiLineEditor::setupActions()
{ {
ac = new TDEActionCollection( this ); ac = new TDEActionCollection( this );
TDEAction* action_export = new TDEAction( i18n("Export"), "fileexport", 0, TQT_TQOBJECT(this), TQT_SLOT( save() ), ac ); TDEAction* action_export = new TDEAction( i18n("Export"), "fileexport", 0, this, TQT_SLOT( save() ), ac );
// //
// Edit Actions // Edit Actions
// //
TDEAction *action_undo = KStdAction::undo( TQT_TQOBJECT(editor), TQT_SLOT( undo() ), ac ); TDEAction *action_undo = KStdAction::undo( editor, TQT_SLOT( undo() ), ac );
action_undo->setEnabled( false ); action_undo->setEnabled( false );
connect( editor, TQT_SIGNAL( undoAvailable(bool) ), action_undo, TQT_SLOT( setEnabled(bool) ) ); connect( editor, TQT_SIGNAL( undoAvailable(bool) ), action_undo, TQT_SLOT( setEnabled(bool) ) );
TDEAction *action_redo = KStdAction::redo( TQT_TQOBJECT(editor), TQT_SLOT( redo() ), ac ); TDEAction *action_redo = KStdAction::redo( editor, TQT_SLOT( redo() ), ac );
action_redo->setEnabled( false ); action_redo->setEnabled( false );
connect( editor, TQT_SIGNAL( redoAvailable(bool) ), action_redo, TQT_SLOT( setEnabled(bool) ) ); connect( editor, TQT_SIGNAL( redoAvailable(bool) ), action_redo, TQT_SLOT( setEnabled(bool) ) );
TDEAction *action_cut = KStdAction::cut( TQT_TQOBJECT(editor), TQT_SLOT( cut() ), ac ); TDEAction *action_cut = KStdAction::cut( editor, TQT_SLOT( cut() ), ac );
action_cut->setEnabled( false ); action_cut->setEnabled( false );
connect( editor, TQT_SIGNAL( copyAvailable(bool) ), action_cut, TQT_SLOT( setEnabled(bool) ) ); connect( editor, TQT_SIGNAL( copyAvailable(bool) ), action_cut, TQT_SLOT( setEnabled(bool) ) );
TDEAction *action_copy = KStdAction::copy( TQT_TQOBJECT(editor), TQT_SLOT( copy() ), ac ); TDEAction *action_copy = KStdAction::copy( editor, TQT_SLOT( copy() ), ac );
action_copy->setEnabled( false ); action_copy->setEnabled( false );
connect( editor, TQT_SIGNAL( copyAvailable(bool) ), action_copy, TQT_SLOT( setEnabled(bool) ) ); connect( editor, TQT_SIGNAL( copyAvailable(bool) ), action_copy, TQT_SLOT( setEnabled(bool) ) );
TDEAction* action_paste = KStdAction::paste( TQT_TQOBJECT(editor), TQT_SLOT( paste() ), ac ); TDEAction* action_paste = KStdAction::paste( editor, TQT_SLOT( paste() ), ac );
// //
// Character Formatting // Character Formatting
@ -101,7 +101,7 @@ void MultiLineEditor::setupActions()
action_underline = new TDEToggleAction( i18n("&Underline"), "format-text-underline", CTRL+Key_U, ac, "format_underline" ); action_underline = new TDEToggleAction( i18n("&Underline"), "format-text-underline", CTRL+Key_U, ac, "format_underline" );
connect( action_underline, TQT_SIGNAL( toggled(bool) ), editor, TQT_SLOT( setUnderline(bool) ) ); connect( action_underline, TQT_SIGNAL( toggled(bool) ), editor, TQT_SLOT( setUnderline(bool) ) );
TDEAction* action_color = new TDEAction( i18n("Text &Color..."), "colorpicker", 0, TQT_TQOBJECT(this), TQT_SLOT( formatColor() ), ac, "format_color" ); TDEAction* action_color = new TDEAction( i18n("Text &Color..."), "colorpicker", 0, this, TQT_SLOT( formatColor() ), ac, "format_color" );
// //
// Font // Font
@ -116,16 +116,16 @@ void MultiLineEditor::setupActions()
// Alignment // Alignment
// //
action_align_left = new TDEToggleAction( i18n("Align &Left"), "format-text-direction-ltr", 0, ac, "format_align_left" ); action_align_left = new TDEToggleAction( i18n("Align &Left"), "format-text-direction-ltr", 0, ac, "format_align_left" );
connect( action_align_left, TQT_SIGNAL( toggled(bool) ), TQT_TQOBJECT(this), TQT_SLOT( setAlignLeft(bool) ) ); connect( action_align_left, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( setAlignLeft(bool) ) );
action_align_center = new TDEToggleAction( i18n("Align &Center"), "text_center", 0, ac, "format_align_center" ); action_align_center = new TDEToggleAction( i18n("Align &Center"), "text_center", 0, ac, "format_align_center" );
connect( action_align_center, TQT_SIGNAL( toggled(bool) ), TQT_TQOBJECT(this), TQT_SLOT( setAlignCenter(bool) ) ); connect( action_align_center, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( setAlignCenter(bool) ) );
action_align_right = new TDEToggleAction( i18n("Align &Right"), "format-text-direction-rtl", 0, ac, "format_align_right" ); action_align_right = new TDEToggleAction( i18n("Align &Right"), "format-text-direction-rtl", 0, ac, "format_align_right" );
connect( action_align_right, TQT_SIGNAL( toggled(bool) ), TQT_TQOBJECT(this), TQT_SLOT( setAlignRight(bool) ) ); connect( action_align_right, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( setAlignRight(bool) ) );
action_align_justify = new TDEToggleAction( i18n("&Justify"), "text_block", 0, ac, "format_align_justify" ); action_align_justify = new TDEToggleAction( i18n("&Justify"), "text_block", 0, ac, "format_align_justify" );
connect( action_align_justify, TQT_SIGNAL( toggled(bool) ), TQT_TQOBJECT(this), TQT_SLOT( setAlignJustify(bool) ) ); connect( action_align_justify, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( setAlignJustify(bool) ) );
action_align_left->setExclusiveGroup( "alignment" ); action_align_left->setExclusiveGroup( "alignment" );
action_align_center->setExclusiveGroup( "alignment" ); action_align_center->setExclusiveGroup( "alignment" );
@ -134,7 +134,7 @@ void MultiLineEditor::setupActions()
//TDEAction* action_spell = KStdAction::spelling( this, TQT_SLOT( checkSpelling() ), ac ); //TDEAction* action_spell = KStdAction::spelling( this, TQT_SLOT( checkSpelling() ), ac );
TDEAction* textDataAct = new TDEAction( i18n("Insert &Data Field"), "contents", 0, TQT_TQOBJECT(this), TQT_SLOT( insertNewField() ), ac, "text_data_act"); action_export->plug( toolBar ); TDEAction* textDataAct = new TDEAction( i18n("Insert &Data Field"), "contents", 0, this, TQT_SLOT( insertNewField() ), ac, "text_data_act"); action_export->plug( toolBar );
toolBar->insertSeparator(); toolBar->insertSeparator();
action_undo->plug( toolBar ); action_undo->plug( toolBar );
@ -165,9 +165,9 @@ void MultiLineEditor::setupActions()
// //
updateActions(); updateActions();
connect( editor, TQT_SIGNAL( currentFontChanged( const TQFont & ) ), TQT_TQOBJECT(this), TQT_SLOT( updateFont() ) ); connect( editor, TQT_SIGNAL( currentFontChanged( const TQFont & ) ), this, TQT_SLOT( updateFont() ) );
connect( editor, TQT_SIGNAL( currentFontChanged( const TQFont & ) ), TQT_TQOBJECT(this), TQT_SLOT( updateCharFmt() ) ); connect( editor, TQT_SIGNAL( currentFontChanged( const TQFont & ) ), this, TQT_SLOT( updateCharFmt() ) );
connect( editor, TQT_SIGNAL( cursorPositionChanged( int,int ) ), TQT_TQOBJECT(this), TQT_SLOT( updateAligment() ) ); connect( editor, TQT_SIGNAL( cursorPositionChanged( int,int ) ), this, TQT_SLOT( updateAligment() ) );
} }
TQString MultiLineEditor::text() TQString MultiLineEditor::text()
@ -279,7 +279,7 @@ void MultiLineEditor::checkSpelling()
spell = new KSpell( this, i18n("Spell Checking"), 0, 0, 0, true, true, KSpell::HTML ); spell = new KSpell( this, i18n("Spell Checking"), 0, 0, 0, true, true, KSpell::HTML );
spell->setAutoDelete( true ); spell->setAutoDelete( true );
spell->check( s, true ); spell->check( s, true );
connect( spell, TQT_SIGNAL( done(const TQString &) ), TQT_TQOBJECT(this), TQT_SLOT( spellCheckDone(const TQString &) ) ); connect( spell, TQT_SIGNAL( done(const TQString &) ), this, TQT_SLOT( spellCheckDone(const TQString &) ) );
spell->cleanUp(); spell->cleanUp();
#endif #endif

@ -68,26 +68,26 @@ void TextLineEditor::setupActions()
ac = new TDEActionCollection( this ); ac = new TDEActionCollection( this );
TDEAction *action_undo = KStdAction::undo( TQT_TQOBJECT(editor), TQT_SLOT( undo() ), ac ); TDEAction *action_undo = KStdAction::undo( editor, TQT_SLOT( undo() ), ac );
action_undo->setEnabled( false ); action_undo->setEnabled( false );
connect( editor, TQT_SIGNAL( undoAvailable(bool) ), action_undo, TQT_SLOT( setEnabled(bool) ) ); connect( editor, TQT_SIGNAL( undoAvailable(bool) ), action_undo, TQT_SLOT( setEnabled(bool) ) );
TDEAction *action_redo = KStdAction::redo( TQT_TQOBJECT(editor), TQT_SLOT( redo() ), ac ); TDEAction *action_redo = KStdAction::redo( editor, TQT_SLOT( redo() ), ac );
action_redo->setEnabled( false ); action_redo->setEnabled( false );
connect( editor, TQT_SIGNAL( redoAvailable(bool) ), action_redo, TQT_SLOT( setEnabled(bool) ) ); connect( editor, TQT_SIGNAL( redoAvailable(bool) ), action_redo, TQT_SLOT( setEnabled(bool) ) );
TDEAction *action_cut = KStdAction::cut( TQT_TQOBJECT(editor), TQT_SLOT( cut() ), ac ); TDEAction *action_cut = KStdAction::cut( editor, TQT_SLOT( cut() ), ac );
action_cut->setEnabled( false ); action_cut->setEnabled( false );
connect( editor, TQT_SIGNAL( copyAvailable(bool) ), action_cut, TQT_SLOT( setEnabled(bool) ) ); connect( editor, TQT_SIGNAL( copyAvailable(bool) ), action_cut, TQT_SLOT( setEnabled(bool) ) );
TDEAction *action_copy = KStdAction::copy( TQT_TQOBJECT(editor), TQT_SLOT( copy() ), ac ); TDEAction *action_copy = KStdAction::copy( editor, TQT_SLOT( copy() ), ac );
action_copy->setEnabled( false ); action_copy->setEnabled( false );
connect( editor, TQT_SIGNAL( copyAvailable(bool) ), action_copy, TQT_SLOT( setEnabled(bool) ) ); connect( editor, TQT_SIGNAL( copyAvailable(bool) ), action_copy, TQT_SLOT( setEnabled(bool) ) );
TDEAction* action_paste = KStdAction::paste( TQT_TQOBJECT(editor), TQT_SLOT( paste() ), ac ); TDEAction* action_paste = KStdAction::paste( editor, TQT_SLOT( paste() ), ac );
TDEAction* textDataAct = new TDEAction( i18n("Insert &Data Field"), "contents", 0, TQT_TQOBJECT(this), TQT_SLOT( insertNewField() ), ac, "text_data_act"); TDEAction* textDataAct = new TDEAction( i18n("Insert &Data Field"), "contents", 0, this, TQT_SLOT( insertNewField() ), ac, "text_data_act");
action_undo->plug( toolBar ); action_undo->plug( toolBar );
action_redo->plug( toolBar ); action_redo->plug( toolBar );
@ -122,7 +122,7 @@ void TextLineEditor::setupActions()
textDataAct->plug( tool2Bar ); textDataAct->plug( tool2Bar );
action_font_type = new KComboBox(tool2Bar,"font_type") ; action_font_type = new KComboBox(tool2Bar,"font_type") ;
connect( action_font_type, TQT_SIGNAL( activated(int) ), TQT_TQOBJECT(this), TQT_SLOT( setFontType(int) ) ); connect( action_font_type, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( setFontType(int) ) );
action_font_type->insertStringList(fuentes) ; action_font_type->insertStringList(fuentes) ;
@ -131,8 +131,8 @@ void TextLineEditor::setupActions()
mag_vert = new KIntNumInput( tool3Bar,"magvert" ); mag_vert = new KIntNumInput( tool3Bar,"magvert" );
TQLabel* labelh = new TQLabel( i18n("&Mag. Hor.:"), tool3Bar ); TQLabel* labelh = new TQLabel( i18n("&Mag. Hor.:"), tool3Bar );
mag_hor = new KIntNumInput( tool3Bar,"maghor" ); mag_hor = new KIntNumInput( tool3Bar,"maghor" );
connect( mag_vert, TQT_SIGNAL( activated(int) ), TQT_TQOBJECT(this), TQT_SLOT( setVerMag(int) ) ); connect( mag_vert, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( setVerMag(int) ) );
connect( mag_hor, TQT_SIGNAL( activated(int) ), TQT_TQOBJECT(this), TQT_SLOT( setHorMag(int) ) ); connect( mag_hor, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( setHorMag(int) ) );
mag_vert->setRange( 1, 9, 1, false ); mag_vert->setRange( 1, 9, 1, false );
mag_hor->setRange( 1, 9, 1, false ); mag_hor->setRange( 1, 9, 1, false );

Loading…
Cancel
Save