diff options
Diffstat (limited to 'tdejava')
47 files changed, 217 insertions, 217 deletions
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) ); } diff --git a/tdejava/koala/examples/simplemail/SimpleMailFrm.java b/tdejava/koala/examples/simplemail/SimpleMailFrm.java index bbbe3d0a..a6f0206a 100644 --- a/tdejava/koala/examples/simplemail/SimpleMailFrm.java +++ b/tdejava/koala/examples/simplemail/SimpleMailFrm.java @@ -182,8 +182,8 @@ class SimpleMailFrm extends TDEMainWindow { } void setEventHandlers() { - connect( btCancel, SIGNAL("clicked()"), parentApp, SLOT("quit()")); - connect( btSend,SIGNAL("clicked()"),this,SLOT("sendMail()")); + connect( btCancel, TQ_SIGNAL("clicked()"), parentApp, TQ_SLOT("quit()")); + connect( btSend,TQ_SIGNAL("clicked()"),this,TQ_SLOT("sendMail()")); } diff --git a/tdejava/koala/org/trinitydesktop/koala/BrowserExtension.java b/tdejava/koala/org/trinitydesktop/koala/BrowserExtension.java index d2d2ee08..a571d933 100644 --- a/tdejava/koala/org/trinitydesktop/koala/BrowserExtension.java +++ b/tdejava/koala/org/trinitydesktop/koala/BrowserExtension.java @@ -220,7 +220,7 @@ public class BrowserExtension extends TQObject { public native void pasteRequest(); /** Returns a map containing the action names as keys and corresponding - SLOT()'ified method names as data entries. + TQ_SLOT()'ified method names as data entries. This is very useful for the host component, when connecting the own signals with the extension's slots. @@ -235,11 +235,11 @@ public class BrowserExtension extends TQObject { iterating over the action slot map, returned by this method) Connecting to the slot can be done like this: <pre> - connect( yourObject, SIGNAL("yourSignal()"), + connect( yourObject, TQ_SIGNAL("yourSignal()"), extension, mapIterator.data() ) </pre> (where "mapIterator" is your TQMap<String,String> iterator) - @short Returns a map containing the action names as keys and corresponding SLOT()'ified method names as data entries. + @short Returns a map containing the action names as keys and corresponding TQ_SLOT()'ified method names as data entries. */ // KParts::BrowserExtension::ActionSlotMap actionSlotMap(); >>>> NOT CONVERTED /** diff --git a/tdejava/koala/org/trinitydesktop/koala/Job.java b/tdejava/koala/org/trinitydesktop/koala/Job.java index 82966174..b0748879 100644 --- a/tdejava/koala/org/trinitydesktop/koala/Job.java +++ b/tdejava/koala/org/trinitydesktop/koala/Job.java @@ -14,8 +14,8 @@ import org.trinitydesktop.qt.TQObject; For all jobs created in an application, the code looks like <pre> TDEIO.Job job = TDEIO.someoperation( some parameters ); - connect( job, SIGNAL("result( TDEIO.Job )"), - this, SLOT("slotResult( TDEIO.Job )") ); + connect( job, TQ_SIGNAL("result( TDEIO.Job )"), + this, TQ_SLOT("slotResult( TDEIO.Job )") ); </pre> (other connects, specific to the job) And slotResult is usually at least: diff --git a/tdejava/koala/org/trinitydesktop/koala/KAudioPlayer.java b/tdejava/koala/org/trinitydesktop/koala/KAudioPlayer.java index 69976a68..f41809a6 100644 --- a/tdejava/koala/org/trinitydesktop/koala/KAudioPlayer.java +++ b/tdejava/koala/org/trinitydesktop/koala/KAudioPlayer.java @@ -23,7 +23,7 @@ import org.trinitydesktop.qt.TQObject; If you want to use signals & slots, you can do something like: <pre> KAudioPlayer player("/var/share/foo.wav"); - connect(&button, SIGNAL("clicked()"), &player, SLOT("play()")); + connect(&button, TQ_SIGNAL("clicked()"), &player, TQ_SLOT("play()")); </pre> @short This class provides one-shot-and-forget audio playing. diff --git a/tdejava/koala/org/trinitydesktop/koala/KComboBox.java b/tdejava/koala/org/trinitydesktop/koala/KComboBox.java index 3842db13..87fe2a4f 100644 --- a/tdejava/koala/org/trinitydesktop/koala/KComboBox.java +++ b/tdejava/koala/org/trinitydesktop/koala/KComboBox.java @@ -72,7 +72,7 @@ import org.trinitydesktop.qt.TQComboBox; KComboBox combo = new KComboBox( true, this, "mywidget" ); TDECompletion comp = combo.completionObject(); // Connect to the return pressed signal - optional - connect(combo,SIGNAL("returnPressed(String)"),comp,SLOT("addItem(String)")); + connect(combo,TQ_SIGNAL("returnPressed(String)"),comp,TQ_SLOT("addItem(String)")); // Provide the to be completed strings. Note that those are separate from the combo's // contents. comp.insertItems( someArrayList ); @@ -83,7 +83,7 @@ import org.trinitydesktop.qt.TQComboBox; KURLCompletion comp = new KURLCompletion(); combo.setCompletionObject( comp ); // Connect to the return pressed signal - optional - connect(combo,SIGNAL("returnPressed(String)"),comp,SLOT("addItem(String)")); + connect(combo,TQ_SIGNAL("returnPressed(String)"),comp,TQ_SLOT("addItem(String)")); </pre> Note that you have to either delete the allocated completion object when you don't need it anymore, or call diff --git a/tdejava/koala/org/trinitydesktop/koala/KDirOperator.java b/tdejava/koala/org/trinitydesktop/koala/KDirOperator.java index d0f7114f..14a31790 100644 --- a/tdejava/koala/org/trinitydesktop/koala/KDirOperator.java +++ b/tdejava/koala/org/trinitydesktop/koala/KDirOperator.java @@ -34,14 +34,14 @@ import org.trinitydesktop.qt.TQWidget; <pre> KDirOperator op = new KDirOperator( KURL( "file:/home/gis" ), this ); // some signals you might be interested in - connect(op, SIGNAL("urlEntered(KURL)"), - SLOT("urlEntered(KURL)")); - connect(op, SIGNAL("fileHighlighted(const KFileItem )"), - SLOT("fileHighlighted(const KFileItem )")); - connect(op, SIGNAL("fileSelected(const KFileItem )"), - SLOT("fileSelected(const KFileItem )")); - connect(op, SIGNAL("finishedLoading()"), - SLOT("slotLoadingFinished()")); + connect(op, TQ_SIGNAL("urlEntered(KURL)"), + TQ_SLOT("urlEntered(KURL)")); + connect(op, TQ_SIGNAL("fileHighlighted(const KFileItem )"), + TQ_SLOT("fileHighlighted(const KFileItem )")); + connect(op, TQ_SIGNAL("fileSelected(const KFileItem )"), + TQ_SLOT("fileSelected(const KFileItem )")); + connect(op, TQ_SIGNAL("finishedLoading()"), + TQ_SLOT("slotLoadingFinished()")); op.readConfig( TDEGlobal.config(), "Your KDiroperator ConfigGroup" ); op.setView(KFile.Default); </pre> diff --git a/tdejava/koala/org/trinitydesktop/koala/KEditToolbar.java b/tdejava/koala/org/trinitydesktop/koala/KEditToolbar.java index 7705bfe0..9be1e6b7 100644 --- a/tdejava/koala/org/trinitydesktop/koala/KEditToolbar.java +++ b/tdejava/koala/org/trinitydesktop/koala/KEditToolbar.java @@ -31,7 +31,7 @@ import org.trinitydesktop.qt.TQWidget; { saveMainWindowSettings( TDEGlobal.config(), "MainWindow" ); KEditToolbar dlg(actionCollection()); - connect(&dlg,SIGNAL("newToolbarConfig()"),this,SLOT("slotNewToolbarConfig()")); + connect(&dlg,TQ_SIGNAL("newToolbarConfig()"),this,TQ_SLOT("slotNewToolbarConfig()")); dlg.exec(); } void MyClass.slotNewToolbarConfig() // This is called when OK, Apply or Defaults is clicked @@ -52,7 +52,7 @@ import org.trinitydesktop.qt.TQWidget; <pre> saveMainWindowSettings( TDEGlobal.config(), "MainWindow" ); KEditToolbar dlg(factory()); - connect(&dlg,SIGNAL("newToolbarConfig()"),this,SLOT("slotNewToolbarConfig()")); + connect(&dlg,TQ_SIGNAL("newToolbarConfig()"),this,TQ_SLOT("slotNewToolbarConfig()")); dlg.exec(); void MyClass.slotNewToolbarConfig() // This is called when OK, Apply or Defaults is clicked { diff --git a/tdejava/koala/org/trinitydesktop/koala/KFileDialog.java b/tdejava/koala/org/trinitydesktop/koala/KFileDialog.java index 9dc71540..f0a5c0ae 100644 --- a/tdejava/koala/org/trinitydesktop/koala/KFileDialog.java +++ b/tdejava/koala/org/trinitydesktop/koala/KFileDialog.java @@ -324,7 +324,7 @@ public class KFileDialog extends KDialogBase { items into it, e.g.: <pre> yourAction = new TDEAction( i18n("Your Action"), 0, - this, SLOT("yourSlot()"), + this, TQ_SLOT("yourSlot()"), this, "action name" ); yourAction.plug( tdefileDialog.toolBar() ); </pre> diff --git a/tdejava/koala/org/trinitydesktop/koala/KFind.java b/tdejava/koala/org/trinitydesktop/koala/KFind.java index 518b7586..2231cc6b 100644 --- a/tdejava/koala/org/trinitydesktop/koala/KFind.java +++ b/tdejava/koala/org/trinitydesktop/koala/KFind.java @@ -23,11 +23,11 @@ import org.trinitydesktop.qt.TQObject; m_find = new KFind(pattern, options, this); // Connect highlight signal to code which handles highlighting // of found text. - connect( m_find, SIGNAL("highlight( String, int, int )"), - this, SLOT("slotHighlight( String, int, int )") ); + connect( m_find, TQ_SIGNAL("highlight( String, int, int )"), + this, TQ_SLOT("slotHighlight( String, int, int )") ); // Connect findNext signal - called when pressing the button in the dialog - connect( m_find, SIGNAL("findNext()"), - this, SLOT("slotFindNext()") ); + connect( m_find, TQ_SIGNAL("findNext()"), + this, TQ_SLOT("slotFindNext()") ); </pre> If you are using a non-modal find dialog (the recommended new way in KDE-3.2), you should call right away m_find.closeFindNextDialog(). diff --git a/tdejava/koala/org/trinitydesktop/koala/KFindDialog.java b/tdejava/koala/org/trinitydesktop/koala/KFindDialog.java index 9b0d4aa6..01eeac77 100644 --- a/tdejava/koala/org/trinitydesktop/koala/KFindDialog.java +++ b/tdejava/koala/org/trinitydesktop/koala/KFindDialog.java @@ -30,7 +30,7 @@ import org.trinitydesktop.qt.TQWidget; else { m_findDia = new KFindDialog(false,...); - connect( m_findDia, SIGNAL("okClicked()"), this, SLOT("findTextNext()") ); + connect( m_findDia, TQ_SIGNAL("okClicked()"), this, TQ_SLOT("findTextNext()") ); } </pre> Don't forget to delete and reset m_findDia when closed. diff --git a/tdejava/koala/org/trinitydesktop/koala/KHelpMenu.java b/tdejava/koala/org/trinitydesktop/koala/KHelpMenu.java index 8ea163d4..fea442f8 100644 --- a/tdejava/koala/org/trinitydesktop/koala/KHelpMenu.java +++ b/tdejava/koala/org/trinitydesktop/koala/KHelpMenu.java @@ -23,7 +23,7 @@ import org.trinitydesktop.qt.TQObject; or if you just want to open a dialog box: <pre> mHelpMenu = new KHelpMenu( this, <someText> ); - connect( this, SIGNAL("someSignal()"), mHelpMenu,SLOT("mHelpMenu.aboutKDE()")); + connect( this, TQ_SIGNAL("someSignal()"), mHelpMenu,TQ_SLOT("mHelpMenu.aboutKDE()")); </pre> IMPORTANT: The first time you use KHelpMenu.menu(), a TDEPopupMenu object is @@ -52,8 +52,8 @@ import org.trinitydesktop.qt.TQObject; { .. KHelpMenu helpMenu = new KHelpMenu( this ); - connect( helpMenu, SIGNAL("showAboutApplication()"), - this, SLOT("myDialogSlot()")); + connect( helpMenu, TQ_SIGNAL("showAboutApplication()"), + this, TQ_SLOT("myDialogSlot()")); .. } void MyClass.myDialogSlot() @@ -67,7 +67,7 @@ import org.trinitydesktop.qt.TQObject; { KHelpMenu helpMenu = new KHelpMenu( this ); TDEPopupMenu help = mHelpMenu.menu(); - help.connectItem( KHelpMenu.menuAboutApp, this, SLOT("myDialogSlot()") ); + help.connectItem( KHelpMenu.menuAboutApp, this, TQ_SLOT("myDialogSlot()") ); } void MyClass.myDialogSlot() { diff --git a/tdejava/koala/org/trinitydesktop/koala/KHistoryCombo.java b/tdejava/koala/org/trinitydesktop/koala/KHistoryCombo.java index 78507d44..08240f43 100644 --- a/tdejava/koala/org/trinitydesktop/koala/KHistoryCombo.java +++ b/tdejava/koala/org/trinitydesktop/koala/KHistoryCombo.java @@ -39,8 +39,8 @@ public class KHistoryCombo extends KComboBox { yourself via the slot addToHistory. If you want every item added, use <pre> - connect( combo, SIGNAL("activated( String )"), - combo, SLOT("addToHistory( String )")); + connect( combo, TQ_SIGNAL("activated( String )"), + combo, TQ_SLOT("addToHistory( String )")); </pre> Use TQComboBox.setMaxCount() to limit the history. <code>parent</code> the parent object of this widget. diff --git a/tdejava/koala/org/trinitydesktop/koala/KLineEdit.java b/tdejava/koala/org/trinitydesktop/koala/KLineEdit.java index 1b9bdf95..20ebe775 100644 --- a/tdejava/koala/org/trinitydesktop/koala/KLineEdit.java +++ b/tdejava/koala/org/trinitydesktop/koala/KLineEdit.java @@ -68,7 +68,7 @@ import org.trinitydesktop.qt.TQLineEdit; KLineEdit edit = new KLineEdit( this, "mywidget" ); TDECompletion comp = edit.completionObject(); // Connect to the return pressed signal - optional - connect(edit,SIGNAL("returnPressed(String)"),comp,SLOT("addItem(String)")); + connect(edit,TQ_SIGNAL("returnPressed(String)"),comp,TQ_SLOT("addItem(String)")); </pre> To use a customized completion objects or your own completion object : @@ -77,7 +77,7 @@ import org.trinitydesktop.qt.TQLineEdit; KURLCompletion comp = new KURLCompletion(); edit.setCompletionObject( comp ); // Connect to the return pressed signal - optional - connect(edit,SIGNAL("returnPressed(String)"),comp,SLOT("addItem(String)")); + connect(edit,TQ_SIGNAL("returnPressed(String)"),comp,TQ_SLOT("addItem(String)")); </pre> Note if you specify your own completion object you have to either delete it when you don't need it anymore, or you can tell KLineEdit to delete it diff --git a/tdejava/koala/org/trinitydesktop/koala/KMdiChildView.java b/tdejava/koala/org/trinitydesktop/koala/KMdiChildView.java index 82a1b005..b13a9669 100644 --- a/tdejava/koala/org/trinitydesktop/koala/KMdiChildView.java +++ b/tdejava/koala/org/trinitydesktop/koala/KMdiChildView.java @@ -60,7 +60,7 @@ import org.trinitydesktop.qt.TQWidget; flags = KMdi.Hide; } // set the accelerators for Toplevel MDI mode (each toplevel window needs its own accels - connect( m_pParent, SIGNAL("childViewIsDetachedNow(TQWidget)"), this, SLOT("initKeyAccel(TQWidget)") ); + connect( m_pParent, TQ_SIGNAL("childViewIsDetachedNow(TQWidget)"), this, TQ_SLOT("initKeyAccel(TQWidget)") ); m_pParent.addWindow( pMDICover, flags); // correct the default settings of KMdi ('cause we haven't a tab order for subwidget focuses) pMDICover.setFirstFocusableChildWidget(null); diff --git a/tdejava/koala/org/trinitydesktop/koala/KRegExpEditorInterface.java b/tdejava/koala/org/trinitydesktop/koala/KRegExpEditorInterface.java index 6fcb3b90..be9bfdb6 100644 --- a/tdejava/koala/org/trinitydesktop/koala/KRegExpEditorInterface.java +++ b/tdejava/koala/org/trinitydesktop/koala/KRegExpEditorInterface.java @@ -33,7 +33,7 @@ import org.trinitydesktop.qt.QtSupport; </pre> Note: signals and slots must be connected to the editorDialog object, not to the editor object: <pre> - connect( editorDialog, SIGNAL("canUndo( boolean )"), undoBut, SLOT("setEnabled( boolean )") ); + connect( editorDialog, TQ_SIGNAL("canUndo( boolean )"), undoBut, TQ_SLOT("setEnabled( boolean )") ); </pre> If you want to create an instance of the editor widget, i.e. not the dialog, then you must do it in the following way: diff --git a/tdejava/koala/org/trinitydesktop/koala/KReplace.java b/tdejava/koala/org/trinitydesktop/koala/KReplace.java index 8494d57e..bce94d7c 100644 --- a/tdejava/koala/org/trinitydesktop/koala/KReplace.java +++ b/tdejava/koala/org/trinitydesktop/koala/KReplace.java @@ -22,14 +22,14 @@ import org.trinitydesktop.qt.TQWidget; m_replace = new KReplace(pattern, replacement, options, this); // Connect signals to code which handles highlighting // of found text, and on-the-fly replacement. - connect( m_replace, SIGNAL("highlight( String, int, int )"), - this, SLOT("slotHighlight( String, int, int )") ); + connect( m_replace, TQ_SIGNAL("highlight( String, int, int )"), + this, TQ_SLOT("slotHighlight( String, int, int )") ); // Connect findNext signal - called when pressing the button in the dialog - connect( m_replace, SIGNAL("findNext()"), - this, SLOT("slotReplaceNext()") ); + connect( m_replace, TQ_SIGNAL("findNext()"), + this, TQ_SLOT("slotReplaceNext()") ); // Connect replace signal - called when doing a replacement - connect( m_replace, SIGNAL("replace(String, int, int, int)"), - this, SLOT("slotReplace(String, int, int, int)") ); + connect( m_replace, TQ_SIGNAL("replace(String, int, int, int)"), + this, TQ_SLOT("slotReplace(String, int, int, int)") ); </pre> Then initialize the variables determining the "current position" (to the cursor, if the option FromCursor is set, diff --git a/tdejava/koala/org/trinitydesktop/koala/KScanDialog.java b/tdejava/koala/org/trinitydesktop/koala/KScanDialog.java index 3ef8525d..88683ccc 100644 --- a/tdejava/koala/org/trinitydesktop/koala/KScanDialog.java +++ b/tdejava/koala/org/trinitydesktop/koala/KScanDialog.java @@ -21,8 +21,8 @@ import org.trinitydesktop.qt.TQWidget; m_scanDialog = KScanDialog.getScanDialog( this, "scandialog" ); if ( !m_scanDialog ) // no scanning support installed? return; - connect( m_scanDialog, SIGNAL("finalImage( TQImage, int )"), - SLOT("slotScanned( TQImage, int )")); + connect( m_scanDialog, TQ_SIGNAL("finalImage( TQImage, int )"), + TQ_SLOT("slotScanned( TQImage, int )")); } if ( m_scanDialog.setup() ) // only if scanner configured/available m_scanDialog.show(); diff --git a/tdejava/koala/org/trinitydesktop/koala/KStdAction.java b/tdejava/koala/org/trinitydesktop/koala/KStdAction.java index da3d582f..8a2085f8 100644 --- a/tdejava/koala/org/trinitydesktop/koala/KStdAction.java +++ b/tdejava/koala/org/trinitydesktop/koala/KStdAction.java @@ -22,11 +22,11 @@ import org.trinitydesktop.qt.TQWidget; <pre> TDEAction newAct = new TDEAction(i18n("&New"), TQIconSet(BarIcon("filenew")), TDEStdAccel.shortcut(TDEStdAccel.New), this, - SLOT("fileNew()"), actionCollection()); + TQ_SLOT("fileNew()"), actionCollection()); </pre> You could drop that and replace it with: <pre> - TDEAction newAct = KStdAction.openNew(this, SLOT("fileNew()"), + TDEAction newAct = KStdAction.openNew(this, TQ_SLOT("fileNew()"), actionCollection()); </pre> <li><b>Non-standard Usages</b></li> @@ -47,7 +47,7 @@ import org.trinitydesktop.qt.TQWidget; However, you can change the internal name. In this example, just do something like: <pre> - KStdAction.cut(this, SLOT("editCut()"), actionCollection(), "my_cut"); + KStdAction.cut(this, TQ_SLOT("editCut()"), actionCollection(), "my_cut"); </pre> Now, in your local XML resource file (e.g., yourappui.rc), simply put 'my_cut' where you want it to go. @@ -61,13 +61,13 @@ import org.trinitydesktop.qt.TQWidget; </pre> Another non-standard usage concerns instantiating the action in the first place. Usually, you would use the member functions as - shown above (e.g., KStdAction.cut(this, SLOT, parent)). You + shown above (e.g., KStdAction.cut(this, TQ_SLOT, parent)). You may, however, do this using the enums provided. This author can't think of a reason why you would want to, but, hey, if you do, here's how: <pre> - KStdAction.action(KStdAction.New, this, SLOT("fileNew()"), actionCollection()); - KStdAction.action(KStdAction.Cut, this, SLOT("editCut()"), actionCollection()); + KStdAction.action(KStdAction.New, this, TQ_SLOT("fileNew()"), actionCollection()); + KStdAction.action(KStdAction.Cut, this, TQ_SLOT("editCut()"), actionCollection()); </pre> @author Kurt Granroth <granroth@kde.org> @@ -179,7 +179,7 @@ public class KStdAction { Open a recently used document. The signature of the slot being called is of the form slotURLSelected( KURL ). @param recvr object to receive slot - @param slot The SLOT to invoke when a URL is selected. The slot's + @param slot The slot to invoke when a URL is selected. The slot's signature is slotURLSelected( KURL ). @param parent parent widget @param name name of widget @@ -476,7 +476,7 @@ public class KStdAction { /** Display the configure key bindings dialog. Note that you might be able to use the pre-built KXMLGUIFactory's fuction: - KStdAction.keyBindings(guiFactory(), SLOT("configureShortcuts()"), actionCollection()); + KStdAction.keyBindings(guiFactory(), TQ_SLOT("configureShortcuts()"), actionCollection()); @short Display the configure key bindings dialog. */ public static native TDEAction keyBindings(TQObject recvr, String slot, TDEActionCollection parent, String name); diff --git a/tdejava/koala/org/trinitydesktop/koala/KURLLabel.java b/tdejava/koala/org/trinitydesktop/koala/KURLLabel.java index acba0f8d..2e54b39e 100644 --- a/tdejava/koala/org/trinitydesktop/koala/KURLLabel.java +++ b/tdejava/koala/org/trinitydesktop/koala/KURLLabel.java @@ -27,8 +27,8 @@ import org.trinitydesktop.qt.TQLabel; KURLLabel address = new KURLLabel(this); address.setText("My homepage"); address.setURL("http://www.home.com/~me"); - connect(address, SIGNAL("leftClickedURL(String)"), - SLOT("processMyURL(String)")); + connect(address, TQ_SIGNAL("leftClickedURL(String)"), + TQ_SLOT("processMyURL(String)")); </pre> In this example, the text "My homepage" would be displayed as blue, underlined text. When the mouse passed over it, diff --git a/tdejava/koala/org/trinitydesktop/koala/KXMLGUIFactory.java b/tdejava/koala/org/trinitydesktop/koala/KXMLGUIFactory.java index 153ae1db..1551fd6a 100644 --- a/tdejava/koala/org/trinitydesktop/koala/KXMLGUIFactory.java +++ b/tdejava/koala/org/trinitydesktop/koala/KXMLGUIFactory.java @@ -127,7 +127,7 @@ public class KXMLGUIFactory extends TQObject { This slot can be connected dirrectly to the action to configure shortcuts. This is very simple to do that by adding a single line <pre> - KStdAction.keyBindings( guiFactory(), SLOT("configureShortcuts()"), actionCollection() ); + KStdAction.keyBindings( guiFactory(), TQ_SLOT("configureShortcuts()"), actionCollection() ); </pre> @param bAllowLetterShortcuts Set to false if unmodified alphanumeric keys ('A', '1', etc.) are not permissible shortcuts. diff --git a/tdejava/koala/org/trinitydesktop/koala/TDEAccel.java b/tdejava/koala/org/trinitydesktop/koala/TDEAccel.java index 9bb4a0a7..f217325f 100644 --- a/tdejava/koala/org/trinitydesktop/koala/TDEAccel.java +++ b/tdejava/koala/org/trinitydesktop/koala/TDEAccel.java @@ -42,9 +42,9 @@ import org.trinitydesktop.qt.TQAccel; // Insert an action "Scroll Up" which is associated with the "Up" key: pAccel.insert( "Scroll Up", i18n("Scroll up"), i18n("Scroll up the current document by one line."), - Qt.Key_Up, this, SLOT("slotScrollUp()") ); + Qt.Key_Up, this, TQ_SLOT("slotScrollUp()") ); // Insert an standard acclerator action. - pAccel.insert( TDEStdAccel.Print, this, SLOT("slotPrint()") ); + pAccel.insert( TDEStdAccel.Print, this, TQ_SLOT("slotPrint()") ); // Update the shortcuts by read any user-defined settings from the // application's config file. pAccel.readSettings(); @@ -134,7 +134,7 @@ public class TDEAccel extends TQAccel { insert( "Do Something", i18n("Do Something"), i18n("This action allows you to do something really great with this program to " "the currently open document."), - ALT+Key_D, this, SLOT("slotDoSomething()") ); + ALT+Key_D, this, TQ_SLOT("slotDoSomething()") ); </pre> @param sAction The internal name of the action. @param sLabel An i18n'ized short description of the action displayed when @@ -164,7 +164,7 @@ public class TDEAccel extends TQAccel { of the action as for the user-visible label. Usage: <pre> - insert( i18n("Do Something"), ALT+Key_D, this, SLOT("slotDoSomething()") ); + insert( i18n("Do Something"), ALT+Key_D, this, TQ_SLOT("slotDoSomething()") ); </pre> @param psAction The name AND label of the action. @param cutDef The default shortcut for this action. diff --git a/tdejava/koala/org/trinitydesktop/koala/TDEAction.java b/tdejava/koala/org/trinitydesktop/koala/TDEAction.java index 3e6abfc2..1120265e 100644 --- a/tdejava/koala/org/trinitydesktop/koala/TDEAction.java +++ b/tdejava/koala/org/trinitydesktop/koala/TDEAction.java @@ -56,11 +56,11 @@ import org.trinitydesktop.qt.TQObject; TQSignalMapper . A tiny example: <pre> TQSignalMapper desktopNumberMapper = new TQSignalMapper( this ); - connect( desktopNumberMapper, SIGNAL("mapped( int )"), - this, SLOT("moveWindowToDesktop( int )") ); + connect( desktopNumberMapper, TQ_SIGNAL("mapped( int )"), + this, TQ_SLOT("moveWindowToDesktop( int )") ); for ( uint i = 0; i < numberOfDesktops; ++i ) { TDEAction desktopAction = new TDEAction( i18n( "Move Window to Desktop %i" ).arg( i ), ... ); - connect( desktopAction, SIGNAL("activated()"), desktopNumberMapper, SLOT("map()") ); + connect( desktopAction, TQ_SIGNAL("activated()"), desktopNumberMapper, TQ_SLOT("map()") ); desktopNumberMapper.setMapping( desktopAction, i ); } </pre> @@ -85,7 +85,7 @@ import org.trinitydesktop.qt.TQObject; <pre> TDEAction newAct = new TDEAction(i18n("&New"), "filenew", TDEStdAccel.shortcut(TDEStdAccel.New), - this, SLOT("fileNew()"), + this, TQ_SLOT("fileNew()"), actionCollection(), "new"); </pre> This line creates our action. It says that wherever this action is @@ -157,7 +157,7 @@ public class TDEAction extends TQObject { public native String className(); /** Constructs an action with text, potential keyboard - shortcut, and a SLOT to call when this action is invoked by + shortcut, and a slot to call when this action is invoked by the user. If you do not want or have a keyboard shortcut, set the <code>cut</code> param to 0. @@ -167,11 +167,11 @@ public class TDEAction extends TQObject { plugged in a toolbar...). @param text The text that will be displayed. @param cut The corresponding keyboard shortcut. - @param receiver The SLOT's parent. - @param slot The SLOT to invoke to execute this action. + @param receiver The slot's parent. + @param slot The slot to invoke to execute this action. @param parent This action's parent. @param name An internal name for this action. - @short Constructs an action with text, potential keyboard shortcut, and a SLOT to call when this action is invoked by the user. + @short Constructs an action with text, potential keyboard shortcut, and a slot to call when this action is invoked by the user. */ public TDEAction(String text, TDEShortcut cut, TQObject receiver, String slot, TDEActionCollection parent, String name) { super((Class) null); @@ -180,7 +180,7 @@ public class TDEAction extends TQObject { private native void newTDEAction(String text, TDEShortcut cut, TQObject receiver, String slot, TDEActionCollection parent, String name); /** Constructs an action with text, icon, potential keyboard - shortcut, and a SLOT to call when this action is invoked by + shortcut, and a slot to call when this action is invoked by the user. If you do not want or have a keyboard shortcut, set the <code>cut</code> param to 0. @@ -189,11 +189,11 @@ public class TDEAction extends TQObject { @param text The text that will be displayed. @param pix The icon to display. @param cut The corresponding keyboard shortcut. - @param receiver The SLOT's parent. - @param slot The SLOT to invoke to execute this action. + @param receiver The slot's parent. + @param slot The slot to invoke to execute this action. @param parent This action's parent. @param name An internal name for this action. - @short Constructs an action with text, icon, potential keyboard shortcut, and a SLOT to call when this action is invoked by the user. + @short Constructs an action with text, icon, potential keyboard shortcut, and a slot to call when this action is invoked by the user. */ public TDEAction(String text, TQIconSet pix, TDEShortcut cut, TQObject receiver, String slot, TDEActionCollection parent, String name) { super((Class) null); @@ -202,7 +202,7 @@ public class TDEAction extends TQObject { private native void newTDEAction(String text, TQIconSet pix, TDEShortcut cut, TQObject receiver, String slot, TDEActionCollection parent, String name); /** Constructs an action with text, icon, potential keyboard - shortcut, and a SLOT to call when this action is invoked by + shortcut, and a slot to call when this action is invoked by the user. The icon is loaded on demand later based on where it is plugged in. If you do not want or have a keyboard shortcut, set the @@ -212,11 +212,11 @@ public class TDEAction extends TQObject { @param text The text that will be displayed. @param pix The icon to display. @param cut The corresponding keyboard shortcut (shortcut). - @param receiver The SLOT's parent. - @param slot The SLOT to invoke to execute this action. + @param receiver The slot's parent. + @param slot The slot to invoke to execute this action. @param parent This action's parent. @param name An internal name for this action. - @short Constructs an action with text, icon, potential keyboard shortcut, and a SLOT to call when this action is invoked by the user. + @short Constructs an action with text, icon, potential keyboard shortcut, and a slot to call when this action is invoked by the user. */ public TDEAction(String text, String pix, TDEShortcut cut, TQObject receiver, String slot, TDEActionCollection parent, String name) { super((Class) null); @@ -228,8 +228,8 @@ public class TDEAction extends TQObject { the text and icon. @param item The KGuiItem with the label and (optional) icon. @param cut The corresponding keyboard shortcut (shortcut). - @param receiver The SLOT's parent. - @param slot The SLOT to invoke to execute this action. + @param receiver The slot's parent. + @param slot The slot to invoke to execute this action. @param parent This action's parent. @param name An internal name for this action. @short The same as the above constructor, but with a KGuiItem providing the text and icon. diff --git a/tdejava/koala/org/trinitydesktop/koala/TDEActionCollection.java b/tdejava/koala/org/trinitydesktop/koala/TDEActionCollection.java index 0b80feb1..e8ac3cc1 100644 --- a/tdejava/koala/org/trinitydesktop/koala/TDEActionCollection.java +++ b/tdejava/koala/org/trinitydesktop/koala/TDEActionCollection.java @@ -19,10 +19,10 @@ import org.trinitydesktop.qt.TQObject; a statusbar, do: <pre> actionCollection().setHighlightingEnabled(true); - connect(actionCollection(), SIGNAL("actionStatusText( String )"), - statusBar(), SLOT("message( String )") ); - connect(actionCollection(), SIGNAL("clearStatusText()"), - statusBar(), SLOT("clear()") ); + connect(actionCollection(), TQ_SIGNAL("actionStatusText( String )"), + statusBar(), TQ_SLOT("message( String )") ); + connect(actionCollection(), TQ_SIGNAL("clearStatusText()"), + statusBar(), TQ_SLOT("clear()") ); </pre> See {@link TDEActionCollectionSignals} for signals emitted by TDEActionCollection @short A managed set of TDEAction objects. diff --git a/tdejava/koala/org/trinitydesktop/koala/TDEApplication.java b/tdejava/koala/org/trinitydesktop/koala/TDEApplication.java index 786251b1..9a158da8 100644 --- a/tdejava/koala/org/trinitydesktop/koala/TDEApplication.java +++ b/tdejava/koala/org/trinitydesktop/koala/TDEApplication.java @@ -602,7 +602,7 @@ public class TDEApplication extends TQApplication implements TDEInstanceInterfac If the widget with focus provides a cut() slot, call that slot. Thus for a simple application cut can be implemented as: <pre> - KStdAction.cut( kapp, SLOT("cut()"), actionCollection() ); + KStdAction.cut( kapp, TQ_SLOT("cut()"), actionCollection() ); </pre> @short If the widget with focus provides a cut() slot, call that slot. */ @@ -611,7 +611,7 @@ public class TDEApplication extends TQApplication implements TDEInstanceInterfac If the widget with focus provides a copy() slot, call that slot. Thus for a simple application copy can be implemented as: <pre> - KStdAction.copy( kapp, SLOT("copy()"), actionCollection() ); + KStdAction.copy( kapp, TQ_SLOT("copy()"), actionCollection() ); </pre> @short If the widget with focus provides a copy() slot, call that slot. */ @@ -620,7 +620,7 @@ public class TDEApplication extends TQApplication implements TDEInstanceInterfac If the widget with focus provides a paste() slot, call that slot. Thus for a simple application copy can be implemented as: <pre> - KStdAction.paste( kapp, SLOT("paste()"), actionCollection() ); + KStdAction.paste( kapp, TQ_SLOT("paste()"), actionCollection() ); </pre> @short If the widget with focus provides a paste() slot, call that slot. */ @@ -629,7 +629,7 @@ public class TDEApplication extends TQApplication implements TDEInstanceInterfac If the widget with focus provides a clear() slot, call that slot. Thus for a simple application clear() can be implemented as: <pre> - new TDEAction( i18n( "Clear" ), "editclear", 0, kapp, SLOT("clear()"), actionCollection(), "clear" ); + new TDEAction( i18n( "Clear" ), "editclear", 0, kapp, TQ_SLOT("clear()"), actionCollection(), "clear" ); </pre> Note that for some widgets, this may not provide the intended bahavior. For example if you make use of the code above and a TDEListView has the focus, clear() @@ -651,7 +651,7 @@ public class TDEApplication extends TQApplication implements TDEInstanceInterfac If the widget with focus provides a selectAll() slot, call that slot. Thus for a simple application select all can be implemented as: <pre> - KStdAction.selectAll( kapp, SLOT("selectAll()"), actionCollection() ); + KStdAction.selectAll( kapp, TQ_SLOT("selectAll()"), actionCollection() ); </pre> @short If the widget with focus provides a selectAll() slot, call that slot. */ @@ -988,19 +988,19 @@ public class TDEApplication extends TQApplication implements TDEInstanceInterfac /** This method is used internally to determine which edit slots are implemented by the widget that has the focus, and to invoke those slots if available. - @param slot is the slot as returned using the SLOT() macro, for example SLOT("cut()") + @param slot is the slot as returned using the TQ_SLOT() macro, for example TQ_SLOT("cut()") This method can be used in TDEApplication subclasses to implement application wide edit actions not supported by the TDEApplication class. For example (in your subclass): <pre> void MyApplication.deselect() { - invokeEditSlot( SLOT("deselect()") ); + invokeEditSlot( TQ_SLOT("deselect()") ); } </pre> Now in your application calls to MyApplication.deselect() will call this slot on the focused widget if it provides this slot. You can combine this with TDEAction with: <pre> - KStdAction.deselect( (MyApplication)( kapp ), SLOT("cut()"), actionCollection() ); + KStdAction.deselect( (MyApplication)( kapp ), TQ_SLOT("cut()"), actionCollection() ); </pre> @short This method is used internally to determine which edit slots are implemented by the widget that has the focus, and to invoke those slots if available. @see #cut diff --git a/tdejava/koala/org/trinitydesktop/koala/TDEGlobalAccel.java b/tdejava/koala/org/trinitydesktop/koala/TDEGlobalAccel.java index 0ae7a2d0..25823377 100644 --- a/tdejava/koala/org/trinitydesktop/koala/TDEGlobalAccel.java +++ b/tdejava/koala/org/trinitydesktop/koala/TDEGlobalAccel.java @@ -54,7 +54,7 @@ public class TDEGlobalAccel extends TQObject { insert( "Do Something", i18n("Do Something"), i18n("This action allows you to do something really great with this program to " "the currently open document."), - ALT+CTRL+Key_Q, KKey.QtWIN+CTRL+Key_Q, this, SLOT("slotDoSomething()") ); + ALT+CTRL+Key_Q, KKey.QtWIN+CTRL+Key_Q, this, TQ_SLOT("slotDoSomething()") ); </pre> @param sAction The internal name of the action. @param sLabel An i18n'ized short description of the action displayed when diff --git a/tdejava/koala/org/trinitydesktop/koala/TDEListAction.java b/tdejava/koala/org/trinitydesktop/koala/TDEListAction.java index f79e8a67..d74a7fe4 100644 --- a/tdejava/koala/org/trinitydesktop/koala/TDEListAction.java +++ b/tdejava/koala/org/trinitydesktop/koala/TDEListAction.java @@ -49,8 +49,8 @@ public class TDEListAction extends TDESelectAction { /** @param text The text that will be displayed. @param cut The corresponding keyboard accelerator (shortcut). - @param receiver The SLOT's parent. - @param slot The SLOT to invoke to execute this action. + @param receiver The slot's parent. + @param slot The slot to invoke to execute this action. @param parent This action's parent. @param name An internal name for this action. @short @@ -125,8 +125,8 @@ public class TDEListAction extends TDESelectAction { @param text The text that will be displayed. @param pix The icons that go with this action. @param cut The corresponding keyboard accelerator (shortcut). - @param receiver The SLOT's parent. - @param slot The SLOT to invoke to execute this action. + @param receiver The slot's parent. + @param slot The slot to invoke to execute this action. @param parent This action's parent. @param name An internal name for this action. @short @@ -145,8 +145,8 @@ public class TDEListAction extends TDESelectAction { @param text The text that will be displayed. @param pix The dynamically loaded icon that goes with this action. @param cut The corresponding keyboard accelerator (shortcut). - @param receiver The SLOT's parent. - @param slot The SLOT to invoke to execute this action. + @param receiver The slot's parent. + @param slot The slot to invoke to execute this action. @param parent This action's parent. @param name An internal name for this action. @short diff --git a/tdejava/koala/org/trinitydesktop/koala/TDEMainWindow.java b/tdejava/koala/org/trinitydesktop/koala/TDEMainWindow.java index 405621c9..2e2dc69a 100644 --- a/tdejava/koala/org/trinitydesktop/koala/TDEMainWindow.java +++ b/tdejava/koala/org/trinitydesktop/koala/TDEMainWindow.java @@ -405,8 +405,8 @@ public class TDEMainWindow extends TQMainWindow implements KXMLGUIBuilderInterfa this function) a connection needs to be made to let TDEMainWindow know when that status (hidden/shown) of the statusbar has changed. For example: - connect(action, SIGNAL("activated()"), - tdemainwindow, SLOT("setSettingsDirty()")); + connect(action, TQ_SIGNAL("activated()"), + tdemainwindow, TQ_SLOT("setSettingsDirty()")); Otherwise the status (hidden/show) of the statusbar might not be saved by TDEMainWindow. @short Sets whether TDEMainWindow should provide a menu that allows showing/hiding of the statusbar ( using TDEToggleStatusBarAction ). @@ -470,7 +470,7 @@ public class TDEMainWindow extends TQMainWindow implements KXMLGUIBuilderInterfa This slot can be connected dirrectly to the action to configure shortcuts. This is very simple to do that by adding a single line <pre> - KStdAction.configureToolbars( guiFactory(), SLOT("configureToolbars()"), + KStdAction.configureToolbars( guiFactory(), TQ_SLOT("configureToolbars()"), actionCollection() ); </pre> @short Show a standard configure toolbar dialog. @@ -513,8 +513,8 @@ public class TDEMainWindow extends TQMainWindow implements KXMLGUIBuilderInterfa <pre> TDEIconLoader &loader = TDEGlobal.iconLoader(); TQPixmap pixmap = loader.loadIcon( "help" ); - toolBar(0).insertButton( pixmap, 0, SIGNAL("clicked()"), - this, SLOT("appHelpActivated()"), true, i18n("Help") ); + toolBar(0).insertButton( pixmap, 0, TQ_SIGNAL("clicked()"), + this, TQ_SLOT("appHelpActivated()"), true, i18n("Help") ); </pre> @short Open the help page for the application. */ diff --git a/tdejava/koala/org/trinitydesktop/koala/TDEPasteTextAction.java b/tdejava/koala/org/trinitydesktop/koala/TDEPasteTextAction.java index 8cab5d46..92477a98 100644 --- a/tdejava/koala/org/trinitydesktop/koala/TDEPasteTextAction.java +++ b/tdejava/koala/org/trinitydesktop/koala/TDEPasteTextAction.java @@ -30,8 +30,8 @@ public class TDEPasteTextAction extends TDEAction { @param text The text that will be displayed. @param icon The icon to display. @param cut The corresponding keyboard accelerator (shortcut). - @param receiver The SLOT's owner. - @param slot The SLOT to invoke to execute this action. + @param receiver The slot's owner. + @param slot The slot to invoke to execute this action. @param parent This action's parent. @param name An internal name for this action. @short Create a TDEPasteTextAction, with a text, an icon, an accelerator, a slot connected to the action, parent and name. diff --git a/tdejava/koala/org/trinitydesktop/koala/TDEProcess.java b/tdejava/koala/org/trinitydesktop/koala/TDEProcess.java index 64299b40..b2acf209 100644 --- a/tdejava/koala/org/trinitydesktop/koala/TDEProcess.java +++ b/tdejava/koala/org/trinitydesktop/koala/TDEProcess.java @@ -61,8 +61,8 @@ import org.trinitydesktop.qt.TQObject; TDEProcess proc = new TDEProcess; proc << "my_executable"; proc << "These" << "are" << "the" << "command" << "line" << "args"; - TQApplication.connect(proc, SIGNAL("processExited(TDEProcess )"), - pointer_to_my_object, SLOT("my_objects_slot(TDEProcess )")); + TQApplication.connect(proc, TQ_SIGNAL("processExited(TDEProcess )"), + pointer_to_my_object, TQ_SLOT("my_objects_slot(TDEProcess )")); proc.start(); </pre> This will start "my_executable" with the commandline arguments "These"... diff --git a/tdejava/koala/org/trinitydesktop/koala/TDERadioAction.java b/tdejava/koala/org/trinitydesktop/koala/TDERadioAction.java index 62972c44..e01bd06b 100644 --- a/tdejava/koala/org/trinitydesktop/koala/TDERadioAction.java +++ b/tdejava/koala/org/trinitydesktop/koala/TDERadioAction.java @@ -51,8 +51,8 @@ public class TDERadioAction extends TDEToggleAction { /** @param text The text that will be displayed. @param cut The corresponding keyboard accelerator (shortcut). - @param receiver The SLOT's parent. - @param slot The SLOT to invoke to execute this action. + @param receiver The slot's parent. + @param slot The slot to invoke to execute this action. @param parent This action's parent. @param name An internal name for this action. @short @@ -127,8 +127,8 @@ public class TDERadioAction extends TDEToggleAction { @param text The text that will be displayed. @param pix The icons that go with this action. @param cut The corresponding keyboard accelerator (shortcut). - @param receiver The SLOT's parent. - @param slot The SLOT to invoke to execute this action. + @param receiver The slot's parent. + @param slot The slot to invoke to execute this action. @param parent This action's parent. @param name An internal name for this action. @short @@ -147,8 +147,8 @@ public class TDERadioAction extends TDEToggleAction { @param text The text that will be displayed. @param pix The dynamically loaded icon that goes with this action. @param cut The corresponding keyboard accelerator (shortcut). - @param receiver The SLOT's parent. - @param slot The SLOT to invoke to execute this action. + @param receiver The slot's parent. + @param slot The slot to invoke to execute this action. @param parent This action's parent. @param name An internal name for this action. @short diff --git a/tdejava/koala/org/trinitydesktop/koala/TDERecentFilesAction.java b/tdejava/koala/org/trinitydesktop/koala/TDERecentFilesAction.java index 973b9a78..12a661d0 100644 --- a/tdejava/koala/org/trinitydesktop/koala/TDERecentFilesAction.java +++ b/tdejava/koala/org/trinitydesktop/koala/TDERecentFilesAction.java @@ -50,8 +50,8 @@ public class TDERecentFilesAction extends TDEListAction { /** @param text The text that will be displayed. @param cut The corresponding keyboard accelerator (shortcut). - @param receiver The SLOT's parent. - @param slot The SLOT to invoke when a URL is selected. + @param receiver The slot's parent. + @param slot The slot to invoke when a URL is selected. Its signature is of the form slotURLSelected( KURL ). @param parent This action's parent. @param name An internal name for this action. @@ -125,8 +125,8 @@ public class TDERecentFilesAction extends TDEListAction { @param text The text that will be displayed. @param pix The icons that go with this action. @param cut The corresponding keyboard accelerator (shortcut). - @param receiver The SLOT's parent. - @param slot The SLOT to invoke when a URL is selected. + @param receiver The slot's parent. + @param slot The slot to invoke when a URL is selected. Its signature is of the form slotURLSelected( KURL ). @param parent This action's parent. @param name An internal name for this action. @@ -152,8 +152,8 @@ public class TDERecentFilesAction extends TDEListAction { @param text The text that will be displayed. @param pix The dynamically loaded icon that goes with this action. @param cut The corresponding keyboard accelerator (shortcut). - @param receiver The SLOT's parent. - @param slot The SLOT to invoke when a URL is selected. + @param receiver The slot's parent. + @param slot The slot to invoke when a URL is selected. Its signature is of the form slotURLSelected( KURL ). @param parent This action's parent. @param name An internal name for this action. diff --git a/tdejava/koala/org/trinitydesktop/koala/TDESelectAction.java b/tdejava/koala/org/trinitydesktop/koala/TDESelectAction.java index 4f29869c..bdf93d4f 100644 --- a/tdejava/koala/org/trinitydesktop/koala/TDESelectAction.java +++ b/tdejava/koala/org/trinitydesktop/koala/TDESelectAction.java @@ -59,8 +59,8 @@ public class TDESelectAction extends TDEAction { /** @param text The text that will be displayed. @param cut The corresponding keyboard accelerator (shortcut). - @param receiver The SLOT's parent. - @param slot The SLOT to invoke to execute this action. + @param receiver The slot's parent. + @param slot The slot to invoke to execute this action. @param parent This action's parent. @param name An internal name for this action. @short @@ -135,8 +135,8 @@ public class TDESelectAction extends TDEAction { @param text The text that will be displayed. @param pix The icons that go with this action. @param cut The corresponding keyboard accelerator (shortcut). - @param receiver The SLOT's parent. - @param slot The SLOT to invoke to execute this action. + @param receiver The slot's parent. + @param slot The slot to invoke to execute this action. @param parent This action's parent. @param name An internal name for this action. @short @@ -155,8 +155,8 @@ public class TDESelectAction extends TDEAction { @param text The text that will be displayed. @param pix The dynamically loaded icon that goes with this action. @param cut The corresponding keyboard accelerator (shortcut). - @param receiver The SLOT's parent. - @param slot The SLOT to invoke to execute this action. + @param receiver The slot's parent. + @param slot The slot to invoke to execute this action. @param parent This action's parent. @param name An internal name for this action. @short diff --git a/tdejava/koala/org/trinitydesktop/koala/TDEShortcut.java b/tdejava/koala/org/trinitydesktop/koala/TDEShortcut.java index 9ed6a020..82a5a8e5 100644 --- a/tdejava/koala/org/trinitydesktop/koala/TDEShortcut.java +++ b/tdejava/koala/org/trinitydesktop/koala/TDEShortcut.java @@ -15,7 +15,7 @@ import org.trinitydesktop.qt.QtSupport; This can be used to add additional accelerators to a TDEAction. For example, the below code binds the escape key to the close action. <pre> - TDEAction closeAction = KStdAction.close( this, SLOT("close()"), actionCollection() ); + TDEAction closeAction = KStdAction.close( this, TQ_SLOT("close()"), actionCollection() ); TDEShortcut closeShortcut = closeAction.shortcut(); closeShortcut.append( KKey(Key_Escape)); closeAction.setShortcut(closeShortcut); diff --git a/tdejava/koala/org/trinitydesktop/koala/TDEStandardDirs.java b/tdejava/koala/org/trinitydesktop/koala/TDEStandardDirs.java index 5d46ba2a..2885e1f2 100644 --- a/tdejava/koala/org/trinitydesktop/koala/TDEStandardDirs.java +++ b/tdejava/koala/org/trinitydesktop/koala/TDEStandardDirs.java @@ -86,7 +86,7 @@ import java.util.ArrayList; </li> <li> - qtplugins - Qt plugins (dynamically loaded objects for Qt) + tqtplugins - TQt plugins (dynamically loaded objects for TQt) </li> <li> diff --git a/tdejava/koala/org/trinitydesktop/koala/TDEToggleAction.java b/tdejava/koala/org/trinitydesktop/koala/TDEToggleAction.java index 241d4357..e698d422 100644 --- a/tdejava/koala/org/trinitydesktop/koala/TDEToggleAction.java +++ b/tdejava/koala/org/trinitydesktop/koala/TDEToggleAction.java @@ -53,8 +53,8 @@ public class TDEToggleAction extends TDEAction { /** @param text The text that will be displayed. @param cut The corresponding keyboard accelerator (shortcut). - @param receiver The SLOT's parent. - @param slot The SLOT to invoke to execute this action. + @param receiver The slot's parent. + @param slot The slot to invoke to execute this action. @param parent This action's parent. @param name An internal name for this action. @short @@ -129,8 +129,8 @@ public class TDEToggleAction extends TDEAction { @param text The text that will be displayed. @param pix The icons that go with this action. @param cut The corresponding keyboard accelerator (shortcut). - @param receiver The SLOT's parent. - @param slot The SLOT to invoke to execute this action. + @param receiver The slot's parent. + @param slot The slot to invoke to execute this action. @param parent This action's parent. @param name An internal name for this action. @short @@ -149,8 +149,8 @@ public class TDEToggleAction extends TDEAction { @param text The text that will be displayed. @param pix The dynamically loaded icon that goes with this action. @param cut The corresponding keyboard accelerator (shortcut). - @param receiver The SLOT's parent. - @param slot The SLOT to invoke to execute this action. + @param receiver The slot's parent. + @param slot The slot to invoke to execute this action. @param parent This action's parent. @param name An internal name for this action. @short diff --git a/tdejava/koala/org/trinitydesktop/koala/TDEToggleFullScreenAction.java b/tdejava/koala/org/trinitydesktop/koala/TDEToggleFullScreenAction.java index 91232c20..386b22ce 100644 --- a/tdejava/koala/org/trinitydesktop/koala/TDEToggleFullScreenAction.java +++ b/tdejava/koala/org/trinitydesktop/koala/TDEToggleFullScreenAction.java @@ -29,8 +29,8 @@ public class TDEToggleFullScreenAction extends TDEToggleAction { /** Create a TDEToggleFullScreenAction @param cut The corresponding keyboard accelerator (shortcut). - @param receiver The SLOT's parent. - @param slot The SLOT to invoke to execute this action. + @param receiver The slot's parent. + @param slot The slot to invoke to execute this action. @param parent This action's parent. @param window the window that will switch to/from full screen mode @param name An internal name for this action. diff --git a/tdejava/koala/org/trinitydesktop/koala/TDEToolBar.java b/tdejava/koala/org/trinitydesktop/koala/TDEToolBar.java index 2c1db2ad..684297ff 100644 --- a/tdejava/koala/org/trinitydesktop/koala/TDEToolBar.java +++ b/tdejava/koala/org/trinitydesktop/koala/TDEToolBar.java @@ -449,8 +449,8 @@ public class TDEToolBar extends TQToolBar { You will insert a normal button with connection (or use signals from toolbar): <pre> - bar.insertButton(icon, id, SIGNAL("clicked ()"), this, - SLOT (slotClick()), true, "click or wait for popup"); + bar.insertButton(icon, id, TQ_SIGNAL("clicked ()"), this, + TQ_SLOT (slotClick()), true, "click or wait for popup"); </pre> And then add a delayed popup: <pre> diff --git a/tdejava/koala/org/trinitydesktop/koala/TDEToolBarPopupAction.java b/tdejava/koala/org/trinitydesktop/koala/TDEToolBarPopupAction.java index b35991f9..2d0b5fa0 100644 --- a/tdejava/koala/org/trinitydesktop/koala/TDEToolBarPopupAction.java +++ b/tdejava/koala/org/trinitydesktop/koala/TDEToolBarPopupAction.java @@ -59,8 +59,8 @@ public class TDEToolBarPopupAction extends TDEAction { @param text The text that will be displayed. @param icon The icon to display. @param cut The corresponding keyboard accelerator (shortcut). - @param receiver The SLOT's owner. - @param slot The SLOT to invoke to execute this action. + @param receiver The slot's owner. + @param slot The slot to invoke to execute this action. @param parent This action's parent. @param name An internal name for this action. @short Create a TDEToolBarPopupAction, with a text, an icon, an accelerator, a slot connected to the action, parent and name. @@ -83,8 +83,8 @@ public class TDEToolBarPopupAction extends TDEAction { <code>cut</code> param to 0. @param item The text and icon that will be displayed. @param cut The corresponding keyboard accelerator (shortcut). - @param receiver The SLOT's owner. - @param slot The SLOT to invoke to execute this action. + @param receiver The slot's owner. + @param slot The slot to invoke to execute this action. @param parent This action's parent. @param name An internal name for this action. @short Create a TDEToolBarPopupAction, with a KGuiItem, an accelerator, a slot connected to the action, parent and name. diff --git a/tdejava/koala/tdejava/TDEJavaSlot.h b/tdejava/koala/tdejava/TDEJavaSlot.h index 7cd9f704..1d316eae 100644 --- a/tdejava/koala/tdejava/TDEJavaSlot.h +++ b/tdejava/koala/tdejava/TDEJavaSlot.h @@ -49,7 +49,7 @@ class TDEJavaSlotFactory; class TDEJavaSlot: public JavaSlot { - Q_OBJECT + TQ_OBJECT public: TDEJavaSlot(JNIEnv * env, jobject receiver, jstring slot); virtual ~TDEJavaSlot(); diff --git a/tdejava/koala/test/kbase/KBase.java b/tdejava/koala/test/kbase/KBase.java index e556adfc..af9e83e7 100644 --- a/tdejava/koala/test/kbase/KBase.java +++ b/tdejava/koala/test/kbase/KBase.java @@ -84,22 +84,22 @@ public KBase() /** initializes the TDEActions of the application */ protected void initActions() { - fileNewWindow = new TDEAction(tr("New &Window"), "", new TDEShortcut(), this, SLOT("slotFileNewWindow()"), actionCollection(),"file_new_window"); - fileNew = KStdAction.openNew(this, SLOT("slotFileNew()"), actionCollection()); - fileOpen = KStdAction.open(this, SLOT("slotFileOpen()"), actionCollection()); - fileOpenRecent = (TDERecentFilesAction) KStdAction.openRecent(this, SLOT("slotFileOpenRecent(KURL)"), actionCollection()); - fileSave = KStdAction.save(this, SLOT("slotFileSave()"), actionCollection()); - fileSaveAs = KStdAction.saveAs(this, SLOT("slotFileSaveAs()"), actionCollection()); + fileNewWindow = new TDEAction(tr("New &Window"), "", new TDEShortcut(), this, TQ_SLOT("slotFileNewWindow()"), actionCollection(),"file_new_window"); + fileNew = KStdAction.openNew(this, TQ_SLOT("slotFileNew()"), actionCollection()); + fileOpen = KStdAction.open(this, TQ_SLOT("slotFileOpen()"), actionCollection()); + fileOpenRecent = (TDERecentFilesAction) KStdAction.openRecent(this, TQ_SLOT("slotFileOpenRecent(KURL)"), actionCollection()); + fileSave = KStdAction.save(this, TQ_SLOT("slotFileSave()"), actionCollection()); + fileSaveAs = KStdAction.saveAs(this, TQ_SLOT("slotFileSaveAs()"), actionCollection()); // this one crashes for me... -// fileClose = KStdAction.close(this, SLOT(slotFileClose()), actionCollection()); - filePrint = KStdAction.print(this, SLOT("slotFilePrint()"), actionCollection()); - fileQuit = KStdAction.quit(this, SLOT("slotFileQuit()"), actionCollection()); - editCut = KStdAction.cut(this, SLOT("slotEditCut()"), actionCollection()); - editCopy = KStdAction.copy(this, SLOT("slotEditCopy()"), actionCollection()); - editPaste = KStdAction.paste(this, SLOT("slotEditPaste()"), actionCollection()); +// fileClose = KStdAction.close(this, TQ_SLOT(slotFileClose()), actionCollection()); + filePrint = KStdAction.print(this, TQ_SLOT("slotFilePrint()"), actionCollection()); + fileQuit = KStdAction.quit(this, TQ_SLOT("slotFileQuit()"), actionCollection()); + editCut = KStdAction.cut(this, TQ_SLOT("slotEditCut()"), actionCollection()); + editCopy = KStdAction.copy(this, TQ_SLOT("slotEditCopy()"), actionCollection()); + editPaste = KStdAction.paste(this, TQ_SLOT("slotEditPaste()"), actionCollection()); createStandardStatusBarAction(); -// viewToolBar = KStdAction.showToolbar(this, SLOT("slotViewToolBar()"), actionCollection()); - viewStatusBar = KStdAction.showStatusbar(this, SLOT("slotViewStatusBar()"), actionCollection()); +// viewToolBar = KStdAction.showToolbar(this, TQ_SLOT("slotViewToolBar()"), actionCollection()); + viewStatusBar = KStdAction.showStatusbar(this, TQ_SLOT("slotViewStatusBar()"), actionCollection()); fileNewWindow.setToolTip(tr("Opens a new application window")); fileNew.setToolTip(tr("Creates a new document")); diff --git a/tdejava/koala/test/kcombobox/KComboBoxTest.java b/tdejava/koala/test/kcombobox/KComboBoxTest.java index 7204b377..a37ddb23 100644 --- a/tdejava/koala/test/kcombobox/KComboBoxTest.java +++ b/tdejava/koala/test/kcombobox/KComboBoxTest.java @@ -93,7 +93,7 @@ import java.util.*; // Create an exit button TQPushButton push = new TQPushButton( "E&xit", w ); - TQObject.connect( push, Qt.SIGNAL("clicked()"), app, Qt.SLOT("closeAllWindows()" ) ); + TQObject.connect( push, Qt.TQ_SIGNAL("clicked()"), app, Qt.TQ_SLOT("closeAllWindows()" ) ); // Insert the widgets into the layout manager. vbox.addWidget( lblrw ); diff --git a/tdejava/koala/test/khelpers/KHelpers.java b/tdejava/koala/test/khelpers/KHelpers.java index fec92eb3..08444f49 100644 --- a/tdejava/koala/test/khelpers/KHelpers.java +++ b/tdejava/koala/test/khelpers/KHelpers.java @@ -41,9 +41,9 @@ public class KHelpers extends TDEMainWindow { idfilenew = file.insertItem("&New"); idfileopen = file.insertItem("&Open..."); idfilesave = file.insertItem("&Save"); - idfilequit = file.insertItem("&Quit", kapp, SLOT("closeAllWindows()")); + idfilequit = file.insertItem("&Quit", kapp, TQ_SLOT("closeAllWindows()")); - connect ( file, SIGNAL( "highlighted(int)"), this, SLOT( "slotMenuEntryHelp (int)")); + connect ( file, TQ_SIGNAL( "highlighted(int)"), this, TQ_SLOT( "slotMenuEntryHelp (int)")); menuBar().insertItem("&File",file); @@ -53,7 +53,7 @@ public class KHelpers extends TDEMainWindow { "that your application can provide help to a user"); help.insertSeparator(); - help.insertItem("Help on a special topic", this, SLOT("slotSpecialHelp()")); + help.insertItem("Help on a special topic", this, TQ_SLOT("slotSpecialHelp()")); menuBar().insertItem("&Help",help); diff --git a/tdejava/koala/test/kmenu/KdeMenuSample.java b/tdejava/koala/test/kmenu/KdeMenuSample.java index ccd46bf5..0db96fca 100644 --- a/tdejava/koala/test/kmenu/KdeMenuSample.java +++ b/tdejava/koala/test/kmenu/KdeMenuSample.java @@ -57,9 +57,9 @@ public class KdeMenuSample extends TDEMainWindow { */ private TQPopupMenu createFileMenu() { TQPopupMenu fileMenu = new TQPopupMenu(this); - fileMenu.insertItem("&Open",this,this.SLOT("fileOpen()")); - fileMenu.insertItem("&Save",this,this.SLOT("fileSave()")); - fileMenu.insertItem("&Quit",kApp,kApp.SLOT("quit()")); + fileMenu.insertItem("&Open",this,this.TQ_SLOT("fileOpen()")); + fileMenu.insertItem("&Save",this,this.TQ_SLOT("fileSave()")); + fileMenu.insertItem("&Quit",kApp,kApp.TQ_SLOT("quit()")); return fileMenu; } diff --git a/tdejava/koala/test/simplebrowser/KSimpleBrowser.java b/tdejava/koala/test/simplebrowser/KSimpleBrowser.java index 83964a0f..c798cd6d 100644 --- a/tdejava/koala/test/simplebrowser/KSimpleBrowser.java +++ b/tdejava/koala/test/simplebrowser/KSimpleBrowser.java @@ -29,8 +29,8 @@ public class KSimpleBrowser extends TDEMainWindow { super(null,name,0); - toolBar().insertLined( "", URLLined, SIGNAL("returnPressed()"), - this, SLOT ("slotNewURL()")); + toolBar().insertLined( "", URLLined, TQ_SIGNAL("returnPressed()"), + this, TQ_SLOT ("slotNewURL()")); toolBar().setItemAutoSized(URLLined); diff --git a/tdejava/koala/test/tdeioslave/KioslaveTest.java b/tdejava/koala/test/tdeioslave/KioslaveTest.java index 81a499c5..1fb97cf8 100644 --- a/tdejava/koala/test/tdeioslave/KioslaveTest.java +++ b/tdejava/koala/test/tdeioslave/KioslaveTest.java @@ -125,7 +125,7 @@ KioslaveTest( String src, String dest, int op, int pr ) // Operation groupbox & buttons opButtons = new TQButtonGroup( "Operation", main_widget ); topLayout.addWidget( opButtons, 10 ); - connect( opButtons, SIGNAL("clicked(int)"), SLOT("changeOperation(int)") ); + connect( opButtons, TQ_SIGNAL("clicked(int)"), TQ_SLOT("changeOperation(int)") ); TQBoxLayout hbLayout = new TQHBoxLayout( opButtons, 15 ); @@ -179,7 +179,7 @@ KioslaveTest( String src, String dest, int op, int pr ) // Progress groupbox & buttons progressButtons = new TQButtonGroup( "Progress dialog mode", main_widget ); topLayout.addWidget( progressButtons, 10 ); - connect( progressButtons, SIGNAL("clicked(int)"), SLOT("changeProgressMode(int)") ); + connect( progressButtons, TQ_SIGNAL("clicked(int)"), TQ_SLOT("changeProgressMode(int)") ); hbLayout = new TQHBoxLayout( progressButtons, 15 ); @@ -207,19 +207,19 @@ KioslaveTest( String src, String dest, int op, int pr ) pbStart = new TQPushButton( "&Start", main_widget ); pbStart.setFixedSize( pbStart.sizeHint() ); - connect( pbStart, SIGNAL("clicked()"), SLOT("startJob()") ); + connect( pbStart, TQ_SIGNAL("clicked()"), TQ_SLOT("startJob()") ); hbLayout.addWidget( pbStart, 5 ); pbStop = new TQPushButton( "Sto&p", main_widget ); pbStop.setFixedSize( pbStop.sizeHint() ); pbStop.setEnabled( false ); - connect( pbStop, SIGNAL("clicked()"), SLOT("stopJob()") ); + connect( pbStop, TQ_SIGNAL("clicked()"), TQ_SLOT("stopJob()") ); hbLayout.addWidget( pbStop, 5 ); // close button close = new TQPushButton( "&Close", main_widget ); close.setFixedSize( close.sizeHint() ); - connect(close, SIGNAL("clicked()"), this, SLOT("slotQuit()")); + connect(close, TQ_SIGNAL("clicked()"), this, TQ_SLOT("slotQuit()")); topLayout.addWidget( close, 5 ); @@ -228,10 +228,10 @@ KioslaveTest( String src, String dest, int op, int pr ) slave = null; // slave = Scheduler.getConnectedSlave(new KURL("ftp://ftp.kde.org")); - Scheduler.connect(SIGNAL("slaveConnected(Slave)"), - this, SLOT("slotSlaveConnected()")); - Scheduler.connect(SIGNAL("slaveError(Slave,int,String)"), - this, SLOT("slotSlaveError()")); + Scheduler.connect(TQ_SIGNAL("slaveConnected(Slave)"), + this, TQ_SLOT("slotSlaveConnected()")); + Scheduler.connect(TQ_SIGNAL("slaveError(Slave,int,String)"), + this, TQ_SLOT("slotSlaveError()")); } @@ -304,14 +304,14 @@ void startJob() { switch ( selectedOperation ) { case List: myJob = TDEIO.listDir( src ); -// connect(myJob, SIGNAL(" entries( Job, const TDEIO.UDSEntryList&)"), -// SLOT(" slotEntries( TDEIO.Job, const TDEIO.UDSEntryList&)")); +// connect(myJob, TQ_SIGNAL(" entries( Job, const TDEIO.UDSEntryList&)"), +// TQ_SLOT(" slotEntries( TDEIO.Job, const TDEIO.UDSEntryList&)")); break; case ListRecursive: myJob = TDEIO.listRecursive( src ); -// connect(myJob, SIGNAL(" entries( TDEIO.Job, const TDEIO.UDSEntryList&)"), - // SLOT(" slotEntries( TDEIO.Job, const TDEIO.UDSEntryList&)")); +// connect(myJob, TQ_SIGNAL(" entries( TDEIO.Job, const TDEIO.UDSEntryList&)"), + // TQ_SLOT(" slotEntries( TDEIO.Job, const TDEIO.UDSEntryList&)")); break; case Stat: @@ -320,15 +320,15 @@ void startJob() { case Get: myJob = TDEIO.get( src, true ); - connect(myJob, SIGNAL("data( Job, byte[])"), - SLOT("slotData( Job, byte[])")); + connect(myJob, TQ_SIGNAL("data( Job, byte[])"), + TQ_SLOT("slotData( Job, byte[])")); break; case Put: putBuffer = 0; myJob = TDEIO.put( src, -1, true, false); - connect(myJob, SIGNAL("dataReq( Job, ByteArrayOutputStream)"), - SLOT("slotDataReq( Job, ByteArrayOutputStream)")); + connect(myJob, TQ_SIGNAL("dataReq( Job, ByteArrayOutputStream)"), + TQ_SLOT("slotDataReq( Job, ByteArrayOutputStream)")); break; case Copy: @@ -362,11 +362,11 @@ void startJob() { job = myJob; } - connect( job, SIGNAL(" result( Job )"), - SLOT(" slotResult( Job )") ); + connect( job, TQ_SIGNAL(" result( Job )"), + TQ_SLOT(" slotResult( Job )") ); - connect( job, SIGNAL(" canceled( Job )"), - SLOT(" slotResult( Job )") ); + connect( job, TQ_SIGNAL(" canceled( Job )"), + TQ_SLOT(" slotResult( Job )") ); if (progressMode == ProgressStatus) { statusProgress.setJob( job ); |