From faf33629bb6562a6f43f930afafe4b22e9cdb60b Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 13 Jan 2024 11:29:06 +0900 Subject: Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines Signed-off-by: Michele Calgaro --- tdejava/koala/examples/kscribble/KPenBrushDlg.java | 6 +-- tdejava/koala/examples/kscribble/KScribbleApp.java | 60 +++++++++++----------- 2 files changed, 33 insertions(+), 33 deletions(-) (limited to 'tdejava/koala/examples/kscribble') diff --git a/tdejava/koala/examples/kscribble/KPenBrushDlg.java b/tdejava/koala/examples/kscribble/KPenBrushDlg.java index afbe7d38..c55f4519 100644 --- a/tdejava/koala/examples/kscribble/KPenBrushDlg.java +++ b/tdejava/koala/examples/kscribble/KPenBrushDlg.java @@ -31,9 +31,9 @@ public class KPenBrushDlg extends TQDialog { TQWhatsThis.add(width_spbox,i18n("Select brush width")); width_spbox.setValue(curr); - connect(default_btn, SIGNAL("clicked()"), this, SLOT("slotDefault()")); - connect(ok_btn, SIGNAL("clicked()"), this, SLOT("accept()")); - connect(cancel_btn, SIGNAL("clicked()"), this, SLOT("reject()")); + connect(default_btn, TQ_SIGNAL("clicked()"), this, TQ_SLOT("slotDefault()")); + connect(ok_btn, TQ_SIGNAL("clicked()"), this, TQ_SLOT("accept()")); + connect(cancel_btn, TQ_SIGNAL("clicked()"), this, TQ_SLOT("reject()")); } diff --git a/tdejava/koala/examples/kscribble/KScribbleApp.java b/tdejava/koala/examples/kscribble/KScribbleApp.java index 8283a4ce..e333d4ed 100644 --- a/tdejava/koala/examples/kscribble/KScribbleApp.java +++ b/tdejava/koala/examples/kscribble/KScribbleApp.java @@ -90,20 +90,20 @@ public class KScribbleApp extends TDEMainWindow implements Resource { TDEAccel keyAccel = new TDEAccel(this); // fileMenu accelerators - keyAccel.insert(TDEStdAccel.New, this, SLOT("slotFileNew()")); - keyAccel.insert(TDEStdAccel.Open, this, SLOT("slotFileOpen()")); - keyAccel.insert(TDEStdAccel.Save, this, SLOT("slotFileSave()")); - keyAccel.insert(TDEStdAccel.Close, this, SLOT("slotFileClose()")); - keyAccel.insert(TDEStdAccel.Print, this, SLOT("slotFilePrint()")); - keyAccel.insert(TDEStdAccel.Quit, this, SLOT("slotFileQuit()")); + keyAccel.insert(TDEStdAccel.New, this, TQ_SLOT("slotFileNew()")); + keyAccel.insert(TDEStdAccel.Open, this, TQ_SLOT("slotFileOpen()")); + keyAccel.insert(TDEStdAccel.Save, this, TQ_SLOT("slotFileSave()")); + keyAccel.insert(TDEStdAccel.Close, this, TQ_SLOT("slotFileClose()")); + keyAccel.insert(TDEStdAccel.Print, this, TQ_SLOT("slotFilePrint()")); + keyAccel.insert(TDEStdAccel.Quit, this, TQ_SLOT("slotFileQuit()")); // editMenu accelerators - keyAccel.insert(TDEStdAccel.Cut, this, SLOT("slotEditCut()")); - keyAccel.insert(TDEStdAccel.Copy, this, SLOT("slotEditCopy()")); - keyAccel.insert(TDEStdAccel.Paste, this, SLOT("slotEditPaste()")); + keyAccel.insert(TDEStdAccel.Cut, this, TQ_SLOT("slotEditCut()")); + keyAccel.insert(TDEStdAccel.Copy, this, TQ_SLOT("slotEditCopy()")); + keyAccel.insert(TDEStdAccel.Paste, this, TQ_SLOT("slotEditPaste()")); // help accelerator - keyAccel.insert(TDEStdAccel.Help, this, SLOT("appHelpActivated()")); + keyAccel.insert(TDEStdAccel.Help, this, TQ_SLOT("appHelpActivated()")); keyAccel.readSettings(); @@ -115,7 +115,7 @@ public class KScribbleApp extends TDEMainWindow implements Resource { // MENUBAR pRecentFileMenu = new TQPopupMenu(this); - connect(pRecentFileMenu, SIGNAL("activated(int)"), SLOT("slotFileOpenRecent(int)")); + connect(pRecentFileMenu, TQ_SIGNAL("activated(int)"), TQ_SLOT("slotFileOpenRecent(int)")); /////////////////////////////////////////////////////////////////// @@ -185,21 +185,21 @@ public class KScribbleApp extends TDEMainWindow implements Resource { /////////////////////////////////////////////////////////////////// // CONNECT THE MENU SLOTS WITH SIGNALS // for execution slots and statusbar messages - connect(pFileMenu, SIGNAL("activated(int)"), SLOT("commandCallback(int)")); - connect(pFileMenu, SIGNAL("highlighted(int)"), SLOT("statusCallback(int)")); + connect(pFileMenu, TQ_SIGNAL("activated(int)"), TQ_SLOT("commandCallback(int)")); + connect(pFileMenu, TQ_SIGNAL("highlighted(int)"), TQ_SLOT("statusCallback(int)")); - connect(pEditMenu, SIGNAL("activated(int)"), SLOT("commandCallback(int)")); - connect(pEditMenu, SIGNAL("highlighted(int)"), SLOT("statusCallback(int)")); + connect(pEditMenu, TQ_SIGNAL("activated(int)"), TQ_SLOT("commandCallback(int)")); + connect(pEditMenu, TQ_SIGNAL("highlighted(int)"), TQ_SLOT("statusCallback(int)")); - connect(pPenMenu, SIGNAL("activated(int)"), SLOT("commandCallback(int)")); - connect(pPenMenu, SIGNAL("highlighted(int)"), SLOT("statusCallback(int)")); + connect(pPenMenu, TQ_SIGNAL("activated(int)"), TQ_SLOT("commandCallback(int)")); + connect(pPenMenu, TQ_SIGNAL("highlighted(int)"), TQ_SLOT("statusCallback(int)")); - connect(pViewMenu, SIGNAL("activated(int)"), SLOT("commandCallback(int)")); - connect(pViewMenu, SIGNAL("highlighted(int)"), SLOT("statusCallback(int)")); + connect(pViewMenu, TQ_SIGNAL("activated(int)"), TQ_SLOT("commandCallback(int)")); + connect(pViewMenu, TQ_SIGNAL("highlighted(int)"), TQ_SLOT("statusCallback(int)")); - connect(pWindowMenu, SIGNAL("aboutToShow()" ), SLOT( "windowMenuAboutToShow()" ) ); - connect(pWindowMenu, SIGNAL("activated(int)"), SLOT("commandCallback(int)")); - connect(pWindowMenu, SIGNAL("highlighted(int)"), SLOT("statusCallback(int)")); + connect(pWindowMenu, TQ_SIGNAL("aboutToShow()" ), TQ_SLOT( "windowMenuAboutToShow()" ) ); + connect(pWindowMenu, TQ_SIGNAL("activated(int)"), TQ_SLOT("commandCallback(int)")); + connect(pWindowMenu, TQ_SIGNAL("highlighted(int)"), TQ_SLOT("statusCallback(int)")); } @@ -221,8 +221,8 @@ public class KScribbleApp extends TDEMainWindow implements Resource { toolBar().insertButton(KDE.BarIcon("pencolor"), ID_PEN_COLOR, true, i18n("Color"),-1 ); toolBar().insertButton(KDE.BarIcon("penwidth"), ID_PEN_BRUSH, true, i18n("Width"),-1 ); toolBar().insertSeparator(); - toolBar().insertButton(KDE.BarIcon("help"), ID_HELP_CONTENTS, SIGNAL("clicked()"), - this, SLOT("appHelpActivated()"), true,i18n("Help"),-1); + toolBar().insertButton(KDE.BarIcon("help"), ID_HELP_CONTENTS, TQ_SIGNAL("clicked()"), + this, TQ_SLOT("appHelpActivated()"), true,i18n("Help"),-1); TQToolButton btnwhat = TQWhatsThis.whatsThisButton(toolBar()); TQToolTip.add(btnwhat, i18n("What's this...?")); @@ -235,9 +235,9 @@ public class KScribbleApp extends TDEMainWindow implements Resource { /////////////////////////////////////////////////////////////////// // CONNECT THE TOOLBAR SLOTS WITH SIGNALS - add new created toolbars by their according number // connect for invoking the slot actions - connect(toolBar(), SIGNAL("clicked(int)"), SLOT("commandCallback(int)")); + connect(toolBar(), TQ_SIGNAL("clicked(int)"), TQ_SLOT("commandCallback(int)")); // connect for the status help on holing icons pressed with the mouse button - connect(toolBar(), SIGNAL("pressed(int)"), SLOT("statusCallback(int)")); + connect(toolBar(), TQ_SIGNAL("pressed(int)"), TQ_SLOT("statusCallback(int)")); } @@ -261,7 +261,7 @@ public class KScribbleApp extends TDEMainWindow implements Resource { TQVBox view_back = new TQVBox( this ); view_back.setFrameStyle( TQFrame.StyledPanel | TQFrame.Sunken ); pWorkspace = new TQWorkspace( view_back, "" ); - connect(pWorkspace, SIGNAL("windowActivated(TQWidget)"), this, SLOT("setWndTitle(TQWidget)")); + connect(pWorkspace, TQ_SIGNAL("windowActivated(TQWidget)"), this, TQ_SLOT("setWndTitle(TQWidget)")); // setView(view_back); setCentralWidget(view_back); } @@ -355,9 +355,9 @@ public class KScribbleApp extends TDEMainWindow implements Resource { pWindowMenu.insertItem(i18n("&New Window"), ID_WINDOW_NEW_WINDOW); pWindowMenu.insertItem(i18n("&Cascade"), - pWorkspace, SLOT("cascade()" ),new TQKeySequence(0) , ID_WINDOW_CASCADE ); + pWorkspace, TQ_SLOT("cascade()" ),new TQKeySequence(0) , ID_WINDOW_CASCADE ); pWindowMenu.insertItem(i18n("&Tile"), - pWorkspace, SLOT("tile()" ),new TQKeySequence(0) , ID_WINDOW_TILE ); + pWorkspace, TQ_SLOT("tile()" ),new TQKeySequence(0) , ID_WINDOW_TILE ); if ( pWorkspace.windowList().isEmpty() ) { @@ -372,7 +372,7 @@ public class KScribbleApp extends TDEMainWindow implements Resource { for ( int i = 0; i < windows.size(); ++i ) { int id = pWindowMenu.insertItem((i+1)+ ((TQWidget)windows.get(i)).caption(), - this, SLOT( "windowMenuActivated( int )" ) ); + this, TQ_SLOT( "windowMenuActivated( int )" ) ); pWindowMenu.setItemParameter( id, i ); pWindowMenu.setItemChecked( id, pWorkspace.activeWindow() == (TQWidget)windows.get(i) ); } -- cgit v1.2.1