diff options
243 files changed, 1419 insertions, 1419 deletions
diff --git a/kalyptus/kalyptusCxxToJNI.pm b/kalyptus/kalyptusCxxToJNI.pm index fd426eb8..332b44de 100644 --- a/kalyptus/kalyptusCxxToJNI.pm +++ b/kalyptus/kalyptusCxxToJNI.pm @@ -536,12 +536,12 @@ EOF } /** Prepend a '2' to a signal string and remove any spaces */ - public static String SIGNAL(String signal) { + public static String TQ_SIGNAL(String signal) { return "2" + sqeezeOut(signal, ' '); } /** Prepend a '1' to a slot string and remove any spaces */ - public static String SLOT(String slot) { + public static String TQ_SLOT(String slot) { return "1" + sqeezeOut(slot, ' '); } @@ -5473,8 +5473,8 @@ sub printJavadocComment($$$$) $line =~ s/const char/String/g; $line =~ s/const (\w+)\&/$1/g; $line =~ s/bool/boolean/g; - $line =~ s/SLOT\(\s*([^\)]*)\) ?\)/SLOT("$1)")/g; - $line =~ s/SIGNAL\(\s*([^\)]*)\) ?\)/SIGNAL("$1)")/g; + $line =~ s/TQ_SLOT\(\s*([^\)]*)\) ?\)/TQ_SLOT("$1)")/g; + $line =~ s/TQ_SIGNAL\(\s*([^\)]*)\) ?\)/TQ_SIGNAL("$1)")/g; $line =~ s/TQ_OBJECT\n//g; $line =~ s/class\s+([\w]+)\s*:\s*public/public class $1 implements/g; $line =~ s/public\s*(slots)?:\n/public /g; diff --git a/kalyptus/kalyptusCxxToJava.pm b/kalyptus/kalyptusCxxToJava.pm index 3ad3d6e3..b75b9fb2 100644 --- a/kalyptus/kalyptusCxxToJava.pm +++ b/kalyptus/kalyptusCxxToJava.pm @@ -331,12 +331,12 @@ EOF } /** Prepend a '2' to a signal string and remove any spaces */ - public static String SIGNAL(String signal) { + public static String TQ_SIGNAL(String signal) { return "2" + sqeezeOut(signal, ' '); } /** Prepend a '1' to a slot string and remove any spaces */ - public static String SLOT(String slot) { + public static String TQ_SLOT(String slot) { return "1" + sqeezeOut(slot, ' '); } @@ -3315,8 +3315,8 @@ sub printJavadocComment($$$$) $line =~ s/const char/String/g; $line =~ s/const (\w+)\&/$1/g; $line =~ s/bool/boolean/g; - $line =~ s/SLOT\(\s*([^\)]*)\) ?\)/SLOT("$1)")/g; - $line =~ s/SIGNAL\(\s*([^\)]*)\) ?\)/SIGNAL("$1)")/g; + $line =~ s/TQ_SLOT\(\s*([^\)]*)\) ?\)/TQ_SLOT("$1)")/g; + $line =~ s/TQ_SIGNAL\(\s*([^\)]*)\) ?\)/TQ_SIGNAL("$1)")/g; $line =~ s/TQ_OBJECT\n//g; $line =~ s/class\s+([\w]+)\s*:\s*public/public class $1 implements/g; $line =~ s/public\s*(slots)?:\n/public /g; diff --git a/kalyptus/kalyptusCxxToKimono.pm b/kalyptus/kalyptusCxxToKimono.pm index 174bc5f6..4f4804c2 100644 --- a/kalyptus/kalyptusCxxToKimono.pm +++ b/kalyptus/kalyptusCxxToKimono.pm @@ -386,11 +386,11 @@ EOF public static TQApplication tqApp = null; - public static string SIGNAL(string signal) { + public static string TQ_SIGNAL(string signal) { return "2"+ signal; } - public static string SLOT(string slot) { + public static string TQ_SLOT(string slot) { return "1" + slot; } EOF @@ -3497,8 +3497,8 @@ sub printCSharpdocComment($$$$) $line =~ s/const char/string/g; $line =~ s/const (\w+)\&/$1/g; $line =~ s/bool/bool/g; - $line =~ s/SLOT\(\s*([^\)]*)\) ?\)/SLOT("$1)")/g; - $line =~ s/SIGNAL\(\s*([^\)]*)\) ?\)/SIGNAL("$1)")/g; + $line =~ s/TQ_SLOT\(\s*([^\)]*)\) ?\)/TQ_SLOT("$1)")/g; + $line =~ s/TQ_SIGNAL\(\s*([^\)]*)\) ?\)/TQ_SIGNAL("$1)")/g; $line =~ s/TQ_OBJECT\n//g; $line =~ s/public\s*(slots)?:\n/public /g; $line =~ s/([^0-9"]\s*)\*(\s*[^0-9"-])/$1$2/g; diff --git a/kjsembed/jsconsolewidget.cpp b/kjsembed/jsconsolewidget.cpp index 594cfce8..e536fba5 100644 --- a/kjsembed/jsconsolewidget.cpp +++ b/kjsembed/jsconsolewidget.cpp @@ -94,12 +94,12 @@ void JSConsoleWidget::createView() go = new TQPushButton( i18n("&Run"), cmdBox, "run_button" ); go->setFixedSize( go->sizeHint() ); - connect( cmd, TQT_SIGNAL(returnPressed(const TQString&)), go, TQT_SLOT( animateClick() ) ); - connect( go, TQT_SIGNAL( clicked() ), TQT_SLOT( invoke() ) ); + connect( cmd, TQ_SIGNAL(returnPressed(const TQString&)), go, TQ_SLOT( animateClick() ) ); + connect( go, TQ_SIGNAL( clicked() ), TQ_SLOT( invoke() ) ); // Setup completion TDECompletion *comp = cmd->completionObject(); - connect( cmd, TQT_SIGNAL(returnPressed(const TQString&)), comp, TQT_SLOT(addItem(const TQString&)) ); + connect( cmd, TQ_SIGNAL(returnPressed(const TQString&)), comp, TQ_SLOT(addItem(const TQString&)) ); // Layout TQVBoxLayout *vert = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); @@ -192,11 +192,11 @@ bool JSConsoleWidget::run( const TQString &cmd ) proc = new KShellProcess("/bin/sh"); *proc << cmd; - connect( proc, TQT_SIGNAL( processExited(TDEProcess *) ), TQT_SLOT( childExited() ) ); - connect( proc, TQT_SIGNAL( receivedStdout(TDEProcess *, char *, int) ), - this, TQT_SLOT( receivedStdOutput(TDEProcess *, char *, int) ) ); - connect( proc, TQT_SIGNAL( receivedStderr(TDEProcess *, char *, int) ), - this, TQT_SLOT( receivedStdError(TDEProcess *, char *, int) ) ); + connect( proc, TQ_SIGNAL( processExited(TDEProcess *) ), TQ_SLOT( childExited() ) ); + connect( proc, TQ_SIGNAL( receivedStdout(TDEProcess *, char *, int) ), + this, TQ_SLOT( receivedStdOutput(TDEProcess *, char *, int) ) ); + connect( proc, TQ_SIGNAL( receivedStderr(TDEProcess *, char *, int) ), + this, TQ_SLOT( receivedStdError(TDEProcess *, char *, int) ) ); return proc->start( TDEProcess::NotifyOnExit, TDEProcess::Communication( TDEProcess::Stdout|TDEProcess::Stderr )); diff --git a/kjsembed/kjscmd.cpp b/kjsembed/kjscmd.cpp index 316944ed..d8ee0817 100644 --- a/kjsembed/kjscmd.cpp +++ b/kjsembed/kjscmd.cpp @@ -99,7 +99,7 @@ int main( int argc, char **argv ) } else { app = new TDEApplication; - app->connect( app, TQT_SIGNAL( lastWindowClosed() ), TQT_SLOT(quit()) ); + app->connect( app, TQ_SIGNAL( lastWindowClosed() ), TQ_SLOT(quit()) ); } // Setup the rest diff --git a/kjsembed/ksimpleprocess.cpp b/kjsembed/ksimpleprocess.cpp index 96d3fea3..8777c2b9 100644 --- a/kjsembed/ksimpleprocess.cpp +++ b/kjsembed/ksimpleprocess.cpp @@ -34,10 +34,10 @@ TQString KSimpleProcess::exec( const TQString &args, bool addStdErr ) TQString KSimpleProcess::execInternal( const TQString &args, bool addStdError) { m_proc->setArguments( splitArgList( args )); - connect(m_proc, TQT_SIGNAL(processExited()), this, TQT_SLOT(slotProcessExited())); - connect(m_proc, TQT_SIGNAL(readyReadStdout()), this, TQT_SLOT(slotReceivedStdout())); + connect(m_proc, TQ_SIGNAL(processExited()), this, TQ_SLOT(slotProcessExited())); + connect(m_proc, TQ_SIGNAL(readyReadStdout()), this, TQ_SLOT(slotReceivedStdout())); if( addStdError ) - connect(m_proc, TQT_SIGNAL(readyReadStderr()), this, TQT_SLOT(slotReceivedStderr())); + connect(m_proc, TQ_SIGNAL(readyReadStderr()), this, TQ_SLOT(slotReceivedStderr())); if ( !m_proc->start() ) return i18n("Could not run command '%1'.").arg( args.latin1() ); diff --git a/kjsembed/plugin/jsconsoleplugin.cpp b/kjsembed/plugin/jsconsoleplugin.cpp index 3dc8d7cf..5f6a9e8f 100644 --- a/kjsembed/plugin/jsconsoleplugin.cpp +++ b/kjsembed/plugin/jsconsoleplugin.cpp @@ -51,7 +51,7 @@ JSConsolePlugin::JSConsolePlugin( TQObject *parent, const char *name, const TQSt menu->setDelayed( false ); menu->insert( new TDEAction( i18n("&Console"), 0, - this, TQT_SLOT( showConsole() ), + this, TQ_SLOT( showConsole() ), actionCollection(), "jsconsole_show") ); } diff --git a/kjsembed/qjscmd.cpp b/kjsembed/qjscmd.cpp index f621374e..ae4fe736 100644 --- a/kjsembed/qjscmd.cpp +++ b/kjsembed/qjscmd.cpp @@ -43,7 +43,7 @@ int main( int argc, char **argv ) // Setup TQApplication TQApplication *app; app = new TQApplication( argc, argv ); - app->connect( app, TQT_SIGNAL( lastWindowClosed() ), TQT_SLOT(quit()) ); + app->connect( app, TQ_SIGNAL( lastWindowClosed() ), TQ_SLOT(quit()) ); // Setup Interpreter KJSEmbed::JSSecurityPolicy::setDefaultPolicy( KJSEmbed::JSSecurityPolicy::CapabilityAll ); diff --git a/kjsembed/testkjsembed.cpp b/kjsembed/testkjsembed.cpp index 42f3ad07..4b138e8e 100644 --- a/kjsembed/testkjsembed.cpp +++ b/kjsembed/testkjsembed.cpp @@ -49,7 +49,7 @@ int main( int argc, char **argv ) // Setup Window app.setMainWidget( console ); - app.connect( &app, TQT_SIGNAL( lastWindowClosed() ), TQT_SLOT(quit()) ); + app.connect( &app, TQ_SIGNAL( lastWindowClosed() ), TQ_SLOT(quit()) ); console->resize( 600, 450 ); console->show(); diff --git a/kjsembed/tests/testkjsembed.cpp b/kjsembed/tests/testkjsembed.cpp index 1986cc2d..7018497f 100644 --- a/kjsembed/tests/testkjsembed.cpp +++ b/kjsembed/tests/testkjsembed.cpp @@ -52,7 +52,7 @@ int main( int argc, char **argv ) // Setup Window app.setMainWidget( console ); - app.connect( &app, TQT_SIGNAL( lastWindowClosed() ), TQT_SLOT(quit()) ); + app.connect( &app, TQ_SIGNAL( lastWindowClosed() ), TQ_SLOT(quit()) ); console->resize( 600, 450 ); console->show(); diff --git a/kjsembed/xmlactionclient.cpp b/kjsembed/xmlactionclient.cpp index 88bfab97..43872b30 100644 --- a/kjsembed/xmlactionclient.cpp +++ b/kjsembed/xmlactionclient.cpp @@ -125,7 +125,7 @@ bool XMLActionClient::bind( TDEAction *act, const XMLActionScript &s ) // kdWarning() << "Runner:bind called, action=" << act->name() << " type=" << s.type // << " text=" << s.text << " src=" << s.src << endl; - connect( act, TQT_SIGNAL( activated() ), this, TQT_SLOT( action_activated() ) ); + connect( act, TQ_SIGNAL( activated() ), this, TQ_SLOT( action_activated() ) ); return bind( act->name(), s ); } @@ -331,7 +331,7 @@ TDEAction *XMLActionHandler::createAction( TDEActionCollection *parent ) act->setStatusText( ad.status ); act->setWhatsThis( ad.whatsthis ); - TQObject::connect( actclient, TQT_SIGNAL( destroyed() ), act, TQT_SLOT( deleteLater() ) ); + TQObject::connect( actclient, TQ_SIGNAL( destroyed() ), act, TQ_SLOT( deleteLater() ) ); return act; } diff --git a/korundum/rubylib/examples/RubberDoc.rb b/korundum/rubylib/examples/RubberDoc.rb index 0c50320b..6adf0272 100755 --- a/korundum/rubylib/examples/RubberDoc.rb +++ b/korundum/rubylib/examples/RubberDoc.rb @@ -180,50 +180,50 @@ module MyGui @label = TQt::Label.new self - TQt::Object.connect @listbox, SIGNAL("clicked(TQListBoxItem*)"), - self, SLOT("clicked_result(TQListBoxItem*)") - TQt::Object.connect @viewed, SIGNAL("completed()"), - self, SLOT("tdehtml_part_init_complete()") + TQt::Object.connect @listbox, TQ_SIGNAL("clicked(TQListBoxItem*)"), + self, TQ_SLOT("clicked_result(TQListBoxItem*)") + TQt::Object.connect @viewed, TQ_SIGNAL("completed()"), + self, TQ_SLOT("tdehtml_part_init_complete()") - TQt::Object::connect @viewed, SIGNAL("setWindowCaption(const TQString&)"), + TQt::Object::connect @viewed, TQ_SIGNAL("setWindowCaption(const TQString&)"), @viewed.widget.topLevelWidget, - SLOT("setCaption(const TQString&)") + TQ_SLOT("setCaption(const TQString&)") TQt::Object::connect @viewed.browserExtension, - SIGNAL("openURLRequest(const KURL&, const KParts::URLArgs&)"), - self, SLOT("open_url(const KURL&)") + TQ_SIGNAL("openURLRequest(const KURL&, const KParts::URLArgs&)"), + self, TQ_SLOT("open_url(const KURL&)") KDE::Action.new "&Quit", "quit", KDE::Shortcut.new(), - self, SLOT("quit()"), @main.actionCollection, "file_quit" + self, TQ_SLOT("quit()"), @main.actionCollection, "file_quit" KDE::Action.new "&Index-All", KDE::Shortcut.new(), - self, SLOT("index_all()"), @main.actionCollection, "index_all" + self, TQ_SLOT("index_all()"), @main.actionCollection, "index_all" @back = \ KDE::Action.new "&Back", "back", KDE::Shortcut.new(TQt::ALT + TQt::Key_Left), - self, SLOT("go_back()"), @main.actionCollection, "back" + self, TQ_SLOT("go_back()"), @main.actionCollection, "back" @forward = \ KDE::Action.new "&Forward", "forward", KDE::Shortcut.new(TQt::ALT + TQt::Key_Right), - self, SLOT("go_forward()"), @main.actionCollection, "forward" + self, TQ_SLOT("go_forward()"), @main.actionCollection, "forward" KDE::Action.new "&Home", "gohome", KDE::Shortcut.new(TQt::Key_Home), - self, SLOT("go_home()"), @main.actionCollection, "home" + self, TQ_SLOT("go_home()"), @main.actionCollection, "home" KDE::Action.new "&Prev Match", "go-previous",KDE::Shortcut.new(TQt::CTRL + TQt::Key_P), - self, SLOT("goto_prev_match()"), @main.actionCollection, "prev_match" + self, TQ_SLOT("goto_prev_match()"), @main.actionCollection, "prev_match" KDE::Action.new "&Next Match", "go-next", KDE::Shortcut.new(TQt::CTRL + TQt::Key_N), - self, SLOT("goto_next_match()"), @main.actionCollection, "next_match" + self, TQ_SLOT("goto_next_match()"), @main.actionCollection, "next_match" KDE::Action.new "&Follow Match","go-down", KDE::Shortcut.new(TQt::Key_Return), - self, SLOT("goto_current_match_link()"), @main.actionCollection, "open_match" + self, TQ_SLOT("goto_current_match_link()"), @main.actionCollection, "open_match" KDE::Action.new "Search", "edit-find", KDE::Shortcut.new(TQt::Key_F6), - self, SLOT("focus_search()"), @main.actionCollection, "focus_search" + self, TQ_SLOT("focus_search()"), @main.actionCollection, "focus_search" KDE::Action.new "New Search", "edit-find", KDE::Shortcut.new(TQt::CTRL + TQt::Key_Slash), - self, SLOT("focus_and_clear_search()"), @main.actionCollection, "focus_and_clear_search" + self, TQ_SLOT("focus_and_clear_search()"), @main.actionCollection, "focus_and_clear_search" KDE::Action.new "&Create", "new", KDE::Shortcut.new(), - self, SLOT("project_create()"), @main.actionCollection, "project_create" + self, TQ_SLOT("project_create()"), @main.actionCollection, "project_create" KDE::Action.new "&Choose...", "select", KDE::Shortcut.new(), - self, SLOT("project_goto()"), @main.actionCollection, "project_goto" + self, TQ_SLOT("project_goto()"), @main.actionCollection, "project_goto" clearLocation = KDE::Action.new "Clear Location Bar", "locationbar_erase", KDE::Shortcut.new(), - self, SLOT("clear_location()"), @main.actionCollection, "clear_location" + self, TQ_SLOT("clear_location()"), @main.actionCollection, "clear_location" clearLocation.setWhatsThis "Clear Location bar<p>Clears the content of the location bar." @searchlabel = TQt::Label.new @main @@ -231,10 +231,10 @@ module MyGui @searchcombo = KDE::HistoryCombo.new @main focus_search - TQt::Object.connect @searchcombo, SIGNAL("returnPressed()"), - self, SLOT("goto_search()") - TQt::Object.connect @searchcombo, SIGNAL("textChanged(const TQString&)"), - self, SLOT("search(const TQString&)") + TQt::Object.connect @searchcombo, TQ_SIGNAL("returnPressed()"), + self, TQ_SLOT("goto_search()") + TQt::Object.connect @searchcombo, TQ_SIGNAL("textChanged(const TQString&)"), + self, TQ_SLOT("search(const TQString&)") KDE::WidgetAction.new @searchlabel, "Search: ", KDE::Shortcut.new(TQt::Key_F6), nil, nil, @main.actionCollection, "location_label" @searchlabel.setBuddy @searchcombo @@ -680,11 +680,11 @@ class ProjectEditDialog < TQt::Object @cb.setChecked true if enabled - TQt::Object.connect @dialog, SIGNAL("okClicked()"), - self, SLOT("slot_ok()") + TQt::Object.connect @dialog, TQ_SIGNAL("okClicked()"), + self, TQ_SLOT("slot_ok()") - TQt::Object.connect locselc, SIGNAL("clicked()"), - self, SLOT("select_file()") + TQt::Object.connect locselc, TQ_SIGNAL("clicked()"), + self, TQ_SLOT("select_file()") @title.setFocus @@ -746,17 +746,17 @@ class ProjectSelectDialog < TQt::Object button_del = TQt::PushButton.new "Delete", hbox button_edit = TQt::PushButton.new "Edit...", hbox - TQt::Object.connect button_new, SIGNAL("clicked()"), - self, SLOT("project_create_button()") + TQt::Object.connect button_new, TQ_SIGNAL("clicked()"), + self, TQ_SLOT("project_create_button()") - TQt::Object.connect button_del, SIGNAL("clicked()"), - self, SLOT("delete_selected_project()") + TQt::Object.connect button_del, TQ_SIGNAL("clicked()"), + self, TQ_SLOT("delete_selected_project()") - TQt::Object.connect button_edit, SIGNAL("clicked()"), - self, SLOT("edit_selected_project()") + TQt::Object.connect button_edit, TQ_SIGNAL("clicked()"), + self, TQ_SLOT("edit_selected_project()") - TQt::Object.connect @listbox, SIGNAL("doubleClicked(TQListBoxItem *)"), - self, SLOT("project_selected()") + TQt::Object.connect @listbox, TQ_SIGNAL("doubleClicked(TQListBoxItem *)"), + self, TQ_SLOT("project_selected()") @dialog.setMainWidget vbox end @@ -915,8 +915,8 @@ class RubberDoc < TQt::VBox gui_init_proportions @timer = TQt::Timer.new self - TQt::Object.connect @timer, SIGNAL("timeout()"), - self, SLOT("update_highlight()") + TQt::Object.connect @timer, TQ_SIGNAL("timeout()"), + self, TQ_SLOT("update_highlight()") @viewed.openURL KDE::URL.new("about:blank") @@ -934,8 +934,8 @@ class RubberDoc < TQt::VBox end def tdehtml_part_init_complete - TQt::Object.disconnect @viewed, SIGNAL("completed()"), - self, SLOT("tdehtml_part_init_complete()") if @init_connected + TQt::Object.disconnect @viewed, TQ_SIGNAL("completed()"), + self, TQ_SLOT("tdehtml_part_init_complete()") if @init_connected @pref = File.dirname first_url.url.gsub("file:","") diff --git a/korundum/rubylib/examples/dcop/dcopcall.rb b/korundum/rubylib/examples/dcop/dcopcall.rb index cba7ff09..58add5ae 100755 --- a/korundum/rubylib/examples/dcop/dcopcall.rb +++ b/korundum/rubylib/examples/dcop/dcopcall.rb @@ -6,7 +6,7 @@ include KDE class SenderWidget < PushButton def initialize(parent, name) super - connect(self, SIGNAL('clicked()'), self, SLOT('doit()')) + connect(self, TQ_SIGNAL('clicked()'), self, TQ_SLOT('doit()')) end slots 'doit()' diff --git a/korundum/rubylib/examples/dcop/dcoppredicate.rb b/korundum/rubylib/examples/dcop/dcoppredicate.rb index 82a9c8b4..c4cb2c41 100755 --- a/korundum/rubylib/examples/dcop/dcoppredicate.rb +++ b/korundum/rubylib/examples/dcop/dcoppredicate.rb @@ -6,7 +6,7 @@ include KDE class SenderWidget < PushButton def initialize(parent, name) super - connect(self, SIGNAL('clicked()'), self, SLOT('doit()')) + connect(self, TQ_SIGNAL('clicked()'), self, TQ_SLOT('doit()')) end slots 'doit()' diff --git a/korundum/rubylib/examples/dcop/dcopsend.rb b/korundum/rubylib/examples/dcop/dcopsend.rb index e8a69e00..66530797 100755 --- a/korundum/rubylib/examples/dcop/dcopsend.rb +++ b/korundum/rubylib/examples/dcop/dcopsend.rb @@ -5,7 +5,7 @@ require 'Korundum' class SenderWidget < KDE::PushButton def initialize(parent, name) super - TQt::Object::connect(self, SIGNAL('clicked()'), self, SLOT('doit()')) + TQt::Object::connect(self, TQ_SIGNAL('clicked()'), self, TQ_SLOT('doit()')) end slots 'doit()' diff --git a/korundum/rubylib/examples/dcop/dcopsignal.rb b/korundum/rubylib/examples/dcop/dcopsignal.rb index 4e83d7f4..4d61e917 100755 --- a/korundum/rubylib/examples/dcop/dcopsignal.rb +++ b/korundum/rubylib/examples/dcop/dcopsignal.rb @@ -7,7 +7,7 @@ class SenderWidget < KDE::PushButton def initialize(parent, name) super - TQt::Object::connect(self, SIGNAL('clicked()'), self, SLOT('doit()')) + TQt::Object::connect(self, TQ_SIGNAL('clicked()'), self, TQ_SLOT('doit()')) end slots 'doit()' diff --git a/korundum/rubylib/examples/kludgeror.rb b/korundum/rubylib/examples/kludgeror.rb index 156b2c53..f44d6c3c 100644 --- a/korundum/rubylib/examples/kludgeror.rb +++ b/korundum/rubylib/examples/kludgeror.rb @@ -73,8 +73,8 @@ doc = KDE::HTMLPart.new toplevel, nil, toplevel, nil, 1 # doc = KDE::HTMLPart.new toplevel, nil, toplevel, nil, 1 # KDE::HTMLPart::BrowserViewGUI ph = PartHolder.new doc -TQt::Object::connect doc.browserExtension, SIGNAL("openURLRequest(const KURL&, const KParts::URLArgs&)"), - ph, SLOT("openURL(const KURL&)") # BUG this slot must be screwing up wrt marshalling? +TQt::Object::connect doc.browserExtension, TQ_SIGNAL("openURLRequest(const KURL&, const KParts::URLArgs&)"), + ph, TQ_SLOT("openURL(const KURL&)") # BUG this slot must be screwing up wrt marshalling? ph.openURL url toplevel.setCentralWidget doc.widget @@ -103,26 +103,26 @@ begin d.documentElement.appendChild locBar end -a1 = KDE::Action.new( "Reload", "reload", KDE::Shortcut.new(TQt::Key_F5), ph, SLOT("reload()"), doc.actionCollection, "reload" ) -a2 = KDE::Action.new( "Exit", "system-log-out", KDE::Shortcut.new(0), a, SLOT("quit()"), doc.actionCollection, "exit" ) +a1 = KDE::Action.new( "Reload", "reload", KDE::Shortcut.new(TQt::Key_F5), ph, TQ_SLOT("reload()"), doc.actionCollection, "reload" ) +a2 = KDE::Action.new( "Exit", "system-log-out", KDE::Shortcut.new(0), a, TQ_SLOT("quit()"), doc.actionCollection, "exit" ) toplevel.guiFactory.addClient doc locBar = toplevel.toolBar("locationBar"); -locBar.insertButton "back", BACK_B, SIGNAL("clicked()"), - ph, SLOT("back()"), true, "Go back" -locBar.insertLined url.url, LOC_ED, SIGNAL("returnPressed(const TQString&)"), ph, SLOT("goToURL(const TQString&)"), true, "Location" -locBar.insertButton "locationbar_erase", ERASE_B, SIGNAL("clicked()"), - locBar.getLined(LOC_ED), SLOT("clear()"), true, "Erase the location bar's content", 2 +locBar.insertButton "back", BACK_B, TQ_SIGNAL("clicked()"), + ph, TQ_SLOT("back()"), true, "Go back" +locBar.insertLined url.url, LOC_ED, TQ_SIGNAL("returnPressed(const TQString&)"), ph, TQ_SLOT("goToURL(const TQString&)"), true, "Location" +locBar.insertButton "locationbar_erase", ERASE_B, TQ_SIGNAL("clicked()"), + locBar.getLined(LOC_ED), TQ_SLOT("clear()"), true, "Erase the location bar's content", 2 locBar.setItemAutoSized LOC_ED, true locBar.getLined(LOC_ED).createPopupMenu comp = locBar.getLined(LOC_ED).completionObject comp.setCompletionMode KDE::GlobalSettings::CompletionPopupAuto -TQt::Object::connect(locBar.getLined(LOC_ED), SIGNAL("returnPressed(const TQString&)"), - comp, SLOT("addItem(const TQString&)")) -TQt::Object::connect(ph, SIGNAL("setLocBarText(const TQString&)"), # BUG - once again... - locBar.getLined(LOC_ED), SLOT("setText(const TQString&)")) +TQt::Object::connect(locBar.getLined(LOC_ED), TQ_SIGNAL("returnPressed(const TQString&)"), + comp, TQ_SLOT("addItem(const TQString&)")) +TQt::Object::connect(ph, TQ_SIGNAL("setLocBarText(const TQString&)"), # BUG - once again... + locBar.getLined(LOC_ED), TQ_SLOT("setText(const TQString&)")) doc.setJScriptEnabled true doc.setJavaEnabled true @@ -131,8 +131,8 @@ doc.setURLCursor TQt::Cursor.new(TQt::PointingHandCursor) a.setTopWidget doc.widget -TQt::Object::connect doc, SIGNAL("setWindowCaption(const TQString&)"), - doc.widget.topLevelWidget, SLOT("setCaption(const TQString&)") +TQt::Object::connect doc, TQ_SIGNAL("setWindowCaption(const TQString&)"), + doc.widget.topLevelWidget, TQ_SLOT("setCaption(const TQString&)") toplevel.show a.exec diff --git a/korundum/rubylib/examples/menudemo.rb b/korundum/rubylib/examples/menudemo.rb index 0ff27ac8..5fe405d3 100644 --- a/korundum/rubylib/examples/menudemo.rb +++ b/korundum/rubylib/examples/menudemo.rb @@ -65,29 +65,29 @@ class MainWin < MainWindow def initActions() # "File" menu items - @newAction = StdAction.openNew(self, SLOT('slotNew()'), actionCollection()) - @openAction = StdAction.open(self, SLOT('slotOpen()'), actionCollection()) - @saveAction = StdAction.save(self, SLOT('slotSave()'), actionCollection()) - @saveAsAction = StdAction.saveAs(self, SLOT('slotSaveAs()'), actionCollection()) - @printAction = StdAction.print(self, SLOT('slotPrint()'), actionCollection()) - @quitAction = StdAction.quit(self, SLOT('slotQuit()'), actionCollection()) + @newAction = StdAction.openNew(self, TQ_SLOT('slotNew()'), actionCollection()) + @openAction = StdAction.open(self, TQ_SLOT('slotOpen()'), actionCollection()) + @saveAction = StdAction.save(self, TQ_SLOT('slotSave()'), actionCollection()) + @saveAsAction = StdAction.saveAs(self, TQ_SLOT('slotSaveAs()'), actionCollection()) + @printAction = StdAction.print(self, TQ_SLOT('slotPrint()'), actionCollection()) + @quitAction = StdAction.quit(self, TQ_SLOT('slotQuit()'), actionCollection()) # "Edit" menu items - @undoAction = StdAction.undo(self, SLOT('slotUndo()'), actionCollection()) - @redoAction = StdAction.redo(self, SLOT('slotRedo()'), actionCollection()) - @cutAction = StdAction.cut(self, SLOT('slotCut()'), actionCollection()) - @copyAction = StdAction.copy(self, SLOT('slotCopy()'), actionCollection()) - @pasteAction = StdAction.paste(self, SLOT('slotPaste()'), actionCollection()) - @findAction = StdAction.find(self, SLOT('slotFind()'), actionCollection()) - @findNextAction = StdAction.findNext(self, SLOT('slotFindNext()'), actionCollection()) - @replaceAction = StdAction.replace(self, SLOT('slotReplace()'), actionCollection()) - @specialAction = Action.new(i18n("Special"), Shortcut.new(), self, SLOT('slotSpecial()'), actionCollection(), "special") + @undoAction = StdAction.undo(self, TQ_SLOT('slotUndo()'), actionCollection()) + @redoAction = StdAction.redo(self, TQ_SLOT('slotRedo()'), actionCollection()) + @cutAction = StdAction.cut(self, TQ_SLOT('slotCut()'), actionCollection()) + @copyAction = StdAction.copy(self, TQ_SLOT('slotCopy()'), actionCollection()) + @pasteAction = StdAction.paste(self, TQ_SLOT('slotPaste()'), actionCollection()) + @findAction = StdAction.find(self, TQ_SLOT('slotFind()'), actionCollection()) + @findNextAction = StdAction.findNext(self, TQ_SLOT('slotFindNext()'), actionCollection()) + @replaceAction = StdAction.replace(self, TQ_SLOT('slotReplace()'), actionCollection()) + @specialAction = Action.new(i18n("Special"), Shortcut.new(), self, TQ_SLOT('slotSpecial()'), actionCollection(), "special") # Demo menu items # TDEToggleAction has an isChecked member and emits the "toggle" signal @toggle1Action = ToggleAction.new("Toggle 1") - @toggle2Action = ToggleAction.new("Toggle 2", Shortcut.new(), self, SLOT('slotToggle2()'), nil) + @toggle2Action = ToggleAction.new("Toggle 2", Shortcut.new(), self, TQ_SLOT('slotToggle2()'), nil) # A separator - create once/use everywhere @separateAction = ActionSeparator.new() @@ -103,8 +103,8 @@ class MainWin < MainWindow # Nested menus using TDEActions (also nested on toolbar) @actionMenu = ActionMenu.new("Action Menu") @actionMenu.setIconSet(iconSet) - @actionMenu.insert(StdAction.zoomIn(self, SLOT('slotZoomIn()'), actionCollection())) - @actionMenu.insert(StdAction.zoomOut(self, SLOT('slotZoomOut()'), actionCollection())) + @actionMenu.insert(StdAction.zoomIn(self, TQ_SLOT('slotZoomIn()'), actionCollection())) + @actionMenu.insert(StdAction.zoomOut(self, TQ_SLOT('slotZoomOut()'), actionCollection())) # Doesn't work in KDE 2.1.1 # radio1Action = TDERadioAction ("Radio 1") diff --git a/korundum/rubylib/examples/rbTDEHTMLPart.rb b/korundum/rubylib/examples/rbTDEHTMLPart.rb index 27eb4a70..aafc160e 100644 --- a/korundum/rubylib/examples/rbTDEHTMLPart.rb +++ b/korundum/rubylib/examples/rbTDEHTMLPart.rb @@ -67,14 +67,14 @@ class RbPartsMW < KParts::MainWindow # some of this and later stuff (like self.actionCollection () ) # comes from - quitAction = KDE::StdAction.quit(self, SLOT('close()'), actionCollection()) + quitAction = KDE::StdAction.quit(self, TQ_SLOT('close()'), actionCollection()) createStandardStatusBarAction() -# @m_toolbarAction = KDE::StdAction.showToolbar(self, SLOT('optionsShowToolbar()'), actionCollection()) - @m_statusbarAction = KDE::StdAction.showStatusbar(self, SLOT('optionsShowStatusbar()'), actionCollection()) +# @m_toolbarAction = KDE::StdAction.showToolbar(self, TQ_SLOT('optionsShowToolbar()'), actionCollection()) + @m_statusbarAction = KDE::StdAction.showStatusbar(self, TQ_SLOT('optionsShowStatusbar()'), actionCollection()) - KDE::StdAction.keyBindings(self, SLOT('optionsConfigureKeys()'), actionCollection()) - KDE::StdAction.configureToolbars(self, SLOT('optionsConfigureToolbars()'), actionCollection()) + KDE::StdAction.keyBindings(self, TQ_SLOT('optionsConfigureKeys()'), actionCollection()) + KDE::StdAction.configureToolbars(self, TQ_SLOT('optionsConfigureToolbars()'), actionCollection()) path = Dir.getwd() + '/' setGeometry(0, 0, 600, 500) diff --git a/korundum/rubylib/examples/uimodules/uidialogs.rb b/korundum/rubylib/examples/uimodules/uidialogs.rb index 8efed493..f4a9f353 100644 --- a/korundum/rubylib/examples/uimodules/uidialogs.rb +++ b/korundum/rubylib/examples/uimodules/uidialogs.rb @@ -39,9 +39,9 @@ class CustomDlg < KDE::Dialog okBtn.setGeometry(x, y, 40, 22) canBtn.setGeometry(x + 50, y, 40, 22) - connect(dlgBtn, SIGNAL("clicked()"), SLOT('dlgClicked()')) - connect(okBtn, SIGNAL("clicked()"), SLOT('okClicked()')) - connect(canBtn, SIGNAL("clicked()"), SLOT('cancelClicked()')) + connect(dlgBtn, TQ_SIGNAL("clicked()"), TQ_SLOT('dlgClicked()')) + connect(okBtn, TQ_SIGNAL("clicked()"), TQ_SLOT('okClicked()')) + connect(canBtn, TQ_SIGNAL("clicked()"), TQ_SLOT('cancelClicked()')) end def dlgClicked() @@ -93,7 +93,7 @@ class MessageDlg < KDE::Dialog grp.setGeometry(10, 10, 200, 30*n) (0...n).each { |i| TQt::RadioButton.new(buttons[i], grp) } - connect(grp, SIGNAL("clicked(int)"), SLOT('launch(int)')) + connect(grp, TQ_SIGNAL("clicked(int)"), TQ_SLOT('launch(int)')) end def launch(which) diff --git a/korundum/rubylib/examples/uimodules/uimisc.rb b/korundum/rubylib/examples/uimodules/uimisc.rb index be186409..51b85bd4 100644 --- a/korundum/rubylib/examples/uimodules/uimisc.rb +++ b/korundum/rubylib/examples/uimodules/uimisc.rb @@ -26,7 +26,7 @@ class Page3 < TQt::Object @iv = KDE::LineEdit.new(page) @iv.setGeometry(x, y + 20, 100, 20) @iv.show() - connect(@iv, SIGNAL("textChanged(const TQString&)"), SLOT('ivChanged()')) + connect(@iv, TQ_SIGNAL("textChanged(const TQString&)"), TQ_SLOT('ivChanged()')) @ivVal = KDE::IntValidator.new(page) @ivVal.setRange(20, 50) @@ -63,7 +63,7 @@ class Page3 < TQt::Object @fv = KDE::LineEdit.new(page) @fv.setGeometry(x, y + 20, 100, 20) @fv.show() - connect(@fv, SIGNAL("textChanged(const TQString&)"), SLOT('fvChanged()')) + connect(@fv, TQ_SIGNAL("textChanged(const TQString&)"), TQ_SLOT('fvChanged()')) @fvVal = KDE::DoubleValidator.new(page) @fvVal.setRange(10.0, 40.0) @@ -100,7 +100,7 @@ class Page3 < TQt::Object @dv = KDE::LineEdit.new(page) @dv.setGeometry(x, y + 20, 100, 20) @dv.show() -# connect(dv, SIGNAL("textChanged(const TQString&)"), SLOT('dvChanged()')) +# connect(dv, TQ_SIGNAL("textChanged(const TQString&)"), TQ_SLOT('dvChanged()')) @dvVal = KDE::DateValidator.new(page) # dvVal.setRange(10.0, 40.0) @@ -112,7 +112,7 @@ class Page3 < TQt::Object dvBtn = TQt::PushButton.new("Validate", page) dvBtn.setGeometry(x, y + 45, 60, 22) dvBtn.show() - connect(dvBtn, SIGNAL("clicked()"), SLOT('dvChanged()')) + connect(dvBtn, TQ_SIGNAL("clicked()"), TQ_SLOT('dvChanged()')) dvNoteLbl = TQt::Label.new("Format is locale dependent\nShort date only\nTry DD-MM-YY", page) dvNoteLbl.setGeometry(x, y + 70, 150, 60) diff --git a/korundum/rubylib/examples/uimodules/uiwidgets.rb b/korundum/rubylib/examples/uimodules/uiwidgets.rb index 71a865a5..4e0bcdb3 100644 --- a/korundum/rubylib/examples/uimodules/uiwidgets.rb +++ b/korundum/rubylib/examples/uimodules/uiwidgets.rb @@ -41,9 +41,9 @@ class Page1 < TQt::Object replaceBtn.setGeometry(x + 90, y, 60, 22) gotoBtn.setGeometry(x + 180, y, 60, 22) -# page.connect(searchBtn, SIGNAL("clicked()"), parent.edit, SLOT('search()')) -# page.connect(replaceBtn, SIGNAL("clicked()"), parent.edit, SLOT('replace()')) -# page.connect(gotoBtn, SIGNAL("clicked()"), parent.edit, SLOT('doGotoLine()')) +# page.connect(searchBtn, TQ_SIGNAL("clicked()"), parent.edit, TQ_SLOT('search()')) +# page.connect(replaceBtn, TQ_SIGNAL("clicked()"), parent.edit, TQ_SLOT('replace()')) +# page.connect(gotoBtn, TQ_SIGNAL("clicked()"), parent.edit, TQ_SLOT('doGotoLine()')) searchBtn.show() replaceBtn.show() @@ -105,7 +105,7 @@ class Page1 < TQt::Object (0...n).each { |i| TQt::RadioButton.new(buttons[i], grp) } - connect(grp, SIGNAL("clicked(int)"), SLOT('restrict(int)')) + connect(grp, TQ_SIGNAL("clicked(int)"), TQ_SLOT('restrict(int)')) grp.find(0).setChecked(true) restrict(0) @@ -469,7 +469,7 @@ class Page6 < TQt::Object toggle.setGeometry(150, 400, 60, 22) toggle.show() - connect(toggle, SIGNAL("clicked()"), SLOT('toggleClicked()')) + connect(toggle, TQ_SIGNAL("clicked()"), TQ_SLOT('toggleClicked()')) page.show() end @@ -545,7 +545,7 @@ class Page7 < TQt::Object page.show() @timer = TQt::Timer.new(page) - connect(@timer, SIGNAL('timeout()'), SLOT('add1()')) + connect(@timer, TQ_SIGNAL('timeout()'), TQ_SLOT('add1()')) @timer.start(100) add1() @@ -637,7 +637,7 @@ class CSDlg < KDE::Dialog closeBtn.setGeometry( 610, 280, 60, 22) closeBtn.show() - connect(closeBtn, SIGNAL("clicked()"), SLOT('closeClicked()')) + connect(closeBtn, TQ_SIGNAL("clicked()"), TQ_SLOT('closeClicked()')) end def closeClicked() diff --git a/korundum/rubylib/examples/uisampler.rb b/korundum/rubylib/examples/uisampler.rb index b24b59aa..bed43c44 100644 --- a/korundum/rubylib/examples/uisampler.rb +++ b/korundum/rubylib/examples/uisampler.rb @@ -160,7 +160,7 @@ class MainWin < KDE::MainWindow setCentralWidget(@mainView) initListView() - connect(@tree, SIGNAL("clicked(TQListViewItem*)"), self, SLOT('lvClicked(TQListViewItem*)')) + connect(@tree, TQ_SIGNAL("clicked(TQListViewItem*)"), self, TQ_SLOT('lvClicked(TQListViewItem*)')) @edit = nil @currentPageObj = nil diff --git a/korundum/rubylib/examples/uitdemdi.rb b/korundum/rubylib/examples/uitdemdi.rb index 3b67b9e1..fe5655c6 100644 --- a/korundum/rubylib/examples/uitdemdi.rb +++ b/korundum/rubylib/examples/uitdemdi.rb @@ -54,9 +54,9 @@ class KmdiExample < KDE::MdiMainFrm @viewIcons = ['network', 'email', 'stop', 'back', 'forward'] @toolIcons = ['view_icon', 'configure'] - openNewAction = StdAction.openNew(self, SLOT('newView()'), actionCollection()) - quitAction = StdAction.quit(self, SLOT('close()'), actionCollection()) - closeAction = StdAction.close(self, SLOT('closeActiveChild()'), actionCollection()) + openNewAction = StdAction.openNew(self, TQ_SLOT('newView()'), actionCollection()) + quitAction = StdAction.quit(self, TQ_SLOT('close()'), actionCollection()) + closeAction = StdAction.close(self, TQ_SLOT('closeActiveChild()'), actionCollection()) uifilebase = Dir.getwd + '/uitdemdi.rc' createGUI(uifilebase) @@ -82,9 +82,9 @@ class KmdiExample < KDE::MdiMainFrm makeView("View #{idx.to_s}", ico, ico) end - connect(self, SIGNAL('viewActivated(KMdiChildView*)'), self, SLOT('activatedMessage(KMdiChildView*)')) - connect(self, SIGNAL('viewActivated(KMdiChildView*)'), self, SLOT('syncFromChildView(KMdiChildView*)')) - connect(@maintool, SIGNAL('selectionChanged(TQListBoxItem*)'), self, SLOT('syncFromMainTool(TQListBoxItem*)')) + connect(self, TQ_SIGNAL('viewActivated(KMdiChildView*)'), self, TQ_SLOT('activatedMessage(KMdiChildView*)')) + connect(self, TQ_SIGNAL('viewActivated(KMdiChildView*)'), self, TQ_SLOT('syncFromChildView(KMdiChildView*)')) + connect(@maintool, TQ_SIGNAL('selectionChanged(TQListBoxItem*)'), self, TQ_SLOT('syncFromMainTool(TQListBoxItem*)')) syncFromChildView(activeWindow()) end @@ -128,7 +128,7 @@ class KmdiExample < KDE::MdiMainFrm pxm.setPixmap(getIcon(icon, Icon::NoGroup, KDE::Icon::SizeLarge)) addWindow(view) @mainToolWidget.insertItem(label) - connect(view, SIGNAL('childWindowCloseRequest(KMdiChildView*)'), self, SLOT('closeChild(KMdiChildView*)')) + connect(view, TQ_SIGNAL('childWindowCloseRequest(KMdiChildView*)'), self, TQ_SLOT('closeChild(KMdiChildView*)')) end def removeMainToolItem(view) diff --git a/korundum/rubylib/examples/xmlgui.rb b/korundum/rubylib/examples/xmlgui.rb index 84acbdde..ce5ca418 100755 --- a/korundum/rubylib/examples/xmlgui.rb +++ b/korundum/rubylib/examples/xmlgui.rb @@ -34,7 +34,7 @@ begin m = KDE::MainWindow.new @r = Receiver.new m mActionCollection = m.actionCollection - action = std_actions[:quit].create @r, SLOT("quit()"), mActionCollection + action = std_actions[:quit].create @r, TQ_SLOT("quit()"), mActionCollection m.createGUI Dir.pwd + "/xmlgui.rc" app.setMainWidget(m) m.show diff --git a/korundum/rubylib/examples/xmlmenudemo.rb b/korundum/rubylib/examples/xmlmenudemo.rb index 8d9d5c94..e619a1c6 100644 --- a/korundum/rubylib/examples/xmlmenudemo.rb +++ b/korundum/rubylib/examples/xmlmenudemo.rb @@ -81,22 +81,22 @@ class MainWin < KDE::MainWindow acts = actionCollection() # "File" menu items - newAction = KDE::StdAction.openNew(self, SLOT('slotNew()'), acts) - openAction = KDE::StdAction.open(self, SLOT('slotOpen()'), acts) - @saveAction = KDE::StdAction.save(self, SLOT('slotSave()'), acts) - @saveAsAction = KDE::StdAction.saveAs(self, SLOT('slotSaveAs()'), acts) - printAction = KDE::StdAction.print(self, SLOT('slotPrint()'), acts) - quitAction = KDE::StdAction.quit(self, SLOT('slotQuit()'), acts) + newAction = KDE::StdAction.openNew(self, TQ_SLOT('slotNew()'), acts) + openAction = KDE::StdAction.open(self, TQ_SLOT('slotOpen()'), acts) + @saveAction = KDE::StdAction.save(self, TQ_SLOT('slotSave()'), acts) + @saveAsAction = KDE::StdAction.saveAs(self, TQ_SLOT('slotSaveAs()'), acts) + printAction = KDE::StdAction.print(self, TQ_SLOT('slotPrint()'), acts) + quitAction = KDE::StdAction.quit(self, TQ_SLOT('slotQuit()'), acts) # "Edit" menu items - undoAction = KDE::StdAction.undo(self, SLOT('slotUndo()'), acts) - redoAction = KDE::StdAction.redo(self, SLOT('slotRedo()'), acts) - cutAction = KDE::StdAction.cut(self, SLOT('slotCut()'), acts) - copyAction = KDE::StdAction.copy(self, SLOT('slotCopy()'), acts) - pasteAction = KDE::StdAction.paste(self, SLOT('slotPaste()'), acts) - findAction = KDE::StdAction.find(self, SLOT('slotFind()'), acts) - findNextAction = KDE::StdAction.findNext(self, SLOT('slotFindNext()'), acts) - replaceAction = KDE::StdAction.replace(self, SLOT('slotReplace()'), acts) + undoAction = KDE::StdAction.undo(self, TQ_SLOT('slotUndo()'), acts) + redoAction = KDE::StdAction.redo(self, TQ_SLOT('slotRedo()'), acts) + cutAction = KDE::StdAction.cut(self, TQ_SLOT('slotCut()'), acts) + copyAction = KDE::StdAction.copy(self, TQ_SLOT('slotCopy()'), acts) + pasteAction = KDE::StdAction.paste(self, TQ_SLOT('slotPaste()'), acts) + findAction = KDE::StdAction.find(self, TQ_SLOT('slotFind()'), acts) + findNextAction = KDE::StdAction.findNext(self, TQ_SLOT('slotFindNext()'), acts) + replaceAction = KDE::StdAction.replace(self, TQ_SLOT('slotReplace()'), acts) # NOTE!!!! You must specify a parent and name for the action object in its constructor # Normally in a constructor like @@ -111,13 +111,13 @@ class MainWin < KDE::MainWindow # object names - the variable the object is assigned to('specialAction') # has no meaning in XNLGUI terms except through the objects 'name' member value - specialAction = KDE::Action.new(i18n("Special"), KDE::Shortcut.new(0), self, SLOT('slotSpecial()'), acts, "specialActionName") + specialAction = KDE::Action.new(i18n("Special"), KDE::Shortcut.new(0), self, TQ_SLOT('slotSpecial()'), acts, "specialActionName") # Demo menu items # KDE::ToggleAction has an isChecked member and emits the "toggle" signal toggle1Action = KDE::ToggleAction.new("Toggle 1", KDE::Shortcut.new(0), acts, "toggle1Action") - toggle2Action = KDE::ToggleAction.new("Toggle 2", KDE::Shortcut.new(0), self, SLOT('slotToggle2()'), acts, "toggle2Action") + toggle2Action = KDE::ToggleAction.new("Toggle 2", KDE::Shortcut.new(0), self, TQ_SLOT('slotToggle2()'), acts, "toggle2Action") # A separator - create once/use everywhere separateAction = KDE::ActionSeparator.new(acts, "separateAction") @@ -146,15 +146,15 @@ class MainWin < KDE::MainWindow # separators). Creating the KDE::StdActions alone is sufficient - you # could delete their references from the *ui.rc file and the menu # items would still be created via ui_standards.rc - actionMenu.insert(KDE::StdAction.zoomIn(self, SLOT('slotZoomIn()'), acts)) - actionMenu.insert(KDE::StdAction.zoomOut(self, SLOT('slotZoomOut()'), acts)) + actionMenu.insert(KDE::StdAction.zoomIn(self, TQ_SLOT('slotZoomIn()'), acts)) + actionMenu.insert(KDE::StdAction.zoomOut(self, TQ_SLOT('slotZoomOut()'), acts)) - radio1Action = KDE::RadioAction.new("Radio 1", KDE::Shortcut.new(0), self, SLOT('slotRadio()'), acts, "radio1") + radio1Action = KDE::RadioAction.new("Radio 1", KDE::Shortcut.new(0), self, TQ_SLOT('slotRadio()'), acts, "radio1") radio1Action.setExclusiveGroup("Radio") radio1Action.setChecked(true) - radio2Action = KDE::RadioAction.new("Radio 2", KDE::Shortcut.new(0), self, SLOT('slotRadio()'), acts, "radio2") + radio2Action = KDE::RadioAction.new("Radio 2", KDE::Shortcut.new(0), self, TQ_SLOT('slotRadio()'), acts, "radio2") radio2Action.setExclusiveGroup("Radio") - radio3Action = KDE::RadioAction.new("Radio 3", KDE::Shortcut.new(0), self, SLOT('slotRadio()'), acts, "radio3") + radio3Action = KDE::RadioAction.new("Radio 3", KDE::Shortcut.new(0), self, TQ_SLOT('slotRadio()'), acts, "radio3") radio3Action.setExclusiveGroup("Radio") end @@ -184,7 +184,7 @@ class MainWin < KDE::MainWindow # in this case only (0...fakeFiles.length).each do |i| act = KDE::Action.new(i18n(" &#{i.to_s} #{fakeFiles[i]}"), KDE::Shortcut.new(0), - self, SLOT('slotFake()'), nil, fakeFiles[i].sub(/.sip$/,'') + "open") + self, TQ_SLOT('slotFake()'), nil, fakeFiles[i].sub(/.sip$/,'') + "open") dynamicActionsList << act end diff --git a/korundum/rubylib/templates/annotated/menuapp1.rb b/korundum/rubylib/templates/annotated/menuapp1.rb index bf4ea83c..df44cee4 100644 --- a/korundum/rubylib/templates/annotated/menuapp1.rb +++ b/korundum/rubylib/templates/annotated/menuapp1.rb @@ -87,21 +87,21 @@ class MainWin < KDE::MainWindow # need to instantiate KDE::StdAccel # "File" menu items - fileMenu.insertItem(i18n("New"), self, SLOT('slotNew()'), TQt::KeySequence.new(KDE::StdAccel.openNew().keyCodeQt())) - fileMenu.insertItem(i18n("Open"), self, SLOT('slotOpen()'), TQt::KeySequence.new(KDE::StdAccel.open().keyCodeQt())) + fileMenu.insertItem(i18n("New"), self, TQ_SLOT('slotNew()'), TQt::KeySequence.new(KDE::StdAccel.openNew().keyCodeQt())) + fileMenu.insertItem(i18n("Open"), self, TQ_SLOT('slotOpen()'), TQt::KeySequence.new(KDE::StdAccel.open().keyCodeQt())) fileMenu.insertSeparator() - fileMenu.insertItem(i18n("Save"), self, SLOT('slotSave()'), TQt::KeySequence.new(KDE::StdAccel.save().keyCodeQt())) + fileMenu.insertItem(i18n("Save"), self, TQ_SLOT('slotSave()'), TQt::KeySequence.new(KDE::StdAccel.save().keyCodeQt())) # TDEStdAccel doesn't have a standard accelerator for 'Save As', # so we omit it - insertItem uses the default value - fileMenu.insertItem(i18n("SaveAs"), self, SLOT('slotSaveAs()')) + fileMenu.insertItem(i18n("SaveAs"), self, TQ_SLOT('slotSaveAs()')) # This inserts a line between groups of items in a menu fileMenu.insertSeparator() - fileMenu.insertItem(i18n("Print"), self, SLOT('slotPrint()'), TQt::KeySequence.new(KDE::StdAccel.print().keyCodeQt())) + fileMenu.insertItem(i18n("Print"), self, TQ_SLOT('slotPrint()'), TQt::KeySequence.new(KDE::StdAccel.print().keyCodeQt())) fileMenu.insertSeparator() - fileMenu.insertItem(i18n("&Quit"), self, SLOT('slotQuit()'), TQt::KeySequence.new(KDE::StdAccel.quit().keyCodeQt())) + fileMenu.insertItem(i18n("&Quit"), self, TQ_SLOT('slotQuit()'), TQt::KeySequence.new(KDE::StdAccel.quit().keyCodeQt())) # Put fileMenu (as the File menu) into the menu bar # 'menuBar' is a predefined object owned by KDE::MainWindow @@ -110,16 +110,16 @@ class MainWin < KDE::MainWindow editMenu = TQt::PopupMenu.new(self) # "Edit" menu items - editMenu.insertItem(i18n("Undo"), self, SLOT('slotUndo()'), TQt::KeySequence.new(KDE::StdAccel.undo().keyCodeQt())) - editMenu.insertItem(i18n("Redo"), self, SLOT('slotRedo()'), TQt::KeySequence.new(KDE::StdAccel.redo().keyCodeQt())) + editMenu.insertItem(i18n("Undo"), self, TQ_SLOT('slotUndo()'), TQt::KeySequence.new(KDE::StdAccel.undo().keyCodeQt())) + editMenu.insertItem(i18n("Redo"), self, TQ_SLOT('slotRedo()'), TQt::KeySequence.new(KDE::StdAccel.redo().keyCodeQt())) editMenu.insertSeparator() - editMenu.insertItem(i18n("Cut"), self, SLOT('slotCut()'), TQt::KeySequence.new(KDE::StdAccel.cut().keyCodeQt())) - editMenu.insertItem(i18n("Copy"), self, SLOT('slotCopy()'), TQt::KeySequence.new(KDE::StdAccel.copy().keyCodeQt())) - editMenu.insertItem(i18n("Paste"), self, SLOT('slotPaste()'), TQt::KeySequence.new(KDE::StdAccel.paste().keyCodeQt())) + editMenu.insertItem(i18n("Cut"), self, TQ_SLOT('slotCut()'), TQt::KeySequence.new(KDE::StdAccel.cut().keyCodeQt())) + editMenu.insertItem(i18n("Copy"), self, TQ_SLOT('slotCopy()'), TQt::KeySequence.new(KDE::StdAccel.copy().keyCodeQt())) + editMenu.insertItem(i18n("Paste"), self, TQ_SLOT('slotPaste()'), TQt::KeySequence.new(KDE::StdAccel.paste().keyCodeQt())) editMenu.insertSeparator() - editMenu.insertItem(i18n("Find"), self, SLOT('slotFind()'), TQt::KeySequence.new(KDE::StdAccel.find().keyCodeQt())) - editMenu.insertItem(i18n("Find Next"), self, SLOT('slotFindNext()'), TQt::KeySequence.new(KDE::StdAccel.findNext().keyCodeQt())) - editMenu.insertItem(i18n("Replace"), self, SLOT('slotReplace()'), TQt::KeySequence.new(KDE::StdAccel.replace().keyCodeQt())) + editMenu.insertItem(i18n("Find"), self, TQ_SLOT('slotFind()'), TQt::KeySequence.new(KDE::StdAccel.find().keyCodeQt())) + editMenu.insertItem(i18n("Find Next"), self, TQ_SLOT('slotFindNext()'), TQt::KeySequence.new(KDE::StdAccel.findNext().keyCodeQt())) + editMenu.insertItem(i18n("Replace"), self, TQ_SLOT('slotReplace()'), TQt::KeySequence.new(KDE::StdAccel.replace().keyCodeQt())) # Put editMenu (as the Edit menu) into the menu bar @@ -150,18 +150,18 @@ class MainWin < KDE::MainWindow # are easier ways to do this - see other menuapp templates for easier # methods using KDE::Action/KDE::StdAction - toolBar().insertButton(icons.loadIcon("filenew", KDE::Icon::Toolbar), TOOLBAR_NEW, SIGNAL("clicked(int)"), - self, SLOT('slotNew()'), true, "New") - toolBar().insertButton(icons.loadIcon("fileopen", KDE::Icon::Toolbar), TOOLBAR_OPEN, SIGNAL("clicked(int)"), - self, SLOT('slotOpen()'), true, "Open") - toolBar().insertButton(icons.loadIcon("filesave", KDE::Icon::Toolbar), TOOLBAR_SAVE, SIGNAL("clicked(int)"), - self, SLOT('slotSave()'), true, "Save") - toolBar().insertButton(icons.loadIcon("editcut", KDE::Icon::Toolbar), TOOLBAR_CUT, SIGNAL("clicked(int)"), - self, SLOT('slotCut()'), true, "Cut") - toolBar().insertButton(icons.loadIcon("editcopy", KDE::Icon::Toolbar), TOOLBAR_COPY, SIGNAL("clicked(int)"), - self, SLOT('slotCopy()'), true, "Copy") - toolBar().insertButton(icons.loadIcon("editpaste", KDE::Icon::Toolbar), TOOLBAR_PASTE, SIGNAL("clicked(int)"), - self, SLOT('slotPaste()'), true, "Paste") + toolBar().insertButton(icons.loadIcon("filenew", KDE::Icon::Toolbar), TOOLBAR_NEW, TQ_SIGNAL("clicked(int)"), + self, TQ_SLOT('slotNew()'), true, "New") + toolBar().insertButton(icons.loadIcon("fileopen", KDE::Icon::Toolbar), TOOLBAR_OPEN, TQ_SIGNAL("clicked(int)"), + self, TQ_SLOT('slotOpen()'), true, "Open") + toolBar().insertButton(icons.loadIcon("filesave", KDE::Icon::Toolbar), TOOLBAR_SAVE, TQ_SIGNAL("clicked(int)"), + self, TQ_SLOT('slotSave()'), true, "Save") + toolBar().insertButton(icons.loadIcon("editcut", KDE::Icon::Toolbar), TOOLBAR_CUT, TQ_SIGNAL("clicked(int)"), + self, TQ_SLOT('slotCut()'), true, "Cut") + toolBar().insertButton(icons.loadIcon("editcopy", KDE::Icon::Toolbar), TOOLBAR_COPY, TQ_SIGNAL("clicked(int)"), + self, TQ_SLOT('slotCopy()'), true, "Copy") + toolBar().insertButton(icons.loadIcon("editpaste", KDE::Icon::Toolbar), TOOLBAR_PASTE, TQ_SIGNAL("clicked(int)"), + self, TQ_SLOT('slotPaste()'), true, "Paste") end def initStatusBar() diff --git a/korundum/rubylib/templates/annotated/menuapp2.rb b/korundum/rubylib/templates/annotated/menuapp2.rb index f8778163..d471423e 100644 --- a/korundum/rubylib/templates/annotated/menuapp2.rb +++ b/korundum/rubylib/templates/annotated/menuapp2.rb @@ -87,22 +87,22 @@ class MainWin < KDE::MainWindow # where the code for the action is located # "File" menu items - @newAction = KDE::StdAction.openNew(self, SLOT("slotNew()"), actionCollection()) - @openAction = KDE::StdAction.open(self, SLOT("slotOpen()"), actionCollection()) - @saveAction = KDE::StdAction.save(self, SLOT("slotSave()"), actionCollection()) - @saveAsAction = KDE::StdAction.saveAs(self, SLOT("slotSaveAs()"), actionCollection()) - @printAction = KDE::StdAction.print(self, SLOT("slotPrint()"), actionCollection()) - @quitAction = KDE::StdAction.quit(self, SLOT("slotQuit()"), actionCollection()) + @newAction = KDE::StdAction.openNew(self, TQ_SLOT("slotNew()"), actionCollection()) + @openAction = KDE::StdAction.open(self, TQ_SLOT("slotOpen()"), actionCollection()) + @saveAction = KDE::StdAction.save(self, TQ_SLOT("slotSave()"), actionCollection()) + @saveAsAction = KDE::StdAction.saveAs(self, TQ_SLOT("slotSaveAs()"), actionCollection()) + @printAction = KDE::StdAction.print(self, TQ_SLOT("slotPrint()"), actionCollection()) + @quitAction = KDE::StdAction.quit(self, TQ_SLOT("slotQuit()"), actionCollection()) # "Edit" menu items - @undoAction = KDE::StdAction.undo(self, SLOT("slotUndo()"), actionCollection()) - @redoAction = KDE::StdAction.redo(self, SLOT("slotRedo()"), actionCollection()) - @cutAction = KDE::StdAction.cut(self, SLOT("slotCut()"), actionCollection()) - @copyAction = KDE::StdAction.copy(self, SLOT("slotCopy()"), actionCollection()) - @pasteAction = KDE::StdAction.paste(self, SLOT("slotPaste()"), actionCollection()) - @findAction = KDE::StdAction.find(self, SLOT("slotFind()"), actionCollection()) - @findNextAction = KDE::StdAction.findNext(self, SLOT("slotFindNext()"), actionCollection()) - @replaceAction = KDE::StdAction.replace(self, SLOT("slotReplace()"), actionCollection()) + @undoAction = KDE::StdAction.undo(self, TQ_SLOT("slotUndo()"), actionCollection()) + @redoAction = KDE::StdAction.redo(self, TQ_SLOT("slotRedo()"), actionCollection()) + @cutAction = KDE::StdAction.cut(self, TQ_SLOT("slotCut()"), actionCollection()) + @copyAction = KDE::StdAction.copy(self, TQ_SLOT("slotCopy()"), actionCollection()) + @pasteAction = KDE::StdAction.paste(self, TQ_SLOT("slotPaste()"), actionCollection()) + @findAction = KDE::StdAction.find(self, TQ_SLOT("slotFind()"), actionCollection()) + @findNextAction = KDE::StdAction.findNext(self, TQ_SLOT("slotFindNext()"), actionCollection()) + @replaceAction = KDE::StdAction.replace(self, TQ_SLOT("slotReplace()"), actionCollection()) # For actions that are not "standard", you can create your # own actions using KDE::Action. This example doesn't include @@ -114,7 +114,7 @@ class MainWin < KDE::MainWindow # This TDEAction constructor requires a string, an accelerator (0 # in this case), a slot, and a TQObject (None in this case) - @specialAction = KDE::Action.new(i18n("Special"), KDE::Shortcut.new(0), self, SLOT('slotSpecial()'), actionCollection(), "specialActionName") + @specialAction = KDE::Action.new(i18n("Special"), KDE::Shortcut.new(0), self, TQ_SLOT('slotSpecial()'), actionCollection(), "specialActionName") end def initMenus() diff --git a/korundum/rubylib/templates/annotated/menuapp3.rb b/korundum/rubylib/templates/annotated/menuapp3.rb index 37fbf2b4..f1b76940 100644 --- a/korundum/rubylib/templates/annotated/menuapp3.rb +++ b/korundum/rubylib/templates/annotated/menuapp3.rb @@ -96,29 +96,29 @@ class MainWin < KDE::MainWindow # in the toolBar. # "File" menu items - @newAction = KDE::StdAction.openNew(self, SLOT("slotNew()"), actionCollection()) - @openAction = KDE::StdAction.open(self, SLOT("slotOpen()"), actionCollection()) - @saveAction = KDE::StdAction.save(self, SLOT("slotSave()"), actionCollection()) - @saveAsAction = KDE::StdAction.saveAs(self, SLOT("slotSaveAs()"), actionCollection()) - @printAction = KDE::StdAction.print(self, SLOT("slotPrint()"), actionCollection()) - @quitAction = KDE::StdAction.quit(self, SLOT("slotQuit()"), actionCollection()) + @newAction = KDE::StdAction.openNew(self, TQ_SLOT("slotNew()"), actionCollection()) + @openAction = KDE::StdAction.open(self, TQ_SLOT("slotOpen()"), actionCollection()) + @saveAction = KDE::StdAction.save(self, TQ_SLOT("slotSave()"), actionCollection()) + @saveAsAction = KDE::StdAction.saveAs(self, TQ_SLOT("slotSaveAs()"), actionCollection()) + @printAction = KDE::StdAction.print(self, TQ_SLOT("slotPrint()"), actionCollection()) + @quitAction = KDE::StdAction.quit(self, TQ_SLOT("slotQuit()"), actionCollection()) # "Edit" menu items - @undoAction = KDE::StdAction.undo(self, SLOT("slotUndo()"), actionCollection()) - @redoAction = KDE::StdAction.redo(self, SLOT("slotRedo()"), actionCollection()) - @cutAction = KDE::StdAction.cut(self, SLOT("slotCut()"), actionCollection()) - @copyAction = KDE::StdAction.copy(self, SLOT("slotCopy()"), actionCollection()) - @pasteAction = KDE::StdAction.paste(self, SLOT("slotPaste()"), actionCollection()) - @findAction = KDE::StdAction.find(self, SLOT("slotFind()"), actionCollection()) - @findNextAction = KDE::StdAction.findNext(self, SLOT("slotFindNext()"), actionCollection()) - @replaceAction = KDE::StdAction.replace(self, SLOT("slotReplace()"), actionCollection()) + @undoAction = KDE::StdAction.undo(self, TQ_SLOT("slotUndo()"), actionCollection()) + @redoAction = KDE::StdAction.redo(self, TQ_SLOT("slotRedo()"), actionCollection()) + @cutAction = KDE::StdAction.cut(self, TQ_SLOT("slotCut()"), actionCollection()) + @copyAction = KDE::StdAction.copy(self, TQ_SLOT("slotCopy()"), actionCollection()) + @pasteAction = KDE::StdAction.paste(self, TQ_SLOT("slotPaste()"), actionCollection()) + @findAction = KDE::StdAction.find(self, TQ_SLOT("slotFind()"), actionCollection()) + @findNextAction = KDE::StdAction.findNext(self, TQ_SLOT("slotFindNext()"), actionCollection()) + @replaceAction = KDE::StdAction.replace(self, TQ_SLOT("slotReplace()"), actionCollection()) # For ANYTHING constructed from KDE::Action or its descendants (KDE::ActionMenu, KDE::ActionSeparator, # KDE::FontAction, etc) you MUST provide the actionCollection () parent and an object # name ("specialActionName") or the XMLGUI mechanism will not be able to locate the # action. XMLGUI finds the action via its member name value, NOT via its variable name. - @specialAction = KDE::Action.new(i18n("Special"), KDE::Shortcut.new(0), self, SLOT('slotSpecial()'), actionCollection(), "specialActionName") + @specialAction = KDE::Action.new(i18n("Special"), KDE::Shortcut.new(0), self, TQ_SLOT('slotSpecial()'), actionCollection(), "specialActionName") end def initStatusBar() diff --git a/korundum/rubylib/templates/annotated/systray1.rb b/korundum/rubylib/templates/annotated/systray1.rb index 10bdb5c8..1945fa9e 100644 --- a/korundum/rubylib/templates/annotated/systray1.rb +++ b/korundum/rubylib/templates/annotated/systray1.rb @@ -60,7 +60,7 @@ class MainWin < KDE::MainWindow # KDE::SystemTray hides or shows its parent when the system tray icon is clicked systray = KDE::SystemTray.new(self) systray.setPixmap(icons.loadIcon("process-stop", 0)) - connect(systray, SIGNAL("quitSelected()"), self, SLOT('slotQuitSelected()')) + connect(systray, TQ_SIGNAL("quitSelected()"), self, TQ_SLOT('slotQuitSelected()')) systray.show() end diff --git a/korundum/rubylib/templates/basic/menuapp1.rb b/korundum/rubylib/templates/basic/menuapp1.rb index 69902534..6037376b 100644 --- a/korundum/rubylib/templates/basic/menuapp1.rb +++ b/korundum/rubylib/templates/basic/menuapp1.rb @@ -71,31 +71,31 @@ class MainWin < KDE::MainWindow fileMenu = TQt::PopupMenu.new(self) # "File" menu items - fileMenu.insertItem(i18n("New"), self, SLOT('slotNew()'), TQt::KeySequence.new(KDE::StdAccel.openNew().keyCodeQt())) - fileMenu.insertItem(i18n("Open"), self, SLOT('slotOpen()'), TQt::KeySequence.new(KDE::StdAccel.open().keyCodeQt())) + fileMenu.insertItem(i18n("New"), self, TQ_SLOT('slotNew()'), TQt::KeySequence.new(KDE::StdAccel.openNew().keyCodeQt())) + fileMenu.insertItem(i18n("Open"), self, TQ_SLOT('slotOpen()'), TQt::KeySequence.new(KDE::StdAccel.open().keyCodeQt())) fileMenu.insertSeparator() - fileMenu.insertItem(i18n("Save"), self, SLOT('slotSave()'), TQt::KeySequence.new(KDE::StdAccel.save().keyCodeQt())) - fileMenu.insertItem(i18n("SaveAs"), self, SLOT('slotSaveAs()')) + fileMenu.insertItem(i18n("Save"), self, TQ_SLOT('slotSave()'), TQt::KeySequence.new(KDE::StdAccel.save().keyCodeQt())) + fileMenu.insertItem(i18n("SaveAs"), self, TQ_SLOT('slotSaveAs()')) fileMenu.insertSeparator() - fileMenu.insertItem(i18n("Print"), self, SLOT('slotPrint()'), TQt::KeySequence.new(KDE::StdAccel.print().keyCodeQt())) + fileMenu.insertItem(i18n("Print"), self, TQ_SLOT('slotPrint()'), TQt::KeySequence.new(KDE::StdAccel.print().keyCodeQt())) fileMenu.insertSeparator() - fileMenu.insertItem(i18n("&Quit"), self, SLOT('slotQuit()'), TQt::KeySequence.new(KDE::StdAccel.quit().keyCodeQt())) + fileMenu.insertItem(i18n("&Quit"), self, TQ_SLOT('slotQuit()'), TQt::KeySequence.new(KDE::StdAccel.quit().keyCodeQt())) menuBar().insertItem(i18n("&File"), fileMenu) editMenu = TQt::PopupMenu.new(self) # "Edit" menu items - editMenu.insertItem(i18n("Undo"), self, SLOT('slotUndo()'), TQt::KeySequence.new(KDE::StdAccel.undo().keyCodeQt())) - editMenu.insertItem(i18n("Redo"), self, SLOT('slotRedo()'), TQt::KeySequence.new(KDE::StdAccel.redo().keyCodeQt())) + editMenu.insertItem(i18n("Undo"), self, TQ_SLOT('slotUndo()'), TQt::KeySequence.new(KDE::StdAccel.undo().keyCodeQt())) + editMenu.insertItem(i18n("Redo"), self, TQ_SLOT('slotRedo()'), TQt::KeySequence.new(KDE::StdAccel.redo().keyCodeQt())) editMenu.insertSeparator() - editMenu.insertItem(i18n("Cut"), self, SLOT('slotCut()'), TQt::KeySequence.new(KDE::StdAccel.cut().keyCodeQt())) - editMenu.insertItem(i18n("Copy"), self, SLOT('slotCopy()'), TQt::KeySequence.new(KDE::StdAccel.copy().keyCodeQt())) - editMenu.insertItem(i18n("Paste"), self, SLOT('slotPaste()'), TQt::KeySequence.new(KDE::StdAccel.paste().keyCodeQt())) + editMenu.insertItem(i18n("Cut"), self, TQ_SLOT('slotCut()'), TQt::KeySequence.new(KDE::StdAccel.cut().keyCodeQt())) + editMenu.insertItem(i18n("Copy"), self, TQ_SLOT('slotCopy()'), TQt::KeySequence.new(KDE::StdAccel.copy().keyCodeQt())) + editMenu.insertItem(i18n("Paste"), self, TQ_SLOT('slotPaste()'), TQt::KeySequence.new(KDE::StdAccel.paste().keyCodeQt())) editMenu.insertSeparator() - editMenu.insertItem(i18n("Find"), self, SLOT('slotFind()'), TQt::KeySequence.new(KDE::StdAccel.find().keyCodeQt())) - editMenu.insertItem(i18n("Find Next"), self, SLOT('slotFindNext()'), TQt::KeySequence.new(KDE::StdAccel.findNext().keyCodeQt())) - editMenu.insertItem(i18n("Replace"), self, SLOT('slotReplace()'), TQt::KeySequence.new(KDE::StdAccel.replace().keyCodeQt())) + editMenu.insertItem(i18n("Find"), self, TQ_SLOT('slotFind()'), TQt::KeySequence.new(KDE::StdAccel.find().keyCodeQt())) + editMenu.insertItem(i18n("Find Next"), self, TQ_SLOT('slotFindNext()'), TQt::KeySequence.new(KDE::StdAccel.findNext().keyCodeQt())) + editMenu.insertItem(i18n("Replace"), self, TQ_SLOT('slotReplace()'), TQt::KeySequence.new(KDE::StdAccel.replace().keyCodeQt())) menuBar().insertItem(i18n("&Edit"), editMenu) @@ -106,18 +106,18 @@ class MainWin < KDE::MainWindow def initToolBar() icons = KDE::IconLoader.new() - toolBar().insertButton(icons.loadIcon("filenew", KDE::Icon::Toolbar), TOOLBAR_NEW, SIGNAL("clicked(int)"), - self, SLOT('slotNew()'), true, "New") - toolBar().insertButton(icons.loadIcon("fileopen", KDE::Icon::Toolbar), TOOLBAR_OPEN, SIGNAL("clicked(int)"), - self, SLOT('slotOpen()'), true, "Open") - toolBar().insertButton(icons.loadIcon("filesave", KDE::Icon::Toolbar), TOOLBAR_SAVE, SIGNAL("clicked(int)"), - self, SLOT('slotSave()'), true, "Save") - toolBar().insertButton(icons.loadIcon("editcut", KDE::Icon::Toolbar), TOOLBAR_CUT, SIGNAL("clicked(int)"), - self, SLOT('slotCut()'), true, "Cut") - toolBar().insertButton(icons.loadIcon("editcopy", KDE::Icon::Toolbar), TOOLBAR_COPY, SIGNAL("clicked(int)"), - self, SLOT('slotCopy()'), true, "Copy") - toolBar().insertButton(icons.loadIcon("editpaste", KDE::Icon::Toolbar), TOOLBAR_PASTE, SIGNAL("clicked(int)"), - self, SLOT('slotPaste()'), true, "Paste") + toolBar().insertButton(icons.loadIcon("filenew", KDE::Icon::Toolbar), TOOLBAR_NEW, TQ_SIGNAL("clicked(int)"), + self, TQ_SLOT('slotNew()'), true, "New") + toolBar().insertButton(icons.loadIcon("fileopen", KDE::Icon::Toolbar), TOOLBAR_OPEN, TQ_SIGNAL("clicked(int)"), + self, TQ_SLOT('slotOpen()'), true, "Open") + toolBar().insertButton(icons.loadIcon("filesave", KDE::Icon::Toolbar), TOOLBAR_SAVE, TQ_SIGNAL("clicked(int)"), + self, TQ_SLOT('slotSave()'), true, "Save") + toolBar().insertButton(icons.loadIcon("editcut", KDE::Icon::Toolbar), TOOLBAR_CUT, TQ_SIGNAL("clicked(int)"), + self, TQ_SLOT('slotCut()'), true, "Cut") + toolBar().insertButton(icons.loadIcon("editcopy", KDE::Icon::Toolbar), TOOLBAR_COPY, TQ_SIGNAL("clicked(int)"), + self, TQ_SLOT('slotCopy()'), true, "Copy") + toolBar().insertButton(icons.loadIcon("editpaste", KDE::Icon::Toolbar), TOOLBAR_PASTE, TQ_SIGNAL("clicked(int)"), + self, TQ_SLOT('slotPaste()'), true, "Paste") end def initStatusBar() diff --git a/korundum/rubylib/templates/basic/menuapp2.rb b/korundum/rubylib/templates/basic/menuapp2.rb index df1cadb2..67be6f84 100644 --- a/korundum/rubylib/templates/basic/menuapp2.rb +++ b/korundum/rubylib/templates/basic/menuapp2.rb @@ -63,23 +63,23 @@ class MainWin < KDE::MainWindow def initActions() # "File" menu items - @newAction = KDE::StdAction.openNew(self, SLOT("slotNew()"), actionCollection()) - @openAction = KDE::StdAction.open(self, SLOT("slotOpen()"), actionCollection()) - @saveAction = KDE::StdAction.save(self, SLOT("slotSave()"), actionCollection()) - @saveAsAction = KDE::StdAction.saveAs(self, SLOT("slotSaveAs()"), actionCollection()) - @printAction = KDE::StdAction.print(self, SLOT("slotPrint()"), actionCollection()) - @quitAction = KDE::StdAction.quit(self, SLOT("slotQuit()"), actionCollection()) + @newAction = KDE::StdAction.openNew(self, TQ_SLOT("slotNew()"), actionCollection()) + @openAction = KDE::StdAction.open(self, TQ_SLOT("slotOpen()"), actionCollection()) + @saveAction = KDE::StdAction.save(self, TQ_SLOT("slotSave()"), actionCollection()) + @saveAsAction = KDE::StdAction.saveAs(self, TQ_SLOT("slotSaveAs()"), actionCollection()) + @printAction = KDE::StdAction.print(self, TQ_SLOT("slotPrint()"), actionCollection()) + @quitAction = KDE::StdAction.quit(self, TQ_SLOT("slotQuit()"), actionCollection()) # "Edit" menu items - @undoAction = KDE::StdAction.undo(self, SLOT("slotUndo()"), actionCollection()) - @redoAction = KDE::StdAction.redo(self, SLOT("slotRedo()"), actionCollection()) - @cutAction = KDE::StdAction.cut(self, SLOT("slotCut()"), actionCollection()) - @copyAction = KDE::StdAction.copy(self, SLOT("slotCopy()"), actionCollection()) - @pasteAction = KDE::StdAction.paste(self, SLOT("slotPaste()"), actionCollection()) - @findAction = KDE::StdAction.find(self, SLOT("slotFind()"), actionCollection()) - @findNextAction = KDE::StdAction.findNext(self, SLOT("slotFindNext()"), actionCollection()) - @replaceAction = KDE::StdAction.replace(self, SLOT("slotReplace()"), actionCollection()) - @specialAction = KDE::Action.new(i18n("Special"), KDE::Shortcut.new(0), self, SLOT('slotSpecial()'), actionCollection(), "specialActionName") + @undoAction = KDE::StdAction.undo(self, TQ_SLOT("slotUndo()"), actionCollection()) + @redoAction = KDE::StdAction.redo(self, TQ_SLOT("slotRedo()"), actionCollection()) + @cutAction = KDE::StdAction.cut(self, TQ_SLOT("slotCut()"), actionCollection()) + @copyAction = KDE::StdAction.copy(self, TQ_SLOT("slotCopy()"), actionCollection()) + @pasteAction = KDE::StdAction.paste(self, TQ_SLOT("slotPaste()"), actionCollection()) + @findAction = KDE::StdAction.find(self, TQ_SLOT("slotFind()"), actionCollection()) + @findNextAction = KDE::StdAction.findNext(self, TQ_SLOT("slotFindNext()"), actionCollection()) + @replaceAction = KDE::StdAction.replace(self, TQ_SLOT("slotReplace()"), actionCollection()) + @specialAction = KDE::Action.new(i18n("Special"), KDE::Shortcut.new(0), self, TQ_SLOT('slotSpecial()'), actionCollection(), "specialActionName") end def initMenus() diff --git a/korundum/rubylib/templates/basic/menuapp3.rb b/korundum/rubylib/templates/basic/menuapp3.rb index 7751e847..86deb9c8 100644 --- a/korundum/rubylib/templates/basic/menuapp3.rb +++ b/korundum/rubylib/templates/basic/menuapp3.rb @@ -59,24 +59,24 @@ class MainWin < KDE::MainWindow def initActions() # "File" menu items - @newAction = KDE::StdAction.openNew(self, SLOT("slotNew()"), actionCollection()) - @openAction = KDE::StdAction.open(self, SLOT("slotOpen()"), actionCollection()) - @saveAction = KDE::StdAction.save(self, SLOT("slotSave()"), actionCollection()) - @saveAsAction = KDE::StdAction.saveAs(self, SLOT("slotSaveAs()"), actionCollection()) - @printAction = KDE::StdAction.print(self, SLOT("slotPrint()"), actionCollection()) - @quitAction = KDE::StdAction.quit(self, SLOT("slotQuit()"), actionCollection()) + @newAction = KDE::StdAction.openNew(self, TQ_SLOT("slotNew()"), actionCollection()) + @openAction = KDE::StdAction.open(self, TQ_SLOT("slotOpen()"), actionCollection()) + @saveAction = KDE::StdAction.save(self, TQ_SLOT("slotSave()"), actionCollection()) + @saveAsAction = KDE::StdAction.saveAs(self, TQ_SLOT("slotSaveAs()"), actionCollection()) + @printAction = KDE::StdAction.print(self, TQ_SLOT("slotPrint()"), actionCollection()) + @quitAction = KDE::StdAction.quit(self, TQ_SLOT("slotQuit()"), actionCollection()) # "Edit" menu items - @undoAction = KDE::StdAction.undo(self, SLOT("slotUndo()"), actionCollection()) - @redoAction = KDE::StdAction.redo(self, SLOT("slotRedo()"), actionCollection()) - @cutAction = KDE::StdAction.cut(self, SLOT("slotCut()"), actionCollection()) - @copyAction = KDE::StdAction.copy(self, SLOT("slotCopy()"), actionCollection()) - @pasteAction = KDE::StdAction.paste(self, SLOT("slotPaste()"), actionCollection()) - @findAction = KDE::StdAction.find(self, SLOT("slotFind()"), actionCollection()) - @findNextAction = KDE::StdAction.findNext(self, SLOT("slotFindNext()"), actionCollection()) - @replaceAction = KDE::StdAction.replace(self, SLOT("slotReplace()"), actionCollection()) - @specialAction = KDE::Action.new(i18n("Special"), KDE::Shortcut.new(0), self, SLOT('slotSpecial()'), actionCollection(), "specialActionName") + @undoAction = KDE::StdAction.undo(self, TQ_SLOT("slotUndo()"), actionCollection()) + @redoAction = KDE::StdAction.redo(self, TQ_SLOT("slotRedo()"), actionCollection()) + @cutAction = KDE::StdAction.cut(self, TQ_SLOT("slotCut()"), actionCollection()) + @copyAction = KDE::StdAction.copy(self, TQ_SLOT("slotCopy()"), actionCollection()) + @pasteAction = KDE::StdAction.paste(self, TQ_SLOT("slotPaste()"), actionCollection()) + @findAction = KDE::StdAction.find(self, TQ_SLOT("slotFind()"), actionCollection()) + @findNextAction = KDE::StdAction.findNext(self, TQ_SLOT("slotFindNext()"), actionCollection()) + @replaceAction = KDE::StdAction.replace(self, TQ_SLOT("slotReplace()"), actionCollection()) + @specialAction = KDE::Action.new(i18n("Special"), KDE::Shortcut.new(0), self, TQ_SLOT('slotSpecial()'), actionCollection(), "specialActionName") end def initStatusBar() diff --git a/korundum/rubylib/templates/basic/systray1.rb b/korundum/rubylib/templates/basic/systray1.rb index b3a91155..e760caa4 100644 --- a/korundum/rubylib/templates/basic/systray1.rb +++ b/korundum/rubylib/templates/basic/systray1.rb @@ -45,7 +45,7 @@ class MainWin < KDE::MainWindow systray = KDE::SystemTray.new(self) systray.setPixmap(icons.loadIcon("process-stop", 0)) - connect(systray, SIGNAL("quitSelected()"), self, SLOT('slotQuitSelected()')) + connect(systray, TQ_SIGNAL("quitSelected()"), self, TQ_SLOT('slotQuitSelected()')) systray.show() end diff --git a/korundum/rubylib/tutorials/p1/p1.rb b/korundum/rubylib/tutorials/p1/p1.rb index f06c6b3e..a32edb7a 100644 --- a/korundum/rubylib/tutorials/p1/p1.rb +++ b/korundum/rubylib/tutorials/p1/p1.rb @@ -5,7 +5,7 @@ require 'Qt' hello = TQt::PushButton.new( "Hello world!", nil )
hello.resize( 100, 30 )
- TQt::Object::connect( hello, SIGNAL('clicked()'), a, SLOT('quit()') )
+ TQt::Object::connect( hello, TQ_SIGNAL('clicked()'), a, TQ_SLOT('quit()') )
a.setMainWidget( hello )
hello.show()
diff --git a/korundum/rubylib/tutorials/p3/p3.rb b/korundum/rubylib/tutorials/p3/p3.rb index 67360399..94940d59 100644 --- a/korundum/rubylib/tutorials/p3/p3.rb +++ b/korundum/rubylib/tutorials/p3/p3.rb @@ -8,9 +8,9 @@ class MainWindow < KDE::MainWindow setCaption("KDE Tutorial - p3")
filemenu = TQt::PopupMenu.new
- filemenu.insertItem( i18n( "&Open" ), self, SLOT('fileOpen()') )
- filemenu.insertItem( i18n( "&Save" ), self, SLOT('fileSave()') )
- filemenu.insertItem( i18n( "&Quit" ), $kapp, SLOT('quit()') )
+ filemenu.insertItem( i18n( "&Open" ), self, TQ_SLOT('fileOpen()') )
+ filemenu.insertItem( i18n( "&Save" ), self, TQ_SLOT('fileSave()') )
+ filemenu.insertItem( i18n( "&Quit" ), $kapp, TQ_SLOT('quit()') )
about =
i18n("p3 1.0\n\n" +
diff --git a/korundum/rubylib/tutorials/p4/p4.rb b/korundum/rubylib/tutorials/p4/p4.rb index 93306c86..8025a585 100644 --- a/korundum/rubylib/tutorials/p4/p4.rb +++ b/korundum/rubylib/tutorials/p4/p4.rb @@ -9,7 +9,7 @@ class MainWindow < KDE::MainWindow setCaption("KDE Tutorial - p4")
filemenu = TQt::PopupMenu.new
- filemenu.insertItem( i18n( "&Quit" ), $kapp, SLOT( 'quit()' ) )
+ filemenu.insertItem( i18n( "&Quit" ), $kapp, TQ_SLOT( 'quit()' ) )
about =
i18n("p4 1.0\n\n" +
"(C) 1999-2002 Antonio Larrosa Jimenez\n" +
@@ -34,12 +34,12 @@ class MainWindow < KDE::MainWindow @browser = KDE::HTMLPart.new( vbox )
@browser.openURL( KDE::URL.new(@location.text()) )
- connect( @location , SIGNAL( 'returnPressed()' ),
- self, SLOT( 'changeLocation()' ) )
+ connect( @location , TQ_SIGNAL( 'returnPressed()' ),
+ self, TQ_SLOT( 'changeLocation()' ) )
connect( @browser.browserExtension(),
- SIGNAL( 'openURLRequest( const KURL &, const KParts::URLArgs & )' ),
- self, SLOT( 'openURLRequest(const KURL &, const KParts::URLArgs & )' ) )
+ TQ_SIGNAL( 'openURLRequest( const KURL &, const KParts::URLArgs & )' ),
+ self, TQ_SLOT( 'openURLRequest(const KURL &, const KParts::URLArgs & )' ) )
setCentralWidget(vbox)
end
diff --git a/korundum/rubylib/tutorials/p5/p5.rb b/korundum/rubylib/tutorials/p5/p5.rb index 40fb91a5..0325aa37 100644 --- a/korundum/rubylib/tutorials/p5/p5.rb +++ b/korundum/rubylib/tutorials/p5/p5.rb @@ -10,7 +10,7 @@ class MainWindow < KDE::MainWindow setCaption("KDE Tutorial - p5")
filemenu = TQt::PopupMenu.new
- filemenu.insertItem( i18n( "&Quit" ), $kapp, SLOT( 'quit()' ) )
+ filemenu.insertItem( i18n( "&Quit" ), $kapp, TQ_SLOT( 'quit()' ) )
about =
i18n("p5 1.0\n\n" +
"(C) 1999-2002 Antonio Larrosa Jimenez\n" +
@@ -32,22 +32,22 @@ class MainWindow < KDE::MainWindow @location = TQt::LineEdit.new( vbox )
@location.setText( "http://localhost" )
- connect( @location , SIGNAL( 'returnPressed()' ),
- self, SLOT( 'changeLocation()' ) )
+ connect( @location , TQ_SIGNAL( 'returnPressed()' ),
+ self, TQ_SLOT( 'changeLocation()' ) )
split = TQt::Splitter.new( vbox )
split.setOpaqueResize()
bookmark = TQt::PushButton.new( i18n("Add to Bookmarks"), split );
- connect( bookmark, SIGNAL( 'clicked()' ), self, SLOT( 'bookLocation()' ) )
+ connect( bookmark, TQ_SIGNAL( 'clicked()' ), self, TQ_SLOT( 'bookLocation()' ) )
@browser = KDE::HTMLPart.new( split )
@browser.openURL( KDE::URL.new(@location.text()) )
connect( @browser.browserExtension(),
- SIGNAL( 'openURLRequest( const KURL &, const KParts::URLArgs & )' ),
- self, SLOT( 'openURLRequest(const KURL &, const KParts::URLArgs & )' ) )
+ TQ_SIGNAL( 'openURLRequest( const KURL &, const KParts::URLArgs & )' ),
+ self, TQ_SLOT( 'openURLRequest(const KURL &, const KParts::URLArgs & )' ) )
setCentralWidget(vbox)
end
diff --git a/korundum/rubylib/tutorials/p7/p7.rb b/korundum/rubylib/tutorials/p7/p7.rb index d567c22a..df657186 100644 --- a/korundum/rubylib/tutorials/p7/p7.rb +++ b/korundum/rubylib/tutorials/p7/p7.rb @@ -20,8 +20,8 @@ class Browser < KDE::MainWindow filemenu = TQt::PopupMenu.new
filemenu.insertItem( i18n( "&Set default page" ),
- self, SLOT( 'fileSetDefaultPage()' ) )
- filemenu.insertItem(i18n( "&Quit" ), $kapp, SLOT( 'quit()' ))
+ self, TQ_SLOT( 'fileSetDefaultPage()' ) )
+ filemenu.insertItem(i18n( "&Quit" ), $kapp, TQ_SLOT( 'quit()' ))
about =
i18n("p7 1.0\n\n" +
"(C) 1999-2002 Antonio Larrosa Jimenez\n" +
@@ -42,13 +42,13 @@ class Browser < KDE::MainWindow icons = KDE::IconLoader.new()
toolbar.insertButton(icons.loadIcon("reload", KDE::Icon::Toolbar), TOOLBAR_ID_ADDBOOKMARK,
- SIGNAL('clicked(int)'),self,SLOT('bookLocation()'),true,
+ TQ_SIGNAL('clicked(int)'),self,TQ_SLOT('bookLocation()'),true,
i18n("Add to Bookmarks"))
toolbar.insertButton(icons.loadIcon("back", KDE::Icon::Toolbar), TOOLBAR_ID_BACK,
- SIGNAL('clicked(int)'),self,SLOT('gotoPreviousPage()'),
+ TQ_SIGNAL('clicked(int)'),self,TQ_SLOT('gotoPreviousPage()'),
false, i18n("Back to previous page"))
toolbar.insertButton(icons.loadIcon("system-log-out", KDE::Icon::Toolbar), TOOLBAR_ID_QUIT,
- SIGNAL('clicked(int)'),$kapp,SLOT('quit()'),true,
+ TQ_SIGNAL('clicked(int)'),$kapp,TQ_SLOT('quit()'),true,
i18n("Quit the application"))
addToolBar(toolbar)
@@ -60,8 +60,8 @@ class Browser < KDE::MainWindow config.setGroup("Settings")
@location.text = config.readEntry( "defaultPage", "http://localhost")
- connect( @location , SIGNAL( 'returnPressed()' ),
- self, SLOT( 'changeLocation()' ) )
+ connect( @location , TQ_SIGNAL( 'returnPressed()' ),
+ self, TQ_SLOT( 'changeLocation()' ) )
split = TQt::Splitter.new( vbox )
split.setOpaqueResize()
@@ -70,8 +70,8 @@ class Browser < KDE::MainWindow @browser.openURL( KDE::URL.new(@location.text()) )
connect( @browser.browserExtension(),
- SIGNAL( 'openURLRequest( const KURL&, const KParts::URLArgs& )' ),
- self, SLOT( 'openURLRequest(const KURL&, const KParts::URLArgs& )' ) )
+ TQ_SIGNAL( 'openURLRequest( const KURL&, const KParts::URLArgs& )' ),
+ self, TQ_SLOT( 'openURLRequest(const KURL&, const KParts::URLArgs& )' ) )
setCentralWidget(vbox)
end
diff --git a/korundum/rubylib/tutorials/p8/p8.rb b/korundum/rubylib/tutorials/p8/p8.rb index 1839e697..1f39f0e0 100644 --- a/korundum/rubylib/tutorials/p8/p8.rb +++ b/korundum/rubylib/tutorials/p8/p8.rb @@ -8,8 +8,8 @@ class BookMarkList < KDE::ListView def initialize()
super(nil, "Bookmarks")
addColumn( i18n("My Bookmarks") );
- connect( self, SIGNAL('clicked(TQListViewItem *)'),
- self, SLOT('setURLInBrowser(TQListViewItem *)'))
+ connect( self, TQ_SIGNAL('clicked(TQListViewItem *)'),
+ self, TQ_SLOT('setURLInBrowser(TQListViewItem *)'))
end
def add( s )
diff --git a/korundum/rubylib/tutorials/p9/p9.rb b/korundum/rubylib/tutorials/p9/p9.rb index e395e19c..0f54394c 100644 --- a/korundum/rubylib/tutorials/p9/p9.rb +++ b/korundum/rubylib/tutorials/p9/p9.rb @@ -13,16 +13,16 @@ class Browser < KDE::MainWindow super(nil, name)
@history = []
- KDE::StdAction.quit(self, SLOT('close()'), actionCollection())
+ KDE::StdAction.quit(self, TQ_SLOT('close()'), actionCollection())
KDE::Action.new(i18n("&Set default page"), "gohome", KDE::Shortcut.new(0), self,
- SLOT('fileSetDefaultPage()'), actionCollection(), "set_default_page")
+ TQ_SLOT('fileSetDefaultPage()'), actionCollection(), "set_default_page")
KDE::Action.new(i18n("Add to Bookmarks"), "reload", KDE::Shortcut.new(0), self,
- SLOT('bookLocation()'), actionCollection(), "add_to_bookmarks")
+ TQ_SLOT('bookLocation()'), actionCollection(), "add_to_bookmarks")
KDE::Action.new(i18n("Back to previous page"), "back", KDE::Shortcut.new(0), self,
- SLOT('gotoPreviousPage()'), actionCollection(), "back")
+ TQ_SLOT('gotoPreviousPage()'), actionCollection(), "back")
actionCollection().action("back").setEnabled(false)
@@ -36,15 +36,15 @@ class Browser < KDE::MainWindow config.setGroup("Settings")
@location.text = config.readEntry( "defaultPage", "http://localhost")
- connect( @location , SIGNAL( 'returnPressed()' ),
- self, SLOT( 'changeLocation()' ) )
+ connect( @location , TQ_SIGNAL( 'returnPressed()' ),
+ self, TQ_SLOT( 'changeLocation()' ) )
@browser = KDE::HTMLPart.new( vbox )
@browser.openURL( KDE::URL.new(@location.text()) )
connect( @browser.browserExtension(),
- SIGNAL( 'openURLRequest( const KURL&, const KParts::URLArgs& )' ),
- self, SLOT( 'openURLRequest(const KURL&, const KParts::URLArgs& )' ) )
+ TQ_SIGNAL( 'openURLRequest( const KURL&, const KParts::URLArgs& )' ),
+ self, TQ_SLOT( 'openURLRequest(const KURL&, const KParts::URLArgs& )' ) )
setCentralWidget(vbox)
end
diff --git a/qtjava/designer/juic/java/definitions.xsl b/qtjava/designer/juic/java/definitions.xsl index f04fbd62..94653074 100644 --- a/qtjava/designer/juic/java/definitions.xsl +++ b/qtjava/designer/juic/java/definitions.xsl @@ -631,9 +631,9 @@ </xsl:variable> <xsl:value-of select="$nlIndent8"/> <xsl:value-of select="concat('connect( ', $sender, - ', SIGNAL( "', $signal, '" ), ', + ', TQ_SIGNAL( "', $signal, '" ), ', $receiver, - ', SLOT( "', $slot, '" ));')"/> + ', TQ_SLOT( "', $slot, '" ));')"/> </xsl:template> </xsl:stylesheet> diff --git a/qtjava/designer/juic/java/methods.xsl b/qtjava/designer/juic/java/methods.xsl index b9e27e52..c8573a5e 100644 --- a/qtjava/designer/juic/java/methods.xsl +++ b/qtjava/designer/juic/java/methods.xsl @@ -156,7 +156,7 @@ <xsl:template name="putLanguageChangeSlot"> /** - * SLOT + * TQ_SLOT * languageChange sets the strings according to current language */ protected void languageChange() { diff --git a/qtjava/designer/juic/java/put.xsl b/qtjava/designer/juic/java/put.xsl index 884321dc..1bb36ddb 100644 --- a/qtjava/designer/juic/java/put.xsl +++ b/qtjava/designer/juic/java/put.xsl @@ -411,7 +411,7 @@ </xsl:if> <xsl:message>Generating slot "<xsl:value-of select="$method"/></xsl:message> /** - * SLOT <xsl:value-of select="$method"/> + * TQ_SLOT <xsl:value-of select="$method"/> */ <xsl:choose> <xsl:when test="$abstract"> @@ -419,7 +419,7 @@ </xsl:when> <xsl:otherwise> <xsl:value-of select="$method"/> { - tqWarning("Warning: SLOT \"<xsl:value-of select="$method"/>\" must be overridden"); + tqWarning("Warning: TQ_SLOT \"<xsl:value-of select="$method"/>\" must be overridden"); <xsl:if test="not($return = 'void')"> <xsl:choose> <xsl:when test="$return = 'byte' or $return = 'short' or $return = 'int' or $return = 'long'"> @@ -447,7 +447,7 @@ <xsl:template name="putSignal"> <xsl:param name="data"/> <xsl:variable name="sig" select="java:cpp-to-java-signature(.)"/> - /** SIGNAL <xsl:value-of select="."/> */ + /** TQ_SIGNAL <xsl:value-of select="."/> */ </xsl:template> <!-- diff --git a/qtjava/javalib/examples/aclock/AnalogClock.java b/qtjava/javalib/examples/aclock/AnalogClock.java index 8982ea34..99dd902a 100644 --- a/qtjava/javalib/examples/aclock/AnalogClock.java +++ b/qtjava/javalib/examples/aclock/AnalogClock.java @@ -30,7 +30,7 @@ public AnalogClock( TQWidget parent, String name ) super( parent, name ); time = new Date(); // get current time TQTimer internalTimer = new TQTimer( this ); // create internal timer - connect( internalTimer, SIGNAL("timeout()"), SLOT("timeout()") ); + connect( internalTimer, TQ_SIGNAL("timeout()"), TQ_SLOT("timeout()") ); internalTimer.start( 5000 ); // emit signal every 5 seconds } diff --git a/qtjava/javalib/examples/addressbook/ABCentralWidget.java b/qtjava/javalib/examples/addressbook/ABCentralWidget.java index d299f2f9..f579302a 100644 --- a/qtjava/javalib/examples/addressbook/ABCentralWidget.java +++ b/qtjava/javalib/examples/addressbook/ABCentralWidget.java @@ -106,7 +106,7 @@ public void setupTabWidget() add = new TQPushButton( "A&dd", input ); add.resize( add.sizeHint() ); grid1.addWidget( add, 0, 4 ); - connect( add, SIGNAL( "clicked()" ), this, SLOT( "addEntry()" ) ); + connect( add, TQ_SIGNAL( "clicked()" ), this, TQ_SLOT( "addEntry()" ) ); iFirstName = new TQLineEdit( input ); iFirstName.resize( iFirstName.sizeHint() ); @@ -131,7 +131,7 @@ public void setupTabWidget() change = new TQPushButton( "&Change", input ); change.resize( change.sizeHint() ); grid1.addWidget( change, 1, 4 ); - connect( change, SIGNAL( "clicked()" ), this, SLOT( "changeEntry()" ) ); + connect( change, TQ_SIGNAL( "clicked()" ), this, TQ_SLOT( "changeEntry()" ) ); tabWidget.addTab( input, "&Add/Change Entry" ); @@ -143,22 +143,22 @@ public void setupTabWidget() cFirstName = new TQCheckBox( "First &Name", search ); cFirstName.resize( cFirstName.sizeHint() ); grid2.addWidget( cFirstName, 0, 0 ); - connect( cFirstName, SIGNAL( "clicked()" ), this, SLOT( "toggleFirstName()" ) ); + connect( cFirstName, TQ_SIGNAL( "clicked()" ), this, TQ_SLOT( "toggleFirstName()" ) ); cLastName = new TQCheckBox( "&Last Name", search ); cLastName.resize( cLastName.sizeHint() ); grid2.addWidget( cLastName, 0, 1 ); - connect( cLastName, SIGNAL( "clicked()" ), this, SLOT( "toggleLastName()" ) ); + connect( cLastName, TQ_SIGNAL( "clicked()" ), this, TQ_SLOT( "toggleLastName()" ) ); cAddress = new TQCheckBox( "Add&ress", search ); cAddress.resize( cAddress.sizeHint() ); grid2.addWidget( cAddress, 0, 2 ); - connect( cAddress, SIGNAL( "clicked()" ), this, SLOT( "toggleAddress()" ) ); + connect( cAddress, TQ_SIGNAL( "clicked()" ), this, TQ_SLOT( "toggleAddress()" ) ); cEMail = new TQCheckBox( "&E-Mail", search ); cEMail.resize( cEMail.sizeHint() ); grid2.addWidget( cEMail, 0, 3 ); - connect( cEMail, SIGNAL( "clicked()" ), this, SLOT( "toggleEMail()" ) ); + connect( cEMail, TQ_SIGNAL( "clicked()" ), this, TQ_SLOT( "toggleEMail()" ) ); sFirstName = new TQLineEdit( search ); sFirstName.resize( sFirstName.sizeHint() ); @@ -179,7 +179,7 @@ public void setupTabWidget() find = new TQPushButton( "F&ind", search ); find.resize( find.sizeHint() ); grid2.addWidget( find, 1, 4 ); - connect( find, SIGNAL( "clicked()" ), this, SLOT( "findEntries()" ) ); + connect( find, TQ_SIGNAL( "clicked()" ), this, TQ_SLOT( "findEntries()" ) ); cFirstName.setChecked( true ); sFirstName.setEnabled( true ); @@ -202,7 +202,7 @@ public void setupListView() listView.setSelectionMode( TQListView.Extended ); - connect( listView, SIGNAL( "clicked( TQListViewItem )" ), this, SLOT( "itemSelected( TQListViewItem )" ) ); + connect( listView, TQ_SIGNAL( "clicked( TQListViewItem )" ), this, TQ_SLOT( "itemSelected( TQListViewItem )" ) ); mainGrid.addWidget( listView, 1, 0 ); listView.setAllColumnsShowFocus( true ); diff --git a/qtjava/javalib/examples/addressbook/ABMainWindow.java b/qtjava/javalib/examples/addressbook/ABMainWindow.java index 2574dbff..c3ebb401 100644 --- a/qtjava/javalib/examples/addressbook/ABMainWindow.java +++ b/qtjava/javalib/examples/addressbook/ABMainWindow.java @@ -30,16 +30,16 @@ public void setupMenuBar() TQPopupMenu file = new TQPopupMenu( this ); menuBar().insertItem( "&File", file ); - file.insertItem( "New", this, SLOT( "fileNew()" ), new TQKeySequence(CTRL + Key_N) ); - file.insertItem( new TQIconSet(new TQPixmap( "fileopen.xpm" )), "Open", this, SLOT( "fileOpen()" ), new TQKeySequence(CTRL + Key_O) ); + file.insertItem( "New", this, TQ_SLOT( "fileNew()" ), new TQKeySequence(CTRL + Key_N) ); + file.insertItem( new TQIconSet(new TQPixmap( "fileopen.xpm" )), "Open", this, TQ_SLOT( "fileOpen()" ), new TQKeySequence(CTRL + Key_O) ); file.insertSeparator(); - file.insertItem( new TQIconSet(new TQPixmap( "filesave.xpm" )), "Save", this, SLOT( "fileSave()" ), new TQKeySequence(CTRL + Key_S) ); - file.insertItem( "Save As...", this, SLOT( "fileSaveAs()" ) ); + file.insertItem( new TQIconSet(new TQPixmap( "filesave.xpm" )), "Save", this, TQ_SLOT( "fileSave()" ), new TQKeySequence(CTRL + Key_S) ); + file.insertItem( "Save As...", this, TQ_SLOT( "fileSaveAs()" ) ); file.insertSeparator(); - file.insertItem( new TQIconSet(new TQPixmap( "fileprint.xpm" )), "Print...", this, SLOT( "filePrint()" ), new TQKeySequence(CTRL + Key_P) ); + file.insertItem( new TQIconSet(new TQPixmap( "fileprint.xpm" )), "Print...", this, TQ_SLOT( "filePrint()" ), new TQKeySequence(CTRL + Key_P) ); file.insertSeparator(); - file.insertItem( "Close", this, SLOT( "closeWindow()" ), new TQKeySequence(CTRL + Key_W) ); - file.insertItem( "Quit", tqApp(), SLOT( "quit()" ), new TQKeySequence(CTRL + Key_Q) ); + file.insertItem( "Close", this, TQ_SLOT( "closeWindow()" ), new TQKeySequence(CTRL + Key_W) ); + file.insertItem( "Quit", tqApp(), TQ_SLOT( "quit()" ), new TQKeySequence(CTRL + Key_Q) ); } public void setupFileTools() diff --git a/qtjava/javalib/examples/addressbook/Main.java b/qtjava/javalib/examples/addressbook/Main.java index 696ec40d..d393a4fe 100644 --- a/qtjava/javalib/examples/addressbook/Main.java +++ b/qtjava/javalib/examples/addressbook/Main.java @@ -20,7 +20,7 @@ public static void main( String[] args ) a.setMainWidget( mw ); mw.show(); - a.connect( a, Qt.SIGNAL( "lastWindowClosed()" ), a, Qt.SLOT( "quit()" ) ); + a.connect( a, Qt.TQ_SIGNAL( "lastWindowClosed()" ), a, Qt.TQ_SLOT( "quit()" ) ); int result = a.exec(); return; } diff --git a/qtjava/javalib/examples/application/ApplicationWindow.java b/qtjava/javalib/examples/application/ApplicationWindow.java index 2c68a673..b6091fd3 100644 --- a/qtjava/javalib/examples/application/ApplicationWindow.java +++ b/qtjava/javalib/examples/application/ApplicationWindow.java @@ -102,30 +102,30 @@ public class ApplicationWindow extends TQMainWindow { fileQuitAction; fileNewAction = new TQAction("New", "&New", new TQKeySequence(CTRL+Key_N), this, "new", false); - connect(fileNewAction, SIGNAL("activated()"), this, SLOT("newDoc()")); + connect(fileNewAction, TQ_SIGNAL("activated()"), this, TQ_SLOT("newDoc()")); fileOpenAction = new TQAction("Open File", new TQIconSet(new TQPixmap(fileopen)), "&Open", new TQKeySequence(CTRL+Key_O), this, "open", false); - connect(fileOpenAction, SIGNAL("activated()"), this, SLOT("load()")); + connect(fileOpenAction, TQ_SIGNAL("activated()"), this, TQ_SLOT("load()")); TQMimeSourceFactory.defaultFactory().setPixmap("fileopen", new TQPixmap(fileopen)); fileOpenAction.setWhatsThis(fileOpenText); fileSaveAction = new TQAction("Save File", new TQIconSet(new TQPixmap(filesave)), "&Save", new TQKeySequence(CTRL+Key_S), this, "save", false); - connect(fileSaveAction, SIGNAL("activated()"), this, SLOT("save()")); + connect(fileSaveAction, TQ_SIGNAL("activated()"), this, TQ_SLOT("save()")); fileSaveAction.setWhatsThis(fileSaveText); fileSaveAsAction = new TQAction("Save File As", "Save &as", new TQKeySequence(), this, "save as", false); - connect(fileSaveAsAction, SIGNAL("activated()"), this, SLOT("saveAs()")); + connect(fileSaveAsAction, TQ_SIGNAL("activated()"), this, TQ_SLOT("saveAs()")); fileSaveAsAction.setWhatsThis(fileSaveText); filePrintAction = new TQAction("Print File", new TQIconSet(new TQPixmap(fileprint)), "&Print", new TQKeySequence(CTRL+Key_P), this, "print", false); - connect(filePrintAction, SIGNAL("activated()"), this, SLOT("print()")); + connect(filePrintAction, TQ_SIGNAL("activated()"), this, TQ_SLOT("print()")); filePrintAction.setWhatsThis(filePrintText); fileCloseAction = new TQAction("Close", "&Close", new TQKeySequence(CTRL+Key_W), this, "close", false); - connect(fileCloseAction, SIGNAL("activated()"), this, SLOT("close()")); + connect(fileCloseAction, TQ_SIGNAL("activated()"), this, TQ_SLOT("close()")); fileQuitAction = new TQAction("Quit", "&Quit", new TQKeySequence(CTRL+Key_Q), this, "quit", false); - connect(fileQuitAction, SIGNAL("activated()"), tqApp(), SLOT("closeAllWindows()")); + connect(fileQuitAction, TQ_SIGNAL("activated()"), tqApp(), TQ_SLOT("closeAllWindows()")); // populate a tool bar with some actions @@ -158,10 +158,10 @@ public class ApplicationWindow extends TQMainWindow { TQPopupMenu help = new TQPopupMenu(this, "help"); menuBar().insertSeparator(); menuBar().insertItem("&Help", help); - help.insertItem("&About", this, SLOT("about()"), new TQKeySequence(Key_F1), -1, -1); - help.insertItem("About &Qt", this, SLOT("aboutTQt()")); + help.insertItem("&About", this, TQ_SLOT("about()"), new TQKeySequence(Key_F1), -1, -1); + help.insertItem("About &Qt", this, TQ_SLOT("aboutTQt()")); help.insertSeparator(); - help.insertItem("What's &This", this, SLOT("whatsThis()"), new TQKeySequence(SHIFT+Key_F1), -1, -1); + help.insertItem("What's &This", this, TQ_SLOT("whatsThis()"), new TQKeySequence(SHIFT+Key_F1), -1, -1); // create and define the central widget diff --git a/qtjava/javalib/examples/application/Main.java b/qtjava/javalib/examples/application/Main.java index 34988cb8..607c6d33 100644 --- a/qtjava/javalib/examples/application/Main.java +++ b/qtjava/javalib/examples/application/Main.java @@ -6,7 +6,7 @@ public class Main extends TQObject { ApplicationWindow mw = new ApplicationWindow(); mw.setCaption("Document 1"); mw.show(); - a.connect(a, SIGNAL("lastWindowClosed()"), a, SLOT("quit()")); + a.connect(a, TQ_SIGNAL("lastWindowClosed()"), a, TQ_SLOT("quit()")); a.exec(); return; } diff --git a/qtjava/javalib/examples/buttongroups/ButtonsGroups.java b/qtjava/javalib/examples/buttongroups/ButtonsGroups.java index 89b1bcb9..466ccd29 100644 --- a/qtjava/javalib/examples/buttongroups/ButtonsGroups.java +++ b/qtjava/javalib/examples/buttongroups/ButtonsGroups.java @@ -80,8 +80,8 @@ public ButtonsGroups( TQWidget parent, String name ) // insert a checkbox... state = new TQCheckBox( "E&nable Radiobuttons", bgrp3 ); state.setChecked( true ); - // ...and connect its SIGNAL clicked() with the SLOT slotChangeGrp3State() - connect( state, SIGNAL(" clicked()"), this, SLOT(" slotChangeGrp3State()") ); + // ...and connect its signal clicked() with the slot slotChangeGrp3State() + connect( state, TQ_SIGNAL(" clicked()"), this, TQ_SLOT(" slotChangeGrp3State()") ); // ------------ fourth group @@ -103,7 +103,7 @@ public ButtonsGroups( TQWidget parent, String name ) } /* - SLOT slotChangeGrp3State() + TQ_SLOT slotChangeGrp3State() * enables/disables the radiobuttons of the third buttongroup */ diff --git a/qtjava/javalib/examples/checklists/CheckLists.java b/qtjava/javalib/examples/checklists/CheckLists.java index d274c1c7..a28d17dd 100644 --- a/qtjava/javalib/examples/checklists/CheckLists.java +++ b/qtjava/javalib/examples/checklists/CheckLists.java @@ -73,8 +73,8 @@ CheckLists( TQWidget parent, String name ) TQPushButton copy1 = new TQPushButton( " -> ", this ); tmp.addWidget( copy1 ); copy1.setMaximumWidth( copy1.sizeHint().width() ); - // connect the SIGNAL clicked() of the pushbutton with the SLOT copy1to2() - connect( copy1, SIGNAL(" clicked()"), this, SLOT(" copy1to2()") ); + // connect the signal clicked() of the pushbutton with the slot copy1to2() + connect( copy1, TQ_SIGNAL(" clicked()"), this, TQ_SLOT(" copy1to2()") ); // another widget for layouting TQVBoxLayout vbox2 = new TQVBoxLayout( lay ); @@ -97,8 +97,8 @@ CheckLists( TQWidget parent, String name ) TQPushButton copy2 = new TQPushButton( " -> ", this ); lay.addWidget( copy2 ); copy2.setMaximumWidth( copy2.sizeHint().width() ); - // ...and connect its clicked() SIGNAL to the copy2to3() SLOT - connect( copy2, SIGNAL(" clicked()"), this, SLOT(" copy2to3()") ); + // ...and connect its clicked() signal to the copy2to3() slot + connect( copy2, TQ_SIGNAL(" clicked()"), this, TQ_SLOT(" copy2to3()") ); tmp = new TQVBoxLayout( lay ); tmp.setMargin( 5 ); @@ -109,7 +109,7 @@ CheckLists( TQWidget parent, String name ) } /* - SLOT copy1to2() + TQ_SLOT copy1to2() * Copies all checked ListViewItems from the first ListView to the second one, and inserts them as Radio-ListViewItem. @@ -143,7 +143,7 @@ public void copy1to2() } /* - SLOT copy2to3() + TQ_SLOT copy2to3() * Copies the checked item of the second ListView into the Label at the right. diff --git a/qtjava/javalib/examples/demo/sql/BookForm.java b/qtjava/javalib/examples/demo/sql/BookForm.java index 667207c9..96f39b3c 100644 --- a/qtjava/javalib/examples/demo/sql/BookForm.java +++ b/qtjava/javalib/examples/demo/sql/BookForm.java @@ -83,10 +83,10 @@ BookForm( TQWidget parent, String name, int fl ) // signals and slots connections - connect( editButton, SIGNAL( "clicked()" ), this, SLOT( "editClicked()" ) ); - connect( AuthorDataTable, SIGNAL( "primeInsert(TQSqlRecord)" ), this, SLOT( "primeInsertAuthor(TQSqlRecord)" ) ); - connect( AuthorDataTable, SIGNAL( "currentChanged(TQSqlRecord)" ), this, SLOT( "newCurrentAuthor(TQSqlRecord)" ) ); - connect( connectButton, SIGNAL( "clicked()" ), this, SLOT( "connectClicked()" ) ); + connect( editButton, TQ_SIGNAL( "clicked()" ), this, TQ_SLOT( "editClicked()" ) ); + connect( AuthorDataTable, TQ_SIGNAL( "primeInsert(TQSqlRecord)" ), this, TQ_SLOT( "primeInsertAuthor(TQSqlRecord)" ) ); + connect( AuthorDataTable, TQ_SIGNAL( "currentChanged(TQSqlRecord)" ), this, TQ_SLOT( "newCurrentAuthor(TQSqlRecord)" ) ); + connect( connectButton, TQ_SIGNAL( "clicked()" ), this, TQ_SLOT( "connectClicked()" ) ); // tab order setTabOrder( connectButton, editButton ); diff --git a/qtjava/javalib/examples/demo/sql/ConnectDialog.java b/qtjava/javalib/examples/demo/sql/ConnectDialog.java index ec0f1cc4..1cfc0f01 100644 --- a/qtjava/javalib/examples/demo/sql/ConnectDialog.java +++ b/qtjava/javalib/examples/demo/sql/ConnectDialog.java @@ -108,8 +108,8 @@ ConnectDialog( TQWidget parent, String name, boolean modal, int fl ) // signals and slots connections - connect( PushButton1, SIGNAL( "clicked()" ), this, SLOT( "accept()" ) ); - connect( PushButton2, SIGNAL( "clicked()" ), this, SLOT( "reject()" ) ); + connect( PushButton1, TQ_SIGNAL( "clicked()" ), this, TQ_SLOT( "accept()" ) ); + connect( PushButton2, TQ_SIGNAL( "clicked()" ), this, TQ_SLOT( "reject()" ) ); // tab order setTabOrder( comboDriver, editDatabase ); diff --git a/qtjava/javalib/examples/demo/sql/EditBookForm.java b/qtjava/javalib/examples/demo/sql/EditBookForm.java index 19a3df05..5f39c44d 100644 --- a/qtjava/javalib/examples/demo/sql/EditBookForm.java +++ b/qtjava/javalib/examples/demo/sql/EditBookForm.java @@ -157,23 +157,23 @@ EditBookForm( TQWidget parent, String name, boolean modal, int fl ) // signals and slots connections - connect( PushButtonFirst, SIGNAL( "clicked()" ), BookDataBrowser, SLOT( "first()" ) ); - connect( BookDataBrowser, SIGNAL( "firstRecordAvailable( boolean )" ), PushButtonFirst, SLOT( "setEnabled(boolean)" ) ); - connect( PushButtonPrev, SIGNAL( "clicked()" ), BookDataBrowser, SLOT( "prev()" ) ); - connect( BookDataBrowser, SIGNAL( "prevRecordAvailable( boolean )" ), PushButtonPrev, SLOT( "setEnabled(boolean)" ) ); - connect( PushButtonNext, SIGNAL( "clicked()" ), BookDataBrowser, SLOT( "next()" ) ); - connect( BookDataBrowser, SIGNAL( "nextRecordAvailable( boolean )" ), PushButtonNext, SLOT( "setEnabled(boolean)" ) ); - connect( PushButtonLast, SIGNAL( "clicked()" ), BookDataBrowser, SLOT( "last()" ) ); - connect( BookDataBrowser, SIGNAL( "lastRecordAvailable( boolean )" ), PushButtonLast, SLOT( "setEnabled(boolean)" ) ); - connect( PushButtonInsert, SIGNAL( "clicked()" ), BookDataBrowser, SLOT( "insert()" ) ); - connect( PushButtonUpdate, SIGNAL( "clicked()" ), BookDataBrowser, SLOT( "update()" ) ); - connect( PushButtonDelete, SIGNAL( "clicked()" ), BookDataBrowser, SLOT( "del()" ) ); - connect( PushButtonClose, SIGNAL( "clicked()" ), this, SLOT( "accept()" ) ); - connect( BookDataBrowser, SIGNAL( "primeUpdate(TQSqlRecord)" ), this, SLOT( "primeUpdateBook(TQSqlRecord)" ) ); - connect( BookDataBrowser, SIGNAL( "beforeUpdate(TQSqlRecord)" ), this, SLOT( "beforeUpdateBook(TQSqlRecord)" ) ); - connect( BookDataBrowser, SIGNAL( "beforeInsert(TQSqlRecord)" ), this, SLOT( "beforeUpdateBook(TQSqlRecord)" ) ); - connect( BookDataBrowser, SIGNAL( "primeInsert(TQSqlRecord)" ), this, SLOT( "primeInsertBook(TQSqlRecord)" ) ); - connect( BookDataBrowser, SIGNAL( "primeInsert(TQSqlRecord)" ), this, SLOT( "primeInsertBook(TQSqlRecord)" ) ); + connect( PushButtonFirst, TQ_SIGNAL( "clicked()" ), BookDataBrowser, TQ_SLOT( "first()" ) ); + connect( BookDataBrowser, TQ_SIGNAL( "firstRecordAvailable( boolean )" ), PushButtonFirst, TQ_SLOT( "setEnabled(boolean)" ) ); + connect( PushButtonPrev, TQ_SIGNAL( "clicked()" ), BookDataBrowser, TQ_SLOT( "prev()" ) ); + connect( BookDataBrowser, TQ_SIGNAL( "prevRecordAvailable( boolean )" ), PushButtonPrev, TQ_SLOT( "setEnabled(boolean)" ) ); + connect( PushButtonNext, TQ_SIGNAL( "clicked()" ), BookDataBrowser, TQ_SLOT( "next()" ) ); + connect( BookDataBrowser, TQ_SIGNAL( "nextRecordAvailable( boolean )" ), PushButtonNext, TQ_SLOT( "setEnabled(boolean)" ) ); + connect( PushButtonLast, TQ_SIGNAL( "clicked()" ), BookDataBrowser, TQ_SLOT( "last()" ) ); + connect( BookDataBrowser, TQ_SIGNAL( "lastRecordAvailable( boolean )" ), PushButtonLast, TQ_SLOT( "setEnabled(boolean)" ) ); + connect( PushButtonInsert, TQ_SIGNAL( "clicked()" ), BookDataBrowser, TQ_SLOT( "insert()" ) ); + connect( PushButtonUpdate, TQ_SIGNAL( "clicked()" ), BookDataBrowser, TQ_SLOT( "update()" ) ); + connect( PushButtonDelete, TQ_SIGNAL( "clicked()" ), BookDataBrowser, TQ_SLOT( "del()" ) ); + connect( PushButtonClose, TQ_SIGNAL( "clicked()" ), this, TQ_SLOT( "accept()" ) ); + connect( BookDataBrowser, TQ_SIGNAL( "primeUpdate(TQSqlRecord)" ), this, TQ_SLOT( "primeUpdateBook(TQSqlRecord)" ) ); + connect( BookDataBrowser, TQ_SIGNAL( "beforeUpdate(TQSqlRecord)" ), this, TQ_SLOT( "beforeUpdateBook(TQSqlRecord)" ) ); + connect( BookDataBrowser, TQ_SIGNAL( "beforeInsert(TQSqlRecord)" ), this, TQ_SLOT( "beforeUpdateBook(TQSqlRecord)" ) ); + connect( BookDataBrowser, TQ_SIGNAL( "primeInsert(TQSqlRecord)" ), this, TQ_SLOT( "primeInsertBook(TQSqlRecord)" ) ); + connect( BookDataBrowser, TQ_SIGNAL( "primeInsert(TQSqlRecord)" ), this, TQ_SLOT( "primeInsertBook(TQSqlRecord)" ) ); // tab order setTabOrder( TQLineEditTitle, TQLineEditPrice ); diff --git a/qtjava/javalib/examples/demo/widgets/WidgetsBase.java b/qtjava/javalib/examples/demo/widgets/WidgetsBase.java index e64ccf7f..6622d265 100644 --- a/qtjava/javalib/examples/demo/widgets/WidgetsBase.java +++ b/qtjava/javalib/examples/demo/widgets/WidgetsBase.java @@ -6036,19 +6036,19 @@ WidgetsBase( TQWidget parent, String name, int fl ) // signals and slots connections - connect( slider, SIGNAL( "valueChanged(int)" ), lcdDisplay, SLOT( "display(int)" ) ); - connect( slider, SIGNAL( "valueChanged(int)" ), progressBar, SLOT( "setProgress(int)" ) ); - connect( dateEdit, SIGNAL( "valueChanged(Calendar)" ), this, SLOT( "updateDateTimeString()" ) ); - connect( slider, SIGNAL( "valueChanged(int)" ), spinBox, SLOT( "setValue(int)" ) ); - connect( spinBox, SIGNAL( "valueChanged(int)" ), slider, SLOT( "setValue(int)" ) ); - connect( spinBox, SIGNAL( "valueChanged(int)" ), progressBar, SLOT( "setProgress(int)" ) ); - connect( spinBox, SIGNAL( "valueChanged(int)" ), lcdDisplay, SLOT( "display(int)" ) ); - connect( buttonColorBox, SIGNAL( "activated(String)" ), this, SLOT( "setColor(String)" ) ); - connect( lineEdit, SIGNAL( "textChanged(String)" ), this, SLOT( "updateColorTest(String)" ) ); - connect( lineEdit, SIGNAL( "returnPressed()" ), this, SLOT( "setColor()" ) ); - connect( timeEdit, SIGNAL( "valueChanged(Date)" ), this, SLOT( "updateDateTimeString()" ) ); - connect( timeEdit, SIGNAL( "valueChanged(Date)" ), this, SLOT( "updateClock()" ) ); - connect( pushButton, SIGNAL( "clicked()" ), this, SLOT( "resetColors()" ) ); + connect( slider, TQ_SIGNAL( "valueChanged(int)" ), lcdDisplay, TQ_SLOT( "display(int)" ) ); + connect( slider, TQ_SIGNAL( "valueChanged(int)" ), progressBar, TQ_SLOT( "setProgress(int)" ) ); + connect( dateEdit, TQ_SIGNAL( "valueChanged(Calendar)" ), this, TQ_SLOT( "updateDateTimeString()" ) ); + connect( slider, TQ_SIGNAL( "valueChanged(int)" ), spinBox, TQ_SLOT( "setValue(int)" ) ); + connect( spinBox, TQ_SIGNAL( "valueChanged(int)" ), slider, TQ_SLOT( "setValue(int)" ) ); + connect( spinBox, TQ_SIGNAL( "valueChanged(int)" ), progressBar, TQ_SLOT( "setProgress(int)" ) ); + connect( spinBox, TQ_SIGNAL( "valueChanged(int)" ), lcdDisplay, TQ_SLOT( "display(int)" ) ); + connect( buttonColorBox, TQ_SIGNAL( "activated(String)" ), this, TQ_SLOT( "setColor(String)" ) ); + connect( lineEdit, TQ_SIGNAL( "textChanged(String)" ), this, TQ_SLOT( "updateColorTest(String)" ) ); + connect( lineEdit, TQ_SIGNAL( "returnPressed()" ), this, TQ_SLOT( "setColor()" ) ); + connect( timeEdit, TQ_SIGNAL( "valueChanged(Date)" ), this, TQ_SLOT( "updateDateTimeString()" ) ); + connect( timeEdit, TQ_SIGNAL( "valueChanged(Date)" ), this, TQ_SLOT( "updateClock()" ) ); + connect( pushButton, TQ_SIGNAL( "clicked()" ), this, TQ_SLOT( "resetColors()" ) ); init(); } diff --git a/qtjava/javalib/examples/dragdrop/DropSite.java b/qtjava/javalib/examples/dragdrop/DropSite.java index 3b85dd93..9209dd51 100644 --- a/qtjava/javalib/examples/dragdrop/DropSite.java +++ b/qtjava/javalib/examples/dragdrop/DropSite.java @@ -147,7 +147,7 @@ DragMoviePlayer( TQDragObject p ) // TQObject(p), dobj = p; movie = new TQMovie("trolltech.gif" ); - movie.connectUpdate(this,SLOT("updatePixmap(TQRect)")); + movie.connectUpdate(this,TQ_SLOT("updatePixmap(TQRect)")); } void updatePixmap( TQRect rect ) diff --git a/qtjava/javalib/examples/dragdrop/Main.java b/qtjava/javalib/examples/dragdrop/Main.java index ed6c5309..3bf475df 100644 --- a/qtjava/javalib/examples/dragdrop/Main.java +++ b/qtjava/javalib/examples/dragdrop/Main.java @@ -48,8 +48,8 @@ static DropSite addStuff( TQWidget parent, boolean image, boolean secret ) tll.activate(); parent.resize( parent.sizeHint() ); - TQObject.connect( d, Qt.SIGNAL("message(String)"), - format, Qt.SLOT("setText(String)") ); + TQObject.connect( d, Qt.TQ_SIGNAL("message(String)"), + format, Qt.TQ_SLOT("setText(String)") ); return d; } @@ -75,7 +75,7 @@ public static void main( String[] args ) mw3.setCaption( "Qt Example - Drag and Drop" ); mw3.show(); - TQObject.connect(Qt.qApp(),Qt.SIGNAL("lastWindowClosed()"),Qt.qApp(),Qt.SLOT("quit()")); + TQObject.connect(Qt.qApp(),Qt.TQ_SIGNAL("lastWindowClosed()"),Qt.qApp(),Qt.TQ_SLOT("quit()")); a.exec(); return; } diff --git a/qtjava/javalib/examples/forever/Forever.java b/qtjava/javalib/examples/forever/Forever.java index b7a10677..051a39dd 100644 --- a/qtjava/javalib/examples/forever/Forever.java +++ b/qtjava/javalib/examples/forever/Forever.java @@ -49,8 +49,8 @@ Forever( TQWidget parent, String name ) rectangles = 0; startTimer( 0 ); // run continuous timer TQTimer counter = new TQTimer( this ); - connect( counter, SIGNAL("timeout()"), - this, SLOT("updateCaption()") ); + connect( counter, TQ_SIGNAL("timeout()"), + this, TQ_SLOT("updateCaption()") ); counter.start( 1000 ); } diff --git a/qtjava/javalib/examples/hello/Hello.java b/qtjava/javalib/examples/hello/Hello.java index 5247d495..fec25073 100644 --- a/qtjava/javalib/examples/hello/Hello.java +++ b/qtjava/javalib/examples/hello/Hello.java @@ -28,7 +28,7 @@ Hello( String text, TQWidget parent, String name ) super(parent,name); t = text; TQTimer timer = new TQTimer(this); - connect( timer, SIGNAL("timeout()"), SLOT("animate()") ); + connect( timer, TQ_SIGNAL("timeout()"), TQ_SLOT("animate()") ); timer.start( 40 ); resize( 260, 130 ); diff --git a/qtjava/javalib/examples/hello/Main.java b/qtjava/javalib/examples/hello/Main.java index c5ebc24c..3e053584 100644 --- a/qtjava/javalib/examples/hello/Main.java +++ b/qtjava/javalib/examples/hello/Main.java @@ -29,7 +29,7 @@ public static void main( String[] args ) s = "Hello, World"; Hello h = new Hello( s ); h.setCaption( "Qt says hello" ); - TQObject.connect( h, Qt.SIGNAL("clicked()"), a, Qt.SLOT("quit()") ); + TQObject.connect( h, Qt.TQ_SIGNAL("clicked()"), a, Qt.TQ_SLOT("quit()") ); h.setFont( new TQFont("times",32,TQFont.Bold) ); // default font h.setBackgroundColor( Qt.white() ); // default bg color a.setMainWidget( h ); diff --git a/qtjava/javalib/examples/helpviewer/HelpWindow.java b/qtjava/javalib/examples/helpviewer/HelpWindow.java index c5e4ff7a..006a4722 100644 --- a/qtjava/javalib/examples/helpviewer/HelpWindow.java +++ b/qtjava/javalib/examples/helpviewer/HelpWindow.java @@ -42,26 +42,26 @@ HelpWindow( String home_, String _path, browser.mimeSourceFactory().setFilePath( new String[] { _path } ); browser.setFrameStyle( TQFrame.Panel | TQFrame.Sunken ); - connect( browser, SIGNAL(" textChanged()"), - this, SLOT(" textChanged()") ); + connect( browser, TQ_SIGNAL(" textChanged()"), + this, TQ_SLOT(" textChanged()") ); setCentralWidget( browser ); if ( !home_.equals("") ) browser.setSource( home_ ); - connect( browser, SIGNAL(" highlighted( String)"), - statusBar(), SLOT(" message( String)") ); + connect( browser, TQ_SIGNAL(" highlighted( String)"), + statusBar(), TQ_SLOT(" message( String)") ); resize( 640,700 ); TQPopupMenu file = new TQPopupMenu( this ); - file.insertItem( tr("&New Window"), this, SLOT(" newWindow()"), new TQKeySequence(CTRL+Key_N) ); - file.insertItem( tr("&Open File"), this, SLOT(" openFile()"), new TQKeySequence(CTRL+Key_O) ); - file.insertItem( tr("&Print"), this, SLOT(" print()"), new TQKeySequence(CTRL+Key_P) ); + file.insertItem( tr("&New Window"), this, TQ_SLOT(" newWindow()"), new TQKeySequence(CTRL+Key_N) ); + file.insertItem( tr("&Open File"), this, TQ_SLOT(" openFile()"), new TQKeySequence(CTRL+Key_O) ); + file.insertItem( tr("&Print"), this, TQ_SLOT(" print()"), new TQKeySequence(CTRL+Key_P) ); file.insertSeparator(); - file.insertItem( tr("&Close"), this, SLOT(" close()"), new TQKeySequence(CTRL+Key_Q) ); - file.insertItem( tr("E&xit"), tqApp(), SLOT(" closeAllWindows()"), new TQKeySequence(CTRL+Key_X) ); + file.insertItem( tr("&Close"), this, TQ_SLOT(" close()"), new TQKeySequence(CTRL+Key_Q) ); + file.insertItem( tr("E&xit"), tqApp(), TQ_SLOT(" closeAllWindows()"), new TQKeySequence(CTRL+Key_X) ); // The same three icons are used twice each. TQIconSet icon_back = new TQIconSet( new TQPixmap("back.xpm") ); @@ -70,16 +70,16 @@ HelpWindow( String home_, String _path, TQPopupMenu go = new TQPopupMenu( this ); backwardId = go.insertItem( icon_back, - tr("&Backward"), browser, SLOT(" backward()"), + tr("&Backward"), browser, TQ_SLOT(" backward()"), new TQKeySequence(CTRL+Key_Left) ); forwardId = go.insertItem( icon_forward, - tr("&Forward"), browser, SLOT(" forward()"), + tr("&Forward"), browser, TQ_SLOT(" forward()"), new TQKeySequence(CTRL+Key_Right) ); - go.insertItem( icon_home, tr("&Home"), browser, SLOT(" home()") ); + go.insertItem( icon_home, tr("&Home"), browser, TQ_SLOT(" home()") ); TQPopupMenu help = new TQPopupMenu( this ); - help.insertItem( tr("&About ..."), this, SLOT(" about()") ); - help.insertItem( tr("About &Qt ..."), this, SLOT(" aboutTQt()") ); + help.insertItem( tr("&About ..."), this, TQ_SLOT(" about()") ); + help.insertItem( tr("About &Qt ..."), this, TQ_SLOT(" aboutTQt()") ); hist = new TQPopupMenu( this ); Iterator it = history.iterator(); @@ -87,11 +87,11 @@ HelpWindow( String home_, String _path, String item = (String) it.next(); mHistory.put(new Integer(hist.insertItem( item )), item); } - connect( hist, SIGNAL(" activated( int )"), - this, SLOT(" histChosen( int )") ); + connect( hist, TQ_SIGNAL(" activated( int )"), + this, TQ_SLOT(" histChosen( int )") ); bookm = new TQPopupMenu( this ); - bookm.insertItem( tr( "Add Bookmark" ), this, SLOT(" addBookmark()") ); + bookm.insertItem( tr( "Add Bookmark" ), this, TQ_SLOT(" addBookmark()") ); bookm.insertSeparator(); Iterator it2 = bookmarks.iterator(); @@ -99,8 +99,8 @@ HelpWindow( String home_, String _path, String item = (String) it2.next(); mBookmarks.put(new Integer(bookm.insertItem( item )), item); } - connect( bookm, SIGNAL(" activated( int )"), - this, SLOT(" bookmChosen( int )") ); + connect( bookm, TQ_SIGNAL(" activated( int )"), + this, TQ_SLOT(" bookmChosen( int )") ); menuBar().insertItem( tr("&File"), file ); menuBar().insertItem( tr("&Go"), go ); @@ -111,29 +111,29 @@ HelpWindow( String home_, String _path, menuBar().setItemEnabled( forwardId, false); menuBar().setItemEnabled( backwardId, false); - connect( browser, SIGNAL(" backwardAvailable( boolean )"), - this, SLOT(" setBackwardAvailable( boolean )") ); - connect( browser, SIGNAL(" forwardAvailable( boolean )"), - this, SLOT(" setForwardAvailable( boolean )") ); + connect( browser, TQ_SIGNAL(" backwardAvailable( boolean )"), + this, TQ_SLOT(" setBackwardAvailable( boolean )") ); + connect( browser, TQ_SIGNAL(" forwardAvailable( boolean )"), + this, TQ_SLOT(" setForwardAvailable( boolean )") ); TQToolBar toolbar = new TQToolBar( this ); addToolBar( toolbar, "Toolbar"); TQToolButton button; - button = new TQToolButton( icon_back, tr("Backward"), "", browser, SLOT("backward()"), toolbar ); - connect( browser, SIGNAL(" backwardAvailable(boolean)"), button, SLOT(" setEnabled(boolean)") ); + button = new TQToolButton( icon_back, tr("Backward"), "", browser, TQ_SLOT("backward()"), toolbar ); + connect( browser, TQ_SIGNAL(" backwardAvailable(boolean)"), button, TQ_SLOT(" setEnabled(boolean)") ); button.setEnabled( false ); - button = new TQToolButton( icon_forward, tr("Forward"), "", browser, SLOT("forward()"), toolbar ); - connect( browser, SIGNAL(" forwardAvailable(boolean)"), button, SLOT(" setEnabled(boolean)") ); + button = new TQToolButton( icon_forward, tr("Forward"), "", browser, TQ_SLOT("forward()"), toolbar ); + connect( browser, TQ_SIGNAL(" forwardAvailable(boolean)"), button, TQ_SLOT(" setEnabled(boolean)") ); button.setEnabled( false ); - button = new TQToolButton( icon_home, tr("Home"), "", browser, SLOT("home()"), toolbar ); + button = new TQToolButton( icon_home, tr("Home"), "", browser, TQ_SLOT("home()"), toolbar ); toolbar.addSeparator(); pathCombo = new TQComboBox( true, toolbar ); - connect( pathCombo, SIGNAL(" activated( String )"), - this, SLOT(" pathSelected( String )") ); + connect( pathCombo, TQ_SIGNAL(" activated( String )"), + this, TQ_SLOT(" pathSelected( String )") ); toolbar.setStretchableWidget( pathCombo ); setRightJustification( true ); setDockEnabled( DockLeft, false ); diff --git a/qtjava/javalib/examples/helpviewer/Main.java b/qtjava/javalib/examples/helpviewer/Main.java index 492ca36d..e6dc203d 100644 --- a/qtjava/javalib/examples/helpviewer/Main.java +++ b/qtjava/javalib/examples/helpviewer/Main.java @@ -32,10 +32,10 @@ public static void main( String[] args ) else help.showMaximized(); - TQObject.connect( a, Qt.SIGNAL("aboutToQuit()"), - help, Qt.SLOT("cleanUp()") ); - TQObject.connect( a, Qt.SIGNAL("lastWindowClosed()"), - a, Qt.SLOT("quit()") ); + TQObject.connect( a, Qt.TQ_SIGNAL("aboutToQuit()"), + help, Qt.TQ_SLOT("cleanUp()") ); + TQObject.connect( a, Qt.TQ_SIGNAL("lastWindowClosed()"), + a, Qt.TQ_SLOT("quit()") ); a.exec(); return; diff --git a/qtjava/javalib/examples/iconview/ListenDND.java b/qtjava/javalib/examples/iconview/ListenDND.java index d6dfbc9f..a7c8b00e 100644 --- a/qtjava/javalib/examples/iconview/ListenDND.java +++ b/qtjava/javalib/examples/iconview/ListenDND.java @@ -49,9 +49,9 @@ public static void main( String[] args ) qiconview.setCaption( "Qt Example - Iconview" ); ListenDND listen_dnd = new ListenDND( qiconview ); - TQObject.connect( qiconview, SIGNAL(" dropped( TQDropEvent , ArrayList )"), - listen_dnd, SLOT(" dropped( TQDropEvent )") ); - TQObject.connect( qiconview, SIGNAL(" moved()"), listen_dnd, SLOT(" moved()") ); + TQObject.connect( qiconview, TQ_SIGNAL(" dropped( TQDropEvent , ArrayList )"), + listen_dnd, TQ_SLOT(" dropped( TQDropEvent )") ); + TQObject.connect( qiconview, TQ_SIGNAL(" moved()"), listen_dnd, TQ_SLOT(" moved()") ); a.setMainWidget( qiconview ); qiconview.show(); diff --git a/qtjava/javalib/examples/layout/ExampleWidget.java b/qtjava/javalib/examples/layout/ExampleWidget.java index 566a7825..c66e238d 100644 --- a/qtjava/javalib/examples/layout/ExampleWidget.java +++ b/qtjava/javalib/examples/layout/ExampleWidget.java @@ -30,7 +30,7 @@ ExampleWidget( TQWidget parent, String name ) menubar.setSeparator( TQMenuBar.InWindowsStyle ); TQPopupMenu popup; popup = new TQPopupMenu( this ); - popup.insertItem( "&Quit", tqApp(), SLOT("quit()") ); + popup.insertItem( "&Quit", tqApp(), TQ_SLOT("quit()") ); menubar.insertItem( "&File", popup ); // ...and tell the layout about it. diff --git a/qtjava/javalib/examples/lineedits/LineEdits.java b/qtjava/javalib/examples/lineedits/LineEdits.java index f0f00bf1..072e851a 100644 --- a/qtjava/javalib/examples/lineedits/LineEdits.java +++ b/qtjava/javalib/examples/lineedits/LineEdits.java @@ -48,9 +48,9 @@ LineEdits( TQWidget parent, String name ) combo1.insertItem( "Normal", -1 ); combo1.insertItem( "Password", -1 ); combo1.insertItem( "No Echo", -1 ); - // ...and connect the activated() SIGNAL with the slotEchoChanged() SLOT to be able + // ...and connect the activated() signal with the slotEchoChanged() slot to be able // to react when an item is selected - connect( combo1, SIGNAL(" activated( int )"), this, SLOT(" slotEchoChanged( int )") ); + connect( combo1, TQ_SIGNAL(" activated( int )"), this, TQ_SLOT(" slotEchoChanged( int )") ); // insert the first LineEdit lined1 = new TQLineEdit( this ); @@ -70,8 +70,8 @@ LineEdits( TQWidget parent, String name ) combo2.insertItem( "No Validator", -1 ); combo2.insertItem( "Integer Validator", -1 ); combo2.insertItem( "Double Validator", -1 ); - // ...and again the activated() SIGNAL gets connected with a SLOT - connect( combo2, SIGNAL(" activated( int )"), this, SLOT(" slotValidatorChanged( int )") ); + // ...and again the activated() signal gets connected with a slot + connect( combo2, TQ_SIGNAL(" activated( int )"), this, TQ_SLOT(" slotValidatorChanged( int )") ); // and the second LineEdit lined2 = new TQLineEdit( this ); @@ -91,8 +91,8 @@ LineEdits( TQWidget parent, String name ) combo3.insertItem( "Left", -1 ); combo3.insertItem( "Centered", -1 ); combo3.insertItem( "Right", -1 ); - // ...and again the activated() SIGNAL gets connected with a SLOT - connect( combo3, SIGNAL(" activated( int )"), this, SLOT(" slotAlignmentChanged( int )") ); + // ...and again the activated() signal gets connected with a slot + connect( combo3, TQ_SIGNAL(" activated( int )"), this, TQ_SLOT(" slotAlignmentChanged( int )") ); // and the third lineedit lined3 = new TQLineEdit( this ); @@ -110,8 +110,8 @@ LineEdits( TQWidget parent, String name ) combo4 = new TQComboBox( false, row4 ); combo4.insertItem( "False", -1 ); combo4.insertItem( "True", -1 ); - // ...and again the activated() SIGNAL gets connected with a SLOT - connect( combo4, SIGNAL(" activated( int )"), this, SLOT(" slotReadOnlyChanged( int )") ); + // ...and again the activated() signal gets connected with a slot + connect( combo4, TQ_SIGNAL(" activated( int )"), this, TQ_SLOT(" slotReadOnlyChanged( int )") ); // and the last lineedit lined4 = new TQLineEdit( this ); @@ -122,7 +122,7 @@ LineEdits( TQWidget parent, String name ) } /* - SLOT slotEchoChanged( int i ) + TQ_SLOT slotEchoChanged( int i ) * i contains the number of the item which the user has been chosen in the first Combobox. According to this value, we set the Echo-Mode for the @@ -147,7 +147,7 @@ void slotEchoChanged( int i ) } /* - SLOT slotValidatorChanged( int i ) + TQ_SLOT slotValidatorChanged( int i ) * i contains the number of the item which the user has been chosen in the second Combobox. According to this value, we set a validator for the @@ -177,7 +177,7 @@ void slotValidatorChanged( int i ) /* - SLOT slotAlignmentChanged( int i ) + TQ_SLOT slotAlignmentChanged( int i ) * i contains the number of the item which the user has been chosen in the third Combobox. According to this value, we set an alignment @@ -203,7 +203,7 @@ void slotAlignmentChanged( int i ) /* - SLOT slotReadOnlyChanged( int i ) + TQ_SLOT slotReadOnlyChanged( int i ) * i contains the number of the item which the user has been chosen in the fourth Combobox. According to this value, we toggle read-only. diff --git a/qtjava/javalib/examples/listbox/ListBoxDemo.java b/qtjava/javalib/examples/listbox/ListBoxDemo.java index 11ce7037..ea496b68 100644 --- a/qtjava/javalib/examples/listbox/ListBoxDemo.java +++ b/qtjava/javalib/examples/listbox/ListBoxDemo.java @@ -45,7 +45,7 @@ ListBoxDemo() bg.insert( b ); v.addWidget( b ); b.setChecked( true ); - connect( b, SIGNAL("clicked()"), this, SLOT("setNumCols()") ); + connect( b, TQ_SIGNAL("clicked()"), this, TQ_SLOT("setNumCols()") ); TQHBoxLayout h = new TQHBoxLayout(); v.addLayout( h ); h.addSpacing( 30 ); @@ -61,7 +61,7 @@ ListBoxDemo() this ); bg.insert( b ); v.addWidget( b ); - connect( b, SIGNAL("clicked()"), this, SLOT("setColsByWidth()") ); + connect( b, TQ_SIGNAL("clicked()"), this, TQ_SLOT("setColsByWidth()") ); v.addSpacing( 12 ); @@ -70,7 +70,7 @@ ListBoxDemo() this ); bg.insert( b ); v.addWidget( b ); - connect( b, SIGNAL("clicked()"), this, SLOT("setNumRows()") ); + connect( b, TQ_SIGNAL("clicked()"), this, TQ_SLOT("setNumRows()") ); h = new TQHBoxLayout(); v.addLayout( h ); h.addSpacing( 30 ); @@ -87,30 +87,30 @@ ListBoxDemo() this ); bg.insert( b ); v.addWidget( b ); - connect( b, SIGNAL("clicked()"), this, SLOT("setRowsByHeight()") ); + connect( b, TQ_SIGNAL("clicked()"), this, TQ_SLOT("setRowsByHeight()") ); v.addSpacing( 12 ); TQCheckBox cb = new TQCheckBox( "Variable-height rows", this ); cb.setChecked( true ); - connect( cb, SIGNAL("toggled(boolean)"), this, SLOT("setVariableHeight(boolean)") ); + connect( cb, TQ_SIGNAL("toggled(boolean)"), this, TQ_SLOT("setVariableHeight(boolean)") ); v.addWidget( cb ); v.addSpacing( 6 ); cb = new TQCheckBox( "Variable-width columns", this ); - connect( cb, SIGNAL("toggled(boolean)"), this, SLOT("setVariableWidth(boolean)") ); + connect( cb, TQ_SIGNAL("toggled(boolean)"), this, TQ_SLOT("setVariableWidth(boolean)") ); v.addWidget( cb ); cb = new TQCheckBox( "Extended-Selection", this ); - connect( cb, SIGNAL("toggled(boolean)"), this, SLOT("setMultiSelection(boolean)") ); + connect( cb, TQ_SIGNAL("toggled(boolean)"), this, TQ_SLOT("setMultiSelection(boolean)") ); v.addWidget( cb ); TQPushButton pb = new TQPushButton( "Sort ascending", this ); - connect( pb, SIGNAL(" clicked()"), this, SLOT(" sortAscending()") ); + connect( pb, TQ_SIGNAL(" clicked()"), this, TQ_SLOT(" sortAscending()") ); v.addWidget( pb ); pb = new TQPushButton( "Sort descending", this ); - connect( pb, SIGNAL(" clicked()"), this, SLOT(" sortDescending()") ); + connect( pb, TQ_SIGNAL(" clicked()"), this, TQ_SLOT(" sortDescending()") ); v.addWidget( pb ); v.addStretch( 100 ); @@ -124,8 +124,8 @@ ListBoxDemo() rows.setRange( 1, 256 ); rows.setValue( 256 ); - connect( columns, SIGNAL("valueChanged(int)"), this, SLOT("setNumCols()") ); - connect( rows, SIGNAL("valueChanged(int)"), this, SLOT("setNumRows()") ); + connect( columns, TQ_SIGNAL("valueChanged(int)"), this, TQ_SLOT("setNumCols()") ); + connect( rows, TQ_SIGNAL("valueChanged(int)"), this, TQ_SLOT("setNumRows()") ); } diff --git a/qtjava/javalib/examples/mdi/ApplicationWindow.java b/qtjava/javalib/examples/mdi/ApplicationWindow.java index fd0079be..d6e5ce25 100644 --- a/qtjava/javalib/examples/mdi/ApplicationWindow.java +++ b/qtjava/javalib/examples/mdi/ApplicationWindow.java @@ -118,12 +118,12 @@ ApplicationWindow() openIcon = new TQPixmap( fileopen ); TQToolButton fileOpen = new TQToolButton( new TQIconSet(openIcon), "Open File", "", - this, SLOT("load()"), fileTools, "open file" ); + this, TQ_SLOT("load()"), fileTools, "open file" ); saveIcon = new TQPixmap( filesave ); TQToolButton fileSave = new TQToolButton( new TQIconSet(saveIcon), "Save File", "", - this, SLOT("save()"), fileTools, "save file" ); + this, TQ_SLOT("save()"), fileTools, "save file" ); printer = new TQPrinter(); TQPixmap printIcon; @@ -131,7 +131,7 @@ ApplicationWindow() printIcon = new TQPixmap( fileprint ); TQToolButton filePrint = new TQToolButton( new TQIconSet(printIcon), "Print File", "", - this, SLOT("print()"), fileTools, "print file" ); + this, TQ_SLOT("print()"), fileTools, "print file" ); TQWhatsThis.add( filePrint, filePrintText ); TQWhatsThis.whatsThisButton( fileTools ); @@ -142,39 +142,39 @@ ApplicationWindow() TQPopupMenu file = new TQPopupMenu( this ); menuBar().insertItem( "&File", file ); - file.insertItem( "&New", this, SLOT("newDoc()"), new TQKeySequence(CTRL+Key_N) ); + file.insertItem( "&New", this, TQ_SLOT("newDoc()"), new TQKeySequence(CTRL+Key_N) ); id = file.insertItem( new TQIconSet(openIcon), "&Open...", - this, SLOT("load()"), new TQKeySequence(CTRL+Key_O) ); + this, TQ_SLOT("load()"), new TQKeySequence(CTRL+Key_O) ); file.setWhatsThis( id, fileOpenText ); id = file.insertItem( new TQIconSet(saveIcon), "&Save", - this, SLOT("save()"), new TQKeySequence(CTRL+Key_S) ); + this, TQ_SLOT("save()"), new TQKeySequence(CTRL+Key_S) ); file.setWhatsThis( id, fileSaveText ); - id = file.insertItem( "Save &As...", this, SLOT("saveAs()") ); + id = file.insertItem( "Save &As...", this, TQ_SLOT("saveAs()") ); file.setWhatsThis( id, fileSaveText ); file.insertSeparator(); id = file.insertItem( new TQIconSet(printIcon), "&Print...", - this, SLOT("print()"), new TQKeySequence(CTRL+Key_P) ); + this, TQ_SLOT("print()"), new TQKeySequence(CTRL+Key_P) ); file.setWhatsThis( id, filePrintText ); file.insertSeparator(); - file.insertItem( "&Close", this, SLOT("closeWindow()"), new TQKeySequence(CTRL+Key_W) ); - file.insertItem( "&Quit", tqApp(), SLOT(" closeAllWindows()"), new TQKeySequence(CTRL+Key_Q) ); + file.insertItem( "&Close", this, TQ_SLOT("closeWindow()"), new TQKeySequence(CTRL+Key_W) ); + file.insertItem( "&Quit", tqApp(), TQ_SLOT(" closeAllWindows()"), new TQKeySequence(CTRL+Key_Q) ); windowsMenu = new TQPopupMenu( this ); windowsMenu.setCheckable( true ); - connect( windowsMenu, SIGNAL(" aboutToShow()"), - this, SLOT(" windowsMenuAboutToShow()") ); + connect( windowsMenu, TQ_SIGNAL(" aboutToShow()"), + this, TQ_SLOT(" windowsMenuAboutToShow()") ); menuBar().insertItem( "&Windows", windowsMenu ); menuBar().insertSeparator(); TQPopupMenu help = new TQPopupMenu( this ); menuBar().insertItem( "&Help", help ); - help.insertItem( "&About", this, SLOT("about()"), new TQKeySequence(Key_F1)); - help.insertItem( "About &Qt", this, SLOT("aboutTQt()")); + help.insertItem( "&About", this, TQ_SLOT("about()"), new TQKeySequence(Key_F1)); + help.insertItem( "About &Qt", this, TQ_SLOT("aboutTQt()")); help.insertSeparator(); - help.insertItem( "What's &This", this, SLOT("whatsThis()"), new TQKeySequence(SHIFT+Key_F1)); + help.insertItem( "What's &This", this, TQ_SLOT("whatsThis()"), new TQKeySequence(SHIFT+Key_F1)); TQVBox vb = new TQVBox( this ); vb.setFrameStyle( TQFrame.StyledPanel | TQFrame.Sunken ); @@ -189,7 +189,7 @@ ApplicationWindow() MDIWindow newDoc() { MDIWindow w = new MDIWindow( ws, null, WDestructiveClose ); - connect( w, SIGNAL("message(String,int)"), statusBar(), SLOT("message(String,int)") ); + connect( w, TQ_SIGNAL("message(String,int)"), statusBar(), TQ_SLOT("message(String,int)") ); w.setCaption("unnamed document"); w.setIcon( new TQPixmap("document.xpm") ); // show the very first window in maximized mode @@ -260,8 +260,8 @@ void aboutTQt() void windowsMenuAboutToShow() { windowsMenu.clear(); - int cascadeId = windowsMenu.insertItem("&Cascade", ws, SLOT("cascade()") ); - int tileId = windowsMenu.insertItem("&Tile", ws, SLOT("tile()") ); + int cascadeId = windowsMenu.insertItem("&Cascade", ws, TQ_SLOT("cascade()") ); + int tileId = windowsMenu.insertItem("&Tile", ws, TQ_SLOT("tile()") ); windows = ws.windowList(); if ( windows.size() == 0 ) { windowsMenu.setItemEnabled( cascadeId, false ); @@ -270,7 +270,7 @@ void windowsMenuAboutToShow() windowsMenu.insertSeparator(); for ( int i = 0; i < windows.size(); ++i ) { int id = windowsMenu.insertItem(((TQWidget) windows.get(i)).caption(), - this, SLOT(" windowsMenuActivated( int )") ); + this, TQ_SLOT(" windowsMenuActivated( int )") ); windowsMenu.setItemParameter( id, i ); windowsMenu.setItemChecked( id, ws.activeWindow() == windows.get(i) ); } diff --git a/qtjava/javalib/examples/mdi/Main.java b/qtjava/javalib/examples/mdi/Main.java index daec64d7..e75f1d3c 100644 --- a/qtjava/javalib/examples/mdi/Main.java +++ b/qtjava/javalib/examples/mdi/Main.java @@ -17,7 +17,7 @@ public static void main(String[] args) { ApplicationWindow mw = new ApplicationWindow(); mw.setCaption( "Qt Example - Multiple Documents Interface (MDI)" ); mw.show(); - a.connect( a, Qt.SIGNAL("lastWindowClosed()"), a, Qt.SLOT("quit()") ); + a.connect( a, Qt.TQ_SIGNAL("lastWindowClosed()"), a, Qt.TQ_SLOT("quit()") ); int res = a.exec(); return; } diff --git a/qtjava/javalib/examples/menu/MenuExample.java b/qtjava/javalib/examples/menu/MenuExample.java index dd619d09..10fe5c5c 100644 --- a/qtjava/javalib/examples/menu/MenuExample.java +++ b/qtjava/javalib/examples/menu/MenuExample.java @@ -135,32 +135,32 @@ MenuExample( TQWidget parent, String name ) TQPopupMenu print = new TQPopupMenu( this ); print.insertTearOffHandle(); - print.insertItem( "&Print to printer", this, SLOT("printer()") ); - print.insertItem( "Print to &file", this, SLOT("file()") ); - print.insertItem( "Print to fa&x", this, SLOT("fax()") ); + print.insertItem( "&Print to printer", this, TQ_SLOT("printer()") ); + print.insertItem( "Print to &file", this, TQ_SLOT("file()") ); + print.insertItem( "Print to fa&x", this, TQ_SLOT("fax()") ); print.insertSeparator(); - print.insertItem( "Printer &Setup", this, SLOT("printerSetup()") ); + print.insertItem( "Printer &Setup", this, TQ_SLOT("printerSetup()") ); TQPopupMenu file = new TQPopupMenu( this ); - file.insertItem( new TQIconSet(p1), "&Open", this, SLOT("open()"), new TQKeySequence(CTRL+Key_O) ); - file.insertItem( new TQIconSet(p2), "&New", this, SLOT("news()"), new TQKeySequence(CTRL+Key_N) ); - file.insertItem( new TQIconSet(p3), "&Save", this, SLOT("save()"), new TQKeySequence(CTRL+Key_S) ); - file.insertItem( "&Close", this, SLOT("closeDoc()"), new TQKeySequence(CTRL+Key_W) ); + file.insertItem( new TQIconSet(p1), "&Open", this, TQ_SLOT("open()"), new TQKeySequence(CTRL+Key_O) ); + file.insertItem( new TQIconSet(p2), "&New", this, TQ_SLOT("news()"), new TQKeySequence(CTRL+Key_N) ); + file.insertItem( new TQIconSet(p3), "&Save", this, TQ_SLOT("save()"), new TQKeySequence(CTRL+Key_S) ); + file.insertItem( "&Close", this, TQ_SLOT("closeDoc()"), new TQKeySequence(CTRL+Key_W) ); file.insertSeparator(); file.insertItem( "&Print", print, CTRL+Key_P ); file.insertSeparator(); - file.insertItem( "E&xit", tqApp(), SLOT("quit()"), new TQKeySequence(CTRL+Key_Q) ); + file.insertItem( "E&xit", tqApp(), TQ_SLOT("quit()"), new TQKeySequence(CTRL+Key_Q) ); TQPopupMenu edit = new TQPopupMenu( this ); - int undoID = edit.insertItem( "&Undo", this, SLOT("undo()") ); - int redoID = edit.insertItem( "&Redo", this, SLOT("redo()") ); + int undoID = edit.insertItem( "&Undo", this, TQ_SLOT("undo()") ); + int redoID = edit.insertItem( "&Redo", this, TQ_SLOT("redo()") ); edit.setItemEnabled( undoID, false ); edit.setItemEnabled( redoID, false ); TQPopupMenu options = new TQPopupMenu( this ); options.insertTearOffHandle(); options.setCaption("Options"); - options.insertItem( "&Normal Font", this, SLOT("normal()") ); + options.insertItem( "&Normal Font", this, TQ_SLOT("normal()") ); options.insertSeparator(); options.polish(); // adjust system settings @@ -168,12 +168,12 @@ MenuExample( TQWidget parent, String name ) f.setBold( true ); // boldID = options.insertItem( new MyMenuItem( "&Bold", f ) ); options.setAccel( new TQKeySequence(CTRL+Key_B), boldID ); - options.connectItem( boldID, this, SLOT("bold()") ); + options.connectItem( boldID, this, TQ_SLOT("bold()") ); f = font(); f.setUnderline( true ); // underlineID = options.insertItem( new MyMenuItem( "&Underline", f ) ); options.setAccel( new TQKeySequence(CTRL+Key_U), underlineID ); - options.connectItem( underlineID, this, SLOT("underline()") ); + options.connectItem( underlineID, this, TQ_SLOT("underline()") ); isBold = false; isUnderline = false; @@ -181,8 +181,8 @@ MenuExample( TQWidget parent, String name ) TQPopupMenu help = new TQPopupMenu( this ); - help.insertItem( "&About", this, SLOT("about()"), new TQKeySequence(CTRL+Key_H) ); - help.insertItem( "About &Qt", this, SLOT("aboutTQt()") ); + help.insertItem( "&About", this, TQ_SLOT("about()"), new TQKeySequence(CTRL+Key_H) ); + help.insertItem( "About &Qt", this, TQ_SLOT("aboutTQt()") ); menu = new TQMenuBar( this ); menu.insertItem( "&File", file ); @@ -198,8 +198,8 @@ MenuExample( TQWidget parent, String name ) label.setLineWidth( 1 ); label.setAlignment( AlignCenter ); - connect( this, SIGNAL("explain(String)"), - label, SLOT("setText(String)") ); + connect( this, TQ_SIGNAL("explain(String)"), + label, TQ_SLOT("setText(String)") ); setMinimumSize( 100, 80 ); } diff --git a/qtjava/javalib/examples/popup/Frame.java b/qtjava/javalib/examples/popup/Frame.java index f7608e03..6fbaa7d9 100644 --- a/qtjava/javalib/examples/popup/Frame.java +++ b/qtjava/javalib/examples/popup/Frame.java @@ -32,9 +32,9 @@ Frame(TQWidget parent, String name) { super(parent, name); button1 = new TQPushButton("Simple Popup", this); - connect ( button1, SIGNAL(" clicked()"), SLOT(" button1Clicked()") ); + connect ( button1, TQ_SIGNAL(" clicked()"), TQ_SLOT(" button1Clicked()") ); button2 = new TQPushButton("Fancy Popup", this); - connect ( button2, SIGNAL(" pressed()"), SLOT(" button2Pressed()") ); + connect ( button2, TQ_SIGNAL(" pressed()"), TQ_SLOT(" button2Pressed()") ); TQBoxLayout l = new TQHBoxLayout( this ); button1.setMaximumSize(button1.sizeHint()); @@ -54,11 +54,11 @@ Frame(TQWidget parent, String name) popup1.setFrameStyle( WinPanel|Raised ); popup1.resize(150,100); TQLineEdit tmpE = new TQLineEdit( popup1 ); - connect( tmpE, SIGNAL(" returnPressed()"), popup1, SLOT(" hide()") ); + connect( tmpE, TQ_SIGNAL(" returnPressed()"), popup1, TQ_SLOT(" hide()") ); tmpE.setGeometry(10,10, 130, 30); tmpE.setFocus(); TQPushButton tmpB = new TQPushButton("Click me!", popup1); - connect( tmpB, SIGNAL(" clicked()"), popup1, SLOT(" close()") ); + connect( tmpB, TQ_SIGNAL(" clicked()"), popup1, TQ_SLOT(" close()") ); tmpB.setGeometry(10, 50, 130, 30); // the fancier version uses its own class. It will be shown when @@ -73,7 +73,7 @@ Frame(TQWidget parent, String name) // tmpE = new TQLineEdit( popup2 ); // tmpE.setFocus(); -// connect( tmpE, SIGNAL(" returnPressed()"), popup2, SLOT(" close()") ); +// connect( tmpE, TQ_SIGNAL(" returnPressed()"), popup2, TQ_SLOT(" close()") ); // tmpE.setGeometry(10, 10, 130, 30); } diff --git a/qtjava/javalib/examples/progressbar/ProgressBar.java b/qtjava/javalib/examples/progressbar/ProgressBar.java index 88b547eb..0d05040d 100644 --- a/qtjava/javalib/examples/progressbar/ProgressBar.java +++ b/qtjava/javalib/examples/progressbar/ProgressBar.java @@ -67,11 +67,11 @@ ProgressBar( TQWidget parent, String name ) toplayout.addMultiCellWidget( progress, 1, 1, 0, 1 ); // connect the clicked() SIGNALs of the pushbuttons to SLOTs - connect( start, SIGNAL(" clicked()"), this, SLOT(" slotStart()") ); - connect( reset, SIGNAL(" clicked()"), this, SLOT(" slotReset()") ); + connect( start, TQ_SIGNAL(" clicked()"), this, TQ_SLOT(" slotStart()") ); + connect( reset, TQ_SIGNAL(" clicked()"), this, TQ_SLOT(" slotReset()") ); - // connect the timeout() SIGNAL of the progress-timer to a SLOT - connect( timer, SIGNAL(" timeout()"), this, SLOT(" slotTimeout()") ); + // connect the timeout() TQ_SIGNAL of the progress-timer to a TQ_SLOT + connect( timer, TQ_SIGNAL(" timeout()"), this, TQ_SLOT(" slotTimeout()") ); // Let's start with normal speed... normal.setChecked( true ); @@ -83,9 +83,9 @@ ProgressBar( TQWidget parent, String name ) } /* - SLOT slotStart + TQ_SLOT slotStart * - This SLOT is called if the user clicks start/pause/continue + This slot is called if the user clicks start/pause/continue button */ @@ -123,9 +123,9 @@ void slotStart() } /* - SLOT slotReset + TQ_SLOT slotReset * - This SLOT is called when the user clicks the reset button + This slot is called when the user clicks the reset button */ void slotReset() @@ -148,9 +148,9 @@ void slotReset() } /* - SLOT slotTimeout + TQ_SLOT slotTimeout * - This SLOT is called each ms when the timer is + This slot is called each ms when the timer is active (== progress is running) */ diff --git a/qtjava/javalib/examples/qfd/FontDisplayer.java b/qtjava/javalib/examples/qfd/FontDisplayer.java index 17dfe6a4..3895726f 100644 --- a/qtjava/javalib/examples/qfd/FontDisplayer.java +++ b/qtjava/javalib/examples/qfd/FontDisplayer.java @@ -157,10 +157,10 @@ FontDisplayer( TQWidget parent, String name ) controls.addSeparator(); TQPushButton fontbutton = new TQPushButton(tr("Font..."), controls); - connect(row,SIGNAL("valueChanged(int)"),table,SLOT("setRow(int)")); - connect(fontbutton, SIGNAL("clicked()"), table, SLOT("chooseFont()")); - connect(table,SIGNAL("fontInformation(String)"), - statusBar(),SLOT("message(String)")); + connect(row,TQ_SIGNAL("valueChanged(int)"),table,TQ_SLOT("setRow(int)")); + connect(fontbutton, TQ_SIGNAL("clicked()"), table, TQ_SLOT("chooseFont()")); + connect(table,TQ_SIGNAL("fontInformation(String)"), + statusBar(),TQ_SLOT("message(String)")); table.setRow(0); setCentralWidget(table); } diff --git a/qtjava/javalib/examples/qmag/MagWidget.java b/qtjava/javalib/examples/qmag/MagWidget.java index f701835b..ade43cef 100644 --- a/qtjava/javalib/examples/qmag/MagWidget.java +++ b/qtjava/javalib/examples/qmag/MagWidget.java @@ -57,11 +57,11 @@ MagWidget( TQWidget parent, String name ) zoom = new TQComboBox( false, this ); zoom.insertStrList( zoomfactors, 9 ); - connect( zoom, SIGNAL("activated(int)"), SLOT("setZoom(int)") ); + connect( zoom, TQ_SIGNAL("activated(int)"), TQ_SLOT("setZoom(int)") ); refresh = new TQComboBox( false, this ); refresh.insertStrList( refreshrates, 9 ); - connect( refresh, SIGNAL("activated(int)"), SLOT("setRefresh(int)") ); + connect( refresh, TQ_SIGNAL("activated(int)"), TQ_SLOT("setRefresh(int)") ); for( n=0; n<9; n++) { int w2 = zoom.fontMetrics().width( zoomfactors[n] ); @@ -78,20 +78,20 @@ MagWidget( TQWidget parent, String name ) refresh.setGeometry( x, 2, w+30, 20 ); saveButton = new TQPushButton( this ); - connect( saveButton, SIGNAL("clicked()"), this, SLOT("save()") ); + connect( saveButton, TQ_SIGNAL("clicked()"), this, TQ_SLOT("save()") ); saveButton.setText( "Save" ); saveButton.setGeometry( x+w+30+2, 2, 10+saveButton.fontMetrics().width("Save"), 20 ); multiSaveButton = new TQPushButton( this ); multiSaveButton.setToggleButton(true); - connect( multiSaveButton, SIGNAL("clicked()"), this, SLOT("multiSave()") ); + connect( multiSaveButton, TQ_SIGNAL("clicked()"), this, TQ_SLOT("multiSave()") ); multiSaveButton.setText( "MultiSave" ); multiSaveButton.setGeometry( saveButton.geometry().right() + 2, 2, 10+multiSaveButton.fontMetrics().width("MultiSave"), 20 ); quitButton = new TQPushButton( this ); - connect( quitButton, SIGNAL("clicked()"), tqApp(), SLOT("quit()") ); + connect( quitButton, TQ_SIGNAL("clicked()"), tqApp(), TQ_SLOT("quit()") ); quitButton.setText( "Quit" ); quitButton.setGeometry( multiSaveButton.geometry().right() + 2, 2, 10+quitButton.fontMetrics().width("Quit"), 20 ); diff --git a/qtjava/javalib/examples/qwerty/Editor.java b/qtjava/javalib/examples/qwerty/Editor.java index 5175b7da..36934685 100644 --- a/qtjava/javalib/examples/qwerty/Editor.java +++ b/qtjava/javalib/examples/qwerty/Editor.java @@ -46,35 +46,35 @@ Editor( TQWidget parent , String name ) TQPopupMenu file = new TQPopupMenu(this); m.insertItem( "&File", file ); - file.insertItem( "&New", this, SLOT("newDoc()"), new TQKeySequence(ALT+Key_N) ); - file.insertItem( "&Open...", this, SLOT("load()"), new TQKeySequence(ALT+Key_O) ); - file.insertItem( "&Save...", this, SLOT("save()"), new TQKeySequence(ALT+Key_S) ); + file.insertItem( "&New", this, TQ_SLOT("newDoc()"), new TQKeySequence(ALT+Key_N) ); + file.insertItem( "&Open...", this, TQ_SLOT("load()"), new TQKeySequence(ALT+Key_O) ); + file.insertItem( "&Save...", this, TQ_SLOT("save()"), new TQKeySequence(ALT+Key_S) ); file.insertSeparator(); open_as = new TQPopupMenu(file); file.insertItem( "Open &As", open_as ); save_as = new TQPopupMenu(file); file.insertItem( "Sa&ve As", save_as ); - file.insertItem( "Add &Encoding", this, SLOT("addEncoding()") ); + file.insertItem( "Add &Encoding", this, TQ_SLOT("addEncoding()") ); file.insertSeparator(); - file.insertItem( "&Print...", this, SLOT("print()"), new TQKeySequence(ALT+Key_P) ); + file.insertItem( "&Print...", this, TQ_SLOT("print()"), new TQKeySequence(ALT+Key_P) ); file.insertSeparator(); - file.insertItem( "&Close", this, SLOT("close()"),new TQKeySequence(ALT+Key_W) ); - file.insertItem( "&Quit", tqApp(), SLOT("closeAllWindows()"), new TQKeySequence(ALT+Key_Q) ); + file.insertItem( "&Close", this, TQ_SLOT("close()"),new TQKeySequence(ALT+Key_W) ); + file.insertItem( "&Quit", tqApp(), TQ_SLOT("closeAllWindows()"), new TQKeySequence(ALT+Key_Q) ); - connect( save_as, SIGNAL("activated(int)"), this, SLOT("saveAsEncoding(int)") ); - connect( open_as, SIGNAL("activated(int)"), this, SLOT("openAsEncoding(int)") ); + connect( save_as, TQ_SIGNAL("activated(int)"), this, TQ_SLOT("saveAsEncoding(int)") ); + connect( open_as, TQ_SIGNAL("activated(int)"), this, TQ_SLOT("openAsEncoding(int)") ); rebuildCodecList(); TQPopupMenu edit = new TQPopupMenu(m); m.insertItem( "&Edit", edit ); - edit.insertItem( "To &Uppercase", this, SLOT("toUpper()"), new TQKeySequence(ALT+Key_U) ); - edit.insertItem( "To &Lowercase", this, SLOT("toLower()"), new TQKeySequence(ALT+Key_L) ); + edit.insertItem( "To &Uppercase", this, TQ_SLOT("toUpper()"), new TQKeySequence(ALT+Key_U) ); + edit.insertItem( "To &Lowercase", this, TQ_SLOT("toLower()"), new TQKeySequence(ALT+Key_L) ); edit.insertSeparator(); - edit.insertItem( "&Select Font" , this, SLOT("getFont()"), new TQKeySequence(ALT+Key_F) ); + edit.insertItem( "&Select Font" , this, TQ_SLOT("getFont()"), new TQKeySequence(ALT+Key_F) ); changed = false; e = new TQMultiLineEdit( this, "editor" ); - connect( e, SIGNAL(" textChanged()"), this, SLOT(" textChanged()") ); + connect( e, TQ_SIGNAL(" textChanged()"), this, TQ_SLOT(" textChanged()") ); // We use Unifont - if you have it installed you'll see all // Unicode character glyphs. diff --git a/qtjava/javalib/examples/qwerty/Main.java b/qtjava/javalib/examples/qwerty/Main.java index a2001e15..a59b3a73 100644 --- a/qtjava/javalib/examples/qwerty/Main.java +++ b/qtjava/javalib/examples/qwerty/Main.java @@ -32,7 +32,7 @@ public static void main(String[] args) e.show(); } } - a.connect(a, Qt.SIGNAL("lastWindowClosed()"), a, Qt.SLOT("quit()") ); + a.connect(a, Qt.TQ_SIGNAL("lastWindowClosed()"), a, Qt.TQ_SLOT("quit()") ); a.exec(); return; } diff --git a/qtjava/javalib/examples/rangecontrols/RangeControls.java b/qtjava/javalib/examples/rangecontrols/RangeControls.java index ea0c9b16..ded6bdc0 100644 --- a/qtjava/javalib/examples/rangecontrols/RangeControls.java +++ b/qtjava/javalib/examples/rangecontrols/RangeControls.java @@ -61,7 +61,7 @@ RangeControls( TQWidget parent, String name ) TQLCDNumber lcd2 = new TQLCDNumber( 2, cell3 ); lcd2.display( 33 ); lcd2.setSegmentStyle( TQLCDNumber.Filled ); - connect( hslider, SIGNAL(" valueChanged( int )"), lcd2, SLOT(" display( int )") ); + connect( hslider, TQ_SIGNAL(" valueChanged( int )"), lcd2, TQ_SLOT(" display( int )") ); TQHBox cell4 = new TQHBox( row2 ); cell4.setFrameStyle( TQFrame.WinPanel | TQFrame.Sunken ); @@ -69,6 +69,6 @@ RangeControls( TQWidget parent, String name ) TQSlider vslider = new TQSlider( 0, 64, 1, 8, Qt.Vertical, cell4 ); TQLCDNumber lcd3 = new TQLCDNumber( 3, cell4 ); lcd3.display( 8 ); - connect( vslider, SIGNAL(" valueChanged( int )"), lcd3, SLOT(" display( int )") ); + connect( vslider, TQ_SIGNAL(" valueChanged( int )"), lcd3, TQ_SLOT(" display( int )") ); } } diff --git a/qtjava/javalib/examples/richtext/MyRichText.java b/qtjava/javalib/examples/richtext/MyRichText.java index f06dde68..7e1fd25b 100644 --- a/qtjava/javalib/examples/richtext/MyRichText.java +++ b/qtjava/javalib/examples/richtext/MyRichText.java @@ -108,9 +108,9 @@ MyRichText( TQWidget parent, String name ) bPrev.setEnabled( false ); - connect( bClose, SIGNAL(" clicked()"), tqApp(), SLOT(" quit()") ); - connect( bPrev, SIGNAL(" clicked()"), this, SLOT(" prev()") ); - connect( bNext, SIGNAL(" clicked()"), this, SLOT(" next()") ); + connect( bClose, TQ_SIGNAL(" clicked()"), tqApp(), TQ_SLOT(" quit()") ); + connect( bPrev, TQ_SIGNAL(" clicked()"), this, TQ_SLOT(" prev()") ); + connect( bNext, TQ_SIGNAL(" clicked()"), this, TQ_SLOT(" next()") ); num = 0; } diff --git a/qtjava/javalib/examples/rot13/Rot13.java b/qtjava/javalib/examples/rot13/Rot13.java index bfb55edb..472e13eb 100644 --- a/qtjava/javalib/examples/rot13/Rot13.java +++ b/qtjava/javalib/examples/rot13/Rot13.java @@ -24,12 +24,12 @@ Rot13() { left = new TQMultiLineEdit( this, "left" ); right = new TQMultiLineEdit( this, "right" ); - connect( left, SIGNAL("textChanged()"), this, SLOT("changeRight()") ); - connect( right, SIGNAL("textChanged()"), this, SLOT("changeLeft()") ); + connect( left, TQ_SIGNAL("textChanged()"), this, TQ_SLOT("changeRight()") ); + connect( right, TQ_SIGNAL("textChanged()"), this, TQ_SLOT("changeLeft()") ); TQPushButton quit = new TQPushButton( "&Quit", this ); quit.setFocusPolicy( NoFocus ); - connect( quit, SIGNAL("clicked()"), tqApp(), SLOT("quit()") ); + connect( quit, TQ_SIGNAL("clicked()"), tqApp(), TQ_SLOT("quit()") ); TQGridLayout l = new TQGridLayout( this, 2, 2, 5 ); l.addWidget( left, 0, 0 ); diff --git a/qtjava/javalib/examples/scribble/Scribble.java b/qtjava/javalib/examples/scribble/Scribble.java index 1fedd0e2..cb0abf65 100644 --- a/qtjava/javalib/examples/scribble/Scribble.java +++ b/qtjava/javalib/examples/scribble/Scribble.java @@ -153,24 +153,24 @@ Scribble( TQWidget parent, String name ) TQToolBar tools = new TQToolBar( this ); - bSave = new TQToolButton( new TQIconSet(), "Save", "Save as PNG image", this, SLOT(" slotSave()"), tools ); + bSave = new TQToolButton( new TQIconSet(), "Save", "Save as PNG image", this, TQ_SLOT(" slotSave()"), tools ); bSave.setText( "Save as..." ); tools.addSeparator(); - bPColor = new TQToolButton( new TQIconSet(), "Choose Pen Color", "Choose Pen Color", this, SLOT(" slotColor()"), tools ); + bPColor = new TQToolButton( new TQIconSet(), "Choose Pen Color", "Choose Pen Color", this, TQ_SLOT(" slotColor()"), tools ); bPColor.setText( "Choose Pen Color..." ); tools.addSeparator(); bPWidth = new TQSpinBox( 1, 20, 1, tools ); TQToolTip.add( bPWidth, "Choose Pen Width" ); - connect( bPWidth, SIGNAL(" valueChanged( int )"), this, SLOT(" slotWidth( int )") ); + connect( bPWidth, TQ_SIGNAL(" valueChanged( int )"), this, TQ_SLOT(" slotWidth( int )") ); bPWidth.setValue( 3 ); tools.addSeparator(); - bClear = new TQToolButton( new TQIconSet(), "Clear Screen", "Clear Screen", this, SLOT(" slotClear()"), tools ); + bClear = new TQToolButton( new TQIconSet(), "Clear Screen", "Clear Screen", this, TQ_SLOT(" slotClear()"), tools ); bClear.setText( "Clear Screen" ); } diff --git a/qtjava/javalib/examples/showimg/ImageTextEditor.java b/qtjava/javalib/examples/showimg/ImageTextEditor.java index bb4ba0ce..4b6531d0 100644 --- a/qtjava/javalib/examples/showimg/ImageTextEditor.java +++ b/qtjava/javalib/examples/showimg/ImageTextEditor.java @@ -54,23 +54,23 @@ ImageTextEditor( TQImage i, TQWidget parent, String name, int f ) TQPushButton cancel = new TQPushButton("Cancel",hbox); TQPushButton ok = new TQPushButton("OK",hbox); - connect(add,SIGNAL("clicked()"), - this,SLOT("addText()")); + connect(add,TQ_SIGNAL("clicked()"), + this,TQ_SLOT("addText()")); - connect(remove,SIGNAL("clicked()"), - this,SLOT("removeText()")); + connect(remove,TQ_SIGNAL("clicked()"), + this,TQ_SLOT("removeText()")); - connect(ok,SIGNAL("clicked()"), - this,SLOT("accept()")); + connect(ok,TQ_SIGNAL("clicked()"), + this,TQ_SLOT("accept()")); - connect(cancel,SIGNAL("clicked()"), - this,SLOT("reject()")); + connect(cancel,TQ_SIGNAL("clicked()"), + this,TQ_SLOT("reject()")); - connect(languages,SIGNAL("activated(int)"), - this,SLOT("updateText()")); + connect(languages,TQ_SIGNAL("activated(int)"), + this,TQ_SLOT("updateText()")); - connect(keys,SIGNAL("activated(int)"), - this,SLOT("updateText()")); + connect(keys,TQ_SIGNAL("activated(int)"), + this,TQ_SLOT("updateText()")); imageChanged(); } diff --git a/qtjava/javalib/examples/showimg/ImageViewer.java b/qtjava/javalib/examples/showimg/ImageViewer.java index 86f8af26..974a189a 100644 --- a/qtjava/javalib/examples/showimg/ImageViewer.java +++ b/qtjava/javalib/examples/showimg/ImageViewer.java @@ -73,32 +73,32 @@ ImageViewer( TQWidget parent, String name, int wFlags ) saveimage.insertItem( f ); savepixmap.insertItem( f ); } - connect( saveimage, SIGNAL("activated(int)"), this, SLOT("saveImage(int)") ); - connect( savepixmap, SIGNAL("activated(int)"), this, SLOT("savePixmap(int)") ); + connect( saveimage, TQ_SIGNAL("activated(int)"), this, TQ_SLOT("saveImage(int)") ); + connect( savepixmap, TQ_SIGNAL("activated(int)"), this, TQ_SLOT("savePixmap(int)") ); file = new TQPopupMenu( menubar ); menubar.insertItem( "&File", file ); - file.insertItem( "&New window", this, SLOT("newWindow()"), new TQKeySequence(CTRL+Key_N) ); - file.insertItem( "&Open...", this, SLOT("openFile()"), new TQKeySequence(CTRL+Key_O) ); + file.insertItem( "&New window", this, TQ_SLOT("newWindow()"), new TQKeySequence(CTRL+Key_N) ); + file.insertItem( "&Open...", this, TQ_SLOT("openFile()"), new TQKeySequence(CTRL+Key_O) ); si = file.insertItem( "Save image", saveimage ); sp = file.insertItem( "Save pixmap", savepixmap ); file.insertSeparator(); - file.insertItem( "E&xit", tqApp(), SLOT("quit()"), new TQKeySequence(CTRL+Key_Q) ); + file.insertItem( "E&xit", tqApp(), TQ_SLOT("quit()"), new TQKeySequence(CTRL+Key_Q) ); edit = new TQPopupMenu( menubar ); menubar.insertItem( "&Edit", edit ); - edit.insertItem("&Copy", this, SLOT("copy()"), new TQKeySequence(CTRL+Key_C)); - edit.insertItem("&Paste", this, SLOT("paste()"), new TQKeySequence(CTRL+Key_V)); + edit.insertItem("&Copy", this, TQ_SLOT("copy()"), new TQKeySequence(CTRL+Key_C)); + edit.insertItem("&Paste", this, TQ_SLOT("paste()"), new TQKeySequence(CTRL+Key_V)); edit.insertSeparator(); - edit.insertItem("&Horizontal flip", this, SLOT("hFlip()"), new TQKeySequence(ALT+Key_H)); - edit.insertItem("&Vertical flip", this, SLOT("vFlip()"), new TQKeySequence(ALT+Key_V)); - edit.insertItem("&Rotate 180", this, SLOT("rot180()"), new TQKeySequence(ALT+Key_R)); + edit.insertItem("&Horizontal flip", this, TQ_SLOT("hFlip()"), new TQKeySequence(ALT+Key_H)); + edit.insertItem("&Vertical flip", this, TQ_SLOT("vFlip()"), new TQKeySequence(ALT+Key_V)); + edit.insertItem("&Rotate 180", this, TQ_SLOT("rot180()"), new TQKeySequence(ALT+Key_R)); edit.insertSeparator(); - edit.insertItem("&Text...", this, SLOT("editText()")); + edit.insertItem("&Text...", this, TQ_SLOT("editText()")); edit.insertSeparator(); - t1 = edit.insertItem( "Convert to &1 bit", this, SLOT("to1Bit()") ); - t8 = edit.insertItem( "Convert to &8 bit", this, SLOT("to8Bit()") ); - t32 = edit.insertItem( "Convert to &32 bit", this, SLOT("to32Bit()") ); + t1 = edit.insertItem( "Convert to &1 bit", this, TQ_SLOT("to1Bit()") ); + t8 = edit.insertItem( "Convert to &8 bit", this, TQ_SLOT("to8Bit()") ); + t32 = edit.insertItem( "Convert to &32 bit", this, TQ_SLOT("to32Bit()") ); options = new TQPopupMenu( menubar ); menubar.insertItem( "&Options", options ); @@ -128,9 +128,9 @@ ImageViewer( TQWidget parent, String name, int wFlags ) TQPopupMenu help = new TQPopupMenu( menubar ); menubar.insertItem( "&Help", help ); - help.insertItem( "Help!", this, SLOT("giveHelp()"), new TQKeySequence(CTRL+Key_H) ); + help.insertItem( "Help!", this, TQ_SLOT("giveHelp()"), new TQKeySequence(CTRL+Key_H) ); - connect( options, SIGNAL("activated(int)"), this, SLOT("doOption(int)") ); + connect( options, TQ_SIGNAL("activated(int)"), this, TQ_SLOT("doOption(int)") ); status = new TQLabel(this); status.setFrameStyle( TQFrame.WinPanel | TQFrame.Sunken ); diff --git a/qtjava/javalib/examples/showimg/Main.java b/qtjava/javalib/examples/showimg/Main.java index 952e65eb..66d44493 100644 --- a/qtjava/javalib/examples/showimg/Main.java +++ b/qtjava/javalib/examples/showimg/Main.java @@ -47,7 +47,7 @@ public static void main(String[] args) } } - TQObject.connect(Qt.qApp(), Qt.SIGNAL("lastWindowClosed()"), Qt.qApp(), Qt.SLOT("quit()")); + TQObject.connect(Qt.qApp(), Qt.TQ_SIGNAL("lastWindowClosed()"), Qt.qApp(), Qt.TQ_SLOT("quit()")); a.exec(); return; diff --git a/qtjava/javalib/examples/sound/SoundPlayer.java b/qtjava/javalib/examples/sound/SoundPlayer.java index 3cc76d76..73d54b71 100644 --- a/qtjava/javalib/examples/sound/SoundPlayer.java +++ b/qtjava/javalib/examples/sound/SoundPlayer.java @@ -49,15 +49,15 @@ SoundPlayer() } TQPopupMenu file = new TQPopupMenu(this); - file.insertItem("Play &1", this, SLOT("doPlay1()"), new TQKeySequence(CTRL+Key_1)); - file.insertItem("Play &2", this, SLOT("doPlay2()"), new TQKeySequence(CTRL+Key_2)); - file.insertItem("Play from bucket &3", this, SLOT("doPlay3()"), new TQKeySequence(CTRL+Key_3)); - file.insertItem("Play from bucket &4", this, SLOT("doPlay4()"), new TQKeySequence(CTRL+Key_4)); + file.insertItem("Play &1", this, TQ_SLOT("doPlay1()"), new TQKeySequence(CTRL+Key_1)); + file.insertItem("Play &2", this, TQ_SLOT("doPlay2()"), new TQKeySequence(CTRL+Key_2)); + file.insertItem("Play from bucket &3", this, TQ_SLOT("doPlay3()"), new TQKeySequence(CTRL+Key_3)); + file.insertItem("Play from bucket &4", this, TQ_SLOT("doPlay4()"), new TQKeySequence(CTRL+Key_4)); file.insertSeparator(); - file.insertItem("Play 3 and 4 together", this, SLOT("doPlay34()")); - file.insertItem("Play all together", this, SLOT("doPlay1234()")); + file.insertItem("Play 3 and 4 together", this, TQ_SLOT("doPlay34()")); + file.insertItem("Play all together", this, TQ_SLOT("doPlay1234()")); file.insertSeparator(); - file.insertItem("E&xit", tqApp(), SLOT("quit()")); + file.insertItem("E&xit", tqApp(), TQ_SLOT("quit()")); menuBar().insertItem("&File", file); } diff --git a/qtjava/javalib/examples/tabdialog/TabDialog.java b/qtjava/javalib/examples/tabdialog/TabDialog.java index 448b97b7..7ce50053 100644 --- a/qtjava/javalib/examples/tabdialog/TabDialog.java +++ b/qtjava/javalib/examples/tabdialog/TabDialog.java @@ -27,7 +27,7 @@ TabDialog( TQWidget parent, String name, String _filename ) setupTab2(); setupTab3(); - connect( this, SIGNAL(" applyButtonPressed()"), tqApp(), SLOT(" quit()") ); + connect( this, TQ_SIGNAL(" applyButtonPressed()"), tqApp(), TQ_SLOT(" quit()") ); } void setupTab1() diff --git a/qtjava/javalib/examples/textedit/Main.java b/qtjava/javalib/examples/textedit/Main.java index 701c702b..e56f83dd 100644 --- a/qtjava/javalib/examples/textedit/Main.java +++ b/qtjava/javalib/examples/textedit/Main.java @@ -19,7 +19,7 @@ public static void main(String[] args) mw.setCaption( "Richtext Editor" ); mw.resize( 640, 800 ); mw.show(); - a.connect( a, Qt.SIGNAL(" lastWindowClosed()"), a, Qt.SLOT(" quit()") ); + a.connect( a, Qt.TQ_SIGNAL(" lastWindowClosed()"), a, Qt.TQ_SLOT(" quit()") ); a.exec(); return; } diff --git a/qtjava/javalib/examples/textedit/TextEdit.java b/qtjava/javalib/examples/textedit/TextEdit.java index 657981cb..25437140 100644 --- a/qtjava/javalib/examples/textedit/TextEdit.java +++ b/qtjava/javalib/examples/textedit/TextEdit.java @@ -44,8 +44,8 @@ TextEdit( TQWidget parent, String name ) setupTextActions(); tabWidget = new TQTabWidget( this ); - connect( tabWidget, SIGNAL(" currentChanged( TQWidget )"), - this, SLOT(" editorChanged( TQWidget )") ); + connect( tabWidget, TQ_SIGNAL(" currentChanged( TQWidget )"), + this, TQ_SLOT(" editorChanged( TQWidget )") ); setCentralWidget( tabWidget ); if ( tqApp().args().length == 0 ) { @@ -65,31 +65,31 @@ void setupFileActions() TQAction a; a = new TQAction( tr( "New" ), new TQIconSet(new TQPixmap( "filenew.xpm" )), tr( "&New..." ), new TQKeySequence(CTRL + Key_N), this, "fileNew" ); - connect( a, SIGNAL(" activated()"), this, SLOT(" fileNew()") ); + connect( a, TQ_SIGNAL(" activated()"), this, TQ_SLOT(" fileNew()") ); a.addTo( tb ); a.addTo( menu ); a = new TQAction( tr( "Open" ), new TQIconSet(new TQPixmap( "fileopen.xpm" )), tr( "&Open..." ), new TQKeySequence(CTRL + Key_O), this, "fileOpen" ); - connect( a, SIGNAL(" activated()"), this, SLOT(" fileOpen()") ); + connect( a, TQ_SIGNAL(" activated()"), this, TQ_SLOT(" fileOpen()") ); a.addTo( tb ); a.addTo( menu ); menu.insertSeparator(); a = new TQAction( tr( "Save" ), new TQIconSet(new TQPixmap( "filesave.xpm" )), tr( "&Save..." ), new TQKeySequence(CTRL + Key_S), this, "fileSave" ); - connect( a, SIGNAL(" activated()"), this, SLOT(" fileSave()") ); + connect( a, TQ_SIGNAL(" activated()"), this, TQ_SLOT(" fileSave()") ); a.addTo( tb ); a.addTo( menu ); a = new TQAction( tr( "Save As" ), new TQIconSet(new TQPixmap()), tr( "Save &As..." ), new TQKeySequence(0), this, "fileSaveAs" ); - connect( a, SIGNAL(" activated()"), this, SLOT(" fileSaveAs()") ); + connect( a, TQ_SIGNAL(" activated()"), this, TQ_SLOT(" fileSaveAs()") ); a.addTo( menu ); menu.insertSeparator(); a = new TQAction( tr( "Print" ), new TQIconSet(new TQPixmap( "fileprint.xpm" )), tr( "&Print..." ), new TQKeySequence(CTRL + Key_P), this, "filePrint" ); - connect( a, SIGNAL(" activated()"), this, SLOT(" filePrint()") ); + connect( a, TQ_SIGNAL(" activated()"), this, TQ_SLOT(" filePrint()") ); a.addTo( tb ); a.addTo( menu ); a = new TQAction( tr( "Close" ), new TQIconSet(new TQPixmap()), tr( "&Close" ), new TQKeySequence(0), this, "fileClose" ); - connect( a, SIGNAL(" activated()"), this, SLOT(" fileClose()") ); + connect( a, TQ_SIGNAL(" activated()"), this, TQ_SLOT(" fileClose()") ); a.addTo( menu ); a = new TQAction( tr( "Exit" ), new TQIconSet(new TQPixmap()), tr( "E&xit" ), new TQKeySequence(0), this, "fileExit" ); - connect( a, SIGNAL(" activated()"), this, SLOT(" fileExit()") ); + connect( a, TQ_SIGNAL(" activated()"), this, TQ_SLOT(" fileExit()") ); a.addTo( menu ); } @@ -102,24 +102,24 @@ void setupEditActions() TQAction a; a = new TQAction( tr( "Undo" ), new TQIconSet(new TQPixmap( "editundo.xpm" )), tr( "&Undo" ), new TQKeySequence(CTRL + Key_Z), this, "editUndo" ); - connect( a, SIGNAL(" activated()"), this, SLOT(" editUndo()") ); + connect( a, TQ_SIGNAL(" activated()"), this, TQ_SLOT(" editUndo()") ); a.addTo( tb ); a.addTo( menu ); a = new TQAction( tr( "Redo" ), new TQIconSet(new TQPixmap( "editredo.xpm" )), tr( "&Redo" ), new TQKeySequence(CTRL + Key_Y), this, "editRedo" ); - connect( a, SIGNAL(" activated()"), this, SLOT(" editRedo()") ); + connect( a, TQ_SIGNAL(" activated()"), this, TQ_SLOT(" editRedo()") ); a.addTo( tb ); a.addTo( menu ); menu.insertSeparator(); a = new TQAction( tr( "Copy" ), new TQIconSet(new TQPixmap( "editcopy.xpm" )), tr( "&Copy" ), new TQKeySequence(CTRL + Key_C), this, "editCopy" ); - connect( a, SIGNAL(" activated()"), this, SLOT(" editCopy()") ); + connect( a, TQ_SIGNAL(" activated()"), this, TQ_SLOT(" editCopy()") ); a.addTo( tb ); a.addTo( menu ); a = new TQAction( tr( "Cut" ), new TQIconSet(new TQPixmap( "editcut.xpm" )), tr( "Cu&t" ), new TQKeySequence(CTRL + Key_X), this, "editCut" ); - connect( a, SIGNAL(" activated()"), this, SLOT(" editCut()") ); + connect( a, TQ_SIGNAL(" activated()"), this, TQ_SLOT(" editCut()") ); a.addTo( tb ); a.addTo( menu ); a = new TQAction( tr( "Paste" ), new TQIconSet(new TQPixmap( "editpaste.xpm" )), tr( "&Paste" ), new TQKeySequence(CTRL + Key_V), this, "editPaste" ); - connect( a, SIGNAL(" activated()"), this, SLOT(" editPaste()") ); + connect( a, TQ_SIGNAL(" activated()"), this, TQ_SLOT(" editPaste()") ); a.addTo( tb ); a.addTo( menu ); } @@ -139,36 +139,36 @@ void setupTextActions() comboStyle.insertItem( "Ordered List (Decimal)" ); comboStyle.insertItem( "Ordered List (Alpha lower)" ); comboStyle.insertItem( "Ordered List (Alpha upper)" ); - connect( comboStyle, SIGNAL(" activated( int )"), - this, SLOT(" textStyle( int )") ); + connect( comboStyle, TQ_SIGNAL(" activated( int )"), + this, TQ_SLOT(" textStyle( int )") ); comboFont = new TQComboBox( true, tb ); TQFontDatabase db = new TQFontDatabase(); comboFont.insertStringList( (String[]) db.families().toArray(new String[0]) ); - connect( comboFont, SIGNAL(" activated( String )"), - this, SLOT(" textFamily( String )") ); + connect( comboFont, TQ_SIGNAL(" activated( String )"), + this, TQ_SLOT(" textFamily( String )") ); comboFont.lineEdit().setText( TQApplication.font().family() ); comboSize = new TQComboBox( true, tb ); int[] sizes = db.standardSizes(); for (int i = 0; i < sizes.length; i++ ) comboSize.insertItem( Integer.toString(sizes[i]) ); - connect( comboSize, SIGNAL(" activated( String )"), - this, SLOT(" textSize( String )") ); + connect( comboSize, TQ_SIGNAL(" activated( String )"), + this, TQ_SLOT(" textSize( String )") ); comboSize.lineEdit().setText( Integer.toString( TQApplication.font().pointSize() ) ); actionTextBold = new TQAction( tr( "Bold" ), new TQIconSet(new TQPixmap( "textbold.xpm" )), tr( "&Bold" ), new TQKeySequence(CTRL + Key_B), this, "textBold" ); - connect( actionTextBold, SIGNAL(" activated()"), this, SLOT(" textBold()") ); + connect( actionTextBold, TQ_SIGNAL(" activated()"), this, TQ_SLOT(" textBold()") ); actionTextBold.addTo( tb ); actionTextBold.addTo( menu ); actionTextBold.setToggleAction( true ); actionTextItalic = new TQAction( tr( "Italic" ), new TQIconSet(new TQPixmap( "textitalic.xpm" )), tr( "&Italic" ), new TQKeySequence(CTRL + Key_I), this, "textItalic" ); - connect( actionTextItalic, SIGNAL(" activated()"), this, SLOT(" textItalic()") ); + connect( actionTextItalic, TQ_SIGNAL(" activated()"), this, TQ_SLOT(" textItalic()") ); actionTextItalic.addTo( tb ); actionTextItalic.addTo( menu ); actionTextItalic.setToggleAction( true ); actionTextUnderline = new TQAction( tr( "Underline" ), new TQIconSet(new TQPixmap( "textunder.xpm" )), tr( "&Underline" ), new TQKeySequence(CTRL + Key_U), this, "textUnderline" ); - connect( actionTextUnderline, SIGNAL(" activated()"), this, SLOT(" textUnderline()") ); + connect( actionTextUnderline, TQ_SIGNAL(" activated()"), this, TQ_SLOT(" textUnderline()") ); actionTextUnderline.addTo( tb ); actionTextUnderline.addTo( menu ); actionTextUnderline.setToggleAction( true ); @@ -176,7 +176,7 @@ void setupTextActions() TQActionGroup grp = new TQActionGroup( this ); grp.setExclusive( true ); - connect( grp, SIGNAL(" selected( TQAction )"), this, SLOT(" textAlign( TQAction )") ); + connect( grp, TQ_SIGNAL(" selected( TQAction )"), this, TQ_SLOT(" textAlign( TQAction )") ); actionAlignLeft = new TQAction( tr( "Left" ), new TQIconSet(new TQPixmap( "textleft.xpm" )), tr( "&Left" ), new TQKeySequence(CTRL + Key_L), grp, "textLeft" ); actionAlignLeft.addTo( tb ); @@ -200,7 +200,7 @@ void setupTextActions() TQPixmap pix = new TQPixmap( 16, 16 ); pix.fill( black() ); actionTextColor = new TQAction( tr( "Color" ), new TQIconSet(pix), tr( "&Color..." ), new TQKeySequence(0), this, "textColor" ); - connect( actionTextColor, SIGNAL(" activated()"), this, SLOT(" textColor()") ); + connect( actionTextColor, TQ_SIGNAL(" activated()"), this, TQ_SLOT(" textColor()") ); actionTextColor.addTo( tb ); actionTextColor.addTo( menu ); } @@ -232,12 +232,12 @@ TQTextEdit currentEditor() void doConnections( TQTextEdit e ) { - connect( e, SIGNAL(" currentFontChanged( TQFont )"), - this, SLOT(" fontChanged( TQFont )") ); - connect( e, SIGNAL(" currentColorChanged( TQColor )"), - this, SLOT(" colorChanged( TQColor )") ); - connect( e, SIGNAL(" currentAlignmentChanged( int )"), - this, SLOT(" alignmentChanged( int )") ); + connect( e, TQ_SIGNAL(" currentFontChanged( TQFont )"), + this, TQ_SLOT(" fontChanged( TQFont )") ); + connect( e, TQ_SIGNAL(" currentColorChanged( TQColor )"), + this, TQ_SLOT(" colorChanged( TQColor )") ); + connect( e, TQ_SIGNAL(" currentAlignmentChanged( int )"), + this, TQ_SLOT(" alignmentChanged( int )") ); } void fileNew() diff --git a/qtjava/javalib/examples/widgets/WidgetView.java b/qtjava/javalib/examples/widgets/WidgetView.java index e1ae373f..8ef42f9b 100644 --- a/qtjava/javalib/examples/widgets/WidgetView.java +++ b/qtjava/javalib/examples/widgets/WidgetView.java @@ -219,7 +219,7 @@ WidgetView( TQWidget parent, String name ) // put something in it TQPixmap openIcon = new TQPixmap( fileopen ); TQToolButton toolb = new TQToolButton( new TQIconSet(openIcon), "toolbutton 1", - "", this, SLOT("open()"), + "", this, TQ_SLOT("open()"), tools, "open file" ); TQWhatsThis.add( toolb, "This is a <b>TQToolButton</b>. It lives in a " + "TQToolBar. This particular button doesn't do anything " @@ -227,13 +227,13 @@ WidgetView( TQWidget parent, String name ) TQPixmap saveIcon = new TQPixmap( filesave ); toolb = new TQToolButton( new TQIconSet(saveIcon), "toolbutton 2", "", - this, SLOT("dummy()"), + this, TQ_SLOT("dummy()"), tools, "save file" ); TQWhatsThis.add( toolb, "This is also a <b>TQToolButton</b>." ); TQPixmap printIcon = new TQPixmap( fileprint ); toolb = new TQToolButton( new TQIconSet(printIcon), "toolbutton 3", "", - this, SLOT("dummy()"), + this, TQ_SLOT("dummy()"), tools, "print file" ); TQWhatsThis.add( toolb, "This is the third <b>TQToolButton</b>."); @@ -265,10 +265,10 @@ WidgetView( TQWidget parent, String name ) int id; id = popup.insertItem( "&New" ); popup.setItemEnabled( id, false ); - id = popup.insertItem( new TQIconSet(openIcon), "&Open", this, SLOT(" open()") ); + id = popup.insertItem( new TQIconSet(openIcon), "&Open", this, TQ_SLOT(" open()") ); popup.insertSeparator(); - popup.insertItem( "&Quit", tqApp(), SLOT("quit()"), new TQKeySequence(CTRL+Key_Q) ); + popup.insertItem( "&Quit", tqApp(), TQ_SLOT("quit()"), new TQKeySequence(CTRL+Key_Q) ); textStylePopup = popup = new TQPopupMenu( this ); @@ -294,8 +294,8 @@ WidgetView( TQWidget parent, String name ) f = font(); f.setStrikeOut( true ); id = popup.insertItem( new MyMenuItem( "&Strike", f ) ); - connect( textStylePopup, SIGNAL("activated(int)"), - this, SLOT("popupSelected(int)") ); + connect( textStylePopup, TQ_SIGNAL("activated(int)"), + this, TQ_SLOT("popupSelected(int)") ); */ // Create an analog and a digital clock aclock = new AnalogClock( central ); @@ -317,7 +317,7 @@ WidgetView( TQWidget parent, String name ) TQPushButton pb; pb = new TQPushButton( "&Push button 1", central, "button1" ); grid.addWidget( pb, 0, 0, AlignVCenter ); - connect( pb, SIGNAL("clicked()"), SLOT("button1Clicked()") ); + connect( pb, TQ_SIGNAL("clicked()"), TQ_SLOT("button1Clicked()") ); TQToolTip.add( pb, "push button 1" ); TQWhatsThis.add( pb, "This is a <b>TQPushButton</b>.<br>" + "Click it and watch...<br>" @@ -336,8 +336,8 @@ WidgetView( TQWidget parent, String name ) // Create a label containing a TQMovie movie = new TQMovie( MOVIEFILENAME ); movielabel = new TQLabel( central, "label0" ); - movie.connectStatus(this, SLOT("movieStatus(int)")); - movie.connectUpdate(this, SLOT("movieUpdate(TQRect)")); + movie.connectStatus(this, TQ_SLOT("movieStatus(int)")); + movie.connectUpdate(this, TQ_SLOT("movieUpdate(TQRect)")); movielabel.setFrameStyle( TQFrame.Box | TQFrame.Plain ); movielabel.setMovie( movie ); movielabel.setFixedSize( 128+movielabel.frameWidth()*2, @@ -367,7 +367,7 @@ WidgetView( TQWidget parent, String name ) cb[2].setText( "&Execute" ); vbox.addWidget( cb[2] ); - connect( bg, SIGNAL("clicked(int)"), SLOT("checkBoxClicked(int)") ); + connect( bg, TQ_SIGNAL("clicked(int)"), TQ_SLOT("checkBoxClicked(int)") ); TQToolTip.add( cb[0], "check box 1" ); TQToolTip.add( cb[1], "check box 2" ); @@ -397,7 +397,7 @@ WidgetView( TQWidget parent, String name ) rb.setText( "&Short Wave" ); vbox.addWidget(rb); - connect( bg, SIGNAL("clicked(int)"), SLOT("radioButtonClicked(int)") ); + connect( bg, TQ_SIGNAL("clicked(int)"), TQ_SLOT("radioButtonClicked(int)") ); TQToolTip.add( rb, "radio button 3" ); // Create a list box @@ -410,7 +410,7 @@ WidgetView( TQWidget parent, String name ) lb.insertItem( str ); } grid.addMultiCellWidget( lb, 2, 4, 0, 0 ); - connect( lb, SIGNAL("selected(int)"), SLOT("listBoxItemSelected(int)") ); + connect( lb, TQ_SIGNAL("selected(int)"), TQ_SLOT("listBoxItemSelected(int)") ); TQToolTip.add( lb, "list box" ); // new MyWhatsThis( lb ); @@ -425,7 +425,7 @@ WidgetView( TQWidget parent, String name ) sb.setFocusPolicy( TQWidget.TabFocus ); vbox.addWidget( sb ); - connect( sb, SIGNAL("valueChanged(int)"), SLOT("sliderValueChanged(int)") ); + connect( sb, TQ_SIGNAL("valueChanged(int)"), TQ_SLOT("sliderValueChanged(int)") ); TQToolTip.add( sb, "slider" ); TQWhatsThis.add( sb, "This is a <b>TQSlider</b>. " + "The tick marks are optional." @@ -438,8 +438,8 @@ WidgetView( TQWidget parent, String name ) combo.insertItem( "blue" ); combo.insertItem( "red" ); vbox.addWidget( combo ); - connect( combo, SIGNAL("activated(int)"), - this, SLOT("comboBoxItemActivated(int)") ); + connect( combo, TQ_SIGNAL("activated(int)"), + this, TQ_SLOT("comboBoxItemActivated(int)") ); TQToolTip.add( combo, "read-only combo box" ); // Create an editable combo box @@ -450,8 +450,8 @@ WidgetView( TQWidget parent, String name ) edCombo.insertItem( "Alterable" ); edCombo.insertItem( "Inconstant" ); vbox.addWidget( edCombo ); - connect( edCombo, SIGNAL("activated(String)"), - this, SLOT("edComboBoxItemActivated(String)") ); + connect( edCombo, TQ_SIGNAL("activated(String)"), + this, TQ_SLOT("edComboBoxItemActivated(String)") ); TQToolTip.add( edCombo, "editable combo box" ); edCombo.setAutoCompletion( true ); @@ -463,8 +463,8 @@ WidgetView( TQWidget parent, String name ) TQSpinBox spin = new TQSpinBox( 0, 10, 1, central, "spin" ); spin.setSuffix(" mm"); spin.setSpecialValueText( "Auto" ); - connect( spin, SIGNAL(" valueChanged(String)"), - SLOT(" spinBoxValueChanged(String)") ); + connect( spin, TQ_SIGNAL(" valueChanged(String)"), + TQ_SLOT(" spinBoxValueChanged(String)") ); TQToolTip.add( spin, "spin box" ); TQWhatsThis.add( spin, "This is a <b>TQSpinBox</b>. " + "You can chose values in a given range " @@ -514,8 +514,8 @@ WidgetView( TQWidget parent, String name ) grid.addMultiCellWidget( le, 4, 4, 1, 2 ); - connect( le, SIGNAL("textChanged(String)"), - SLOT("lineEditTextChanged(String)") ); + connect( le, TQ_SIGNAL("textChanged(String)"), + TQ_SLOT("lineEditTextChanged(String)") ); TQToolTip.add( le, "single line editor" ); TQWhatsThis.add( le, "This is a <b>TQLineEdit</b>, you can enter a " + "single line of text in it. " @@ -536,14 +536,14 @@ WidgetView( TQWidget parent, String name ) split.setOpaqueResize( true ); topLayout.addWidget( split, 1 ); TQListView lv = new MyListView( split ); - connect(lv, SIGNAL("selectionChanged()"), - this, SLOT(" selectionChanged()") ); - connect(lv, SIGNAL("selectionChanged(TQListViewItem)"), - this, SLOT(" selectionChanged(TQListViewItem)") ); - connect(lv, SIGNAL("clicked(TQListViewItem)"), - this, SLOT(" clicked(TQListViewItem)") ); - connect(lv, SIGNAL("mySelectionChanged(TQListViewItem)"), - this, SLOT(" mySelectionChanged(TQListViewItem)") ); + connect(lv, TQ_SIGNAL("selectionChanged()"), + this, TQ_SLOT(" selectionChanged()") ); + connect(lv, TQ_SIGNAL("selectionChanged(TQListViewItem)"), + this, TQ_SLOT(" selectionChanged(TQListViewItem)") ); + connect(lv, TQ_SIGNAL("clicked(TQListViewItem)"), + this, TQ_SLOT(" clicked(TQListViewItem)") ); + connect(lv, TQ_SIGNAL("mySelectionChanged(TQListViewItem)"), + this, TQ_SLOT(" mySelectionChanged(TQListViewItem)") ); lv.addColumn( "One" ); lv.addColumn( "Two" ); lv.setAllColumnsShowFocus( true ); @@ -603,7 +603,7 @@ WidgetView( TQWidget parent, String name ) TQAccel a = new TQAccel( this ); a.connectItem( a.insertItem( new TQKeySequence(Key_F9) ), - this, SLOT(" showProperties()") ); + this, TQ_SLOT(" showProperties()") ); prog = new TQProgressBar( statusBar(), "progress" ); prog.setTotalSteps( 100 ); diff --git a/qtjava/javalib/examples/wizard/Wizard.java b/qtjava/javalib/examples/wizard/Wizard.java index 6c3a42d7..5268202f 100644 --- a/qtjava/javalib/examples/wizard/Wizard.java +++ b/qtjava/javalib/examples/wizard/Wizard.java @@ -30,8 +30,8 @@ Wizard( TQWidget parent, String name ) setupPage1(); setupPage2(); setupPage3(); - connect(this, SIGNAL("selected(String)"), this, SLOT("doShowPage(String)")); - connect(finishButton(), SIGNAL("clicked()"), tqApp(), SLOT("quit()")); + connect(this, TQ_SIGNAL("selected(String)"), this, TQ_SLOT("doShowPage(String)")); + connect(finishButton(), TQ_SIGNAL("clicked()"), tqApp(), TQ_SLOT("quit()")); key.setFocus(); } @@ -59,8 +59,8 @@ void setupPage1() key.setMaxLength( 4 ); key.setValidator( new TQIntValidator( 1000, 9999, key ) ); - connect( key, SIGNAL(" textChanged( String )"), - this, SLOT(" keyChanged( String )") ); + connect( key, TQ_SIGNAL(" textChanged( String )"), + this, TQ_SLOT(" keyChanged( String )") ); addPage( page1, "Personal Key" ); @@ -115,12 +115,12 @@ void setupPage2() phone = new TQLineEdit( row4 ); email = new TQLineEdit( row5 ); - connect( firstName, SIGNAL(" textChanged( String )"), - this, SLOT(" dataChanged( String )") ); - connect( lastName, SIGNAL(" textChanged( String )"), - this, SLOT(" dataChanged( String )") ); - connect( email, SIGNAL(" textChanged( String )"), - this, SLOT(" dataChanged( String )") ); + connect( firstName, TQ_SIGNAL(" textChanged( String )"), + this, TQ_SLOT(" dataChanged( String )") ); + connect( lastName, TQ_SIGNAL(" textChanged( String )"), + this, TQ_SLOT(" dataChanged( String )") ); + connect( email, TQ_SIGNAL(" textChanged( String )"), + this, TQ_SLOT(" dataChanged( String )") ); addPage( page2, "Personal Data" ); diff --git a/qtjava/javalib/org/trinitydesktop/qt/Qt.java b/qtjava/javalib/org/trinitydesktop/qt/Qt.java index 6b9311b6..2532d136 100644 --- a/qtjava/javalib/org/trinitydesktop/qt/Qt.java +++ b/qtjava/javalib/org/trinitydesktop/qt/Qt.java @@ -1115,12 +1115,12 @@ public class Qt implements QtSupport { } /** Prepend a '2' to a signal string and remove any spaces */ - public static String SIGNAL(String signal) { + public static String TQ_SIGNAL(String signal) { return "2" + sqeezeOut(signal, ' '); } /** Prepend a '1' to a slot string and remove any spaces */ - public static String SLOT(String slot) { + public static String TQ_SLOT(String slot) { return "1" + sqeezeOut(slot, ' '); } diff --git a/qtjava/javalib/test/AppWizardBase.java b/qtjava/javalib/test/AppWizardBase.java index 7eec9481..fcb04c79 100644 --- a/qtjava/javalib/test/AppWizardBase.java +++ b/qtjava/javalib/test/AppWizardBase.java @@ -181,8 +181,8 @@ AppWizardBase( TQWidget parent, String name, boolean modal, int fl ) addPage( privateWidget_2, tr( "Header" ) ); // signals and slots connections - connect( loadheader_button, SIGNAL( "clicked()" ), this, SLOT( "slotLoadHeader()" ) ); - connect( newheader_button, SIGNAL( "clicked()" ), this, SLOT( "slotNewHeader()" ) ); + connect( loadheader_button, TQ_SIGNAL( "clicked()" ), this, TQ_SLOT( "slotLoadHeader()" ) ); + connect( newheader_button, TQ_SIGNAL( "clicked()" ), this, TQ_SLOT( "slotNewHeader()" ) ); // tab order setTabOrder( loadheader_button, newheader_button ); diff --git a/qtjava/javalib/test/FilePropsPageBase.java b/qtjava/javalib/test/FilePropsPageBase.java index d583a05b..48e79172 100644 --- a/qtjava/javalib/test/FilePropsPageBase.java +++ b/qtjava/javalib/test/FilePropsPageBase.java @@ -114,8 +114,8 @@ public FilePropsPageBase( TQWidget parent, String name, int fl ) grid.addWidget( desc_textview, 1, 1 ); // signals and slots connections - connect( classname_edit, SIGNAL( "textChanged(String)" ), this, SLOT( "slotClassnameChanged(String)" ) ); - connect( classes_listbox, SIGNAL( "mouseButtonClicked(int,TQListBoxItem,TQPoint)" ), this, SLOT( "slotSelectionChanged()" ) ); + connect( classname_edit, TQ_SIGNAL( "textChanged(String)" ), this, TQ_SLOT( "slotClassnameChanged(String)" ) ); + connect( classes_listbox, TQ_SIGNAL( "mouseButtonClicked(int,TQListBoxItem,TQPoint)" ), this, TQ_SLOT( "slotSelectionChanged()" ) ); // tab order setTabOrder( classes_listbox, classname_edit ); diff --git a/qtjava/javalib/test/ISBNValidator.java b/qtjava/javalib/test/ISBNValidator.java index 1f03525e..1d909a10 100644 --- a/qtjava/javalib/test/ISBNValidator.java +++ b/qtjava/javalib/test/ISBNValidator.java @@ -148,8 +148,8 @@ public class ISBNValidator extends TQValidator // set up a receiver for the returnPressed() signal ReturnReceiver receiver = new ReturnReceiver(); - TQObject.connect( myedit, SIGNAL( "returnPressed()" ), - receiver, SLOT( "slotReturnPressed()" ) ); + TQObject.connect( myedit, TQ_SIGNAL( "returnPressed()" ), + receiver, TQ_SLOT( "slotReturnPressed()" ) ); myapp.setMainWidget( myedit ); myedit.show(); diff --git a/qtjava/javalib/test/ScribbleWindow.java b/qtjava/javalib/test/ScribbleWindow.java index 33296e3d..fc040f17 100644 --- a/qtjava/javalib/test/ScribbleWindow.java +++ b/qtjava/javalib/test/ScribbleWindow.java @@ -42,7 +42,7 @@ public class ScribbleWindow extends TQWidget { // create a pop-up menu _popupmenu = new TQPopupMenu(); - _popupmenu.insertItem( "&Clear", this, SLOT( "slotClearArea()" ) ); + _popupmenu.insertItem( "&Clear", this, TQ_SLOT( "slotClearArea()" ) ); } /** @@ -167,10 +167,10 @@ public class ScribbleWindow extends TQWidget { /* The next lines build the menu bar. We first create the menus * one by one, then add them to the menu bar. */ _filemenu = new TQPopupMenu(); // create a file menu - _filemenu.insertItem( "&Load", this, SLOT( "slotLoad()" ) ); - _filemenu.insertItem( "&Save", this, SLOT( "slotSave()" ) ); + _filemenu.insertItem( "&Load", this, TQ_SLOT( "slotLoad()" ) ); + _filemenu.insertItem( "&Save", this, TQ_SLOT( "slotSave()" ) ); _filemenu.insertSeparator(); - _filemenu.insertItem( "&Quit", tqApp(), SLOT( "quit()" ) ); + _filemenu.insertItem( "&Quit", tqApp(), TQ_SLOT( "quit()" ) ); _colormenu = new TQPopupMenu(); // create a color menu _colormenu.insertItem( "B&lack", COLOR_MENU_ID_BLACK); @@ -178,12 +178,12 @@ public class ScribbleWindow extends TQWidget { _colormenu.insertItem( "&Blue", COLOR_MENU_ID_BLUE); _colormenu.insertItem( "&Green", COLOR_MENU_ID_GREEN); _colormenu.insertItem( "&Yellow", COLOR_MENU_ID_YELLOW); - TQObject.connect( _colormenu, SIGNAL( "activated( int )" ), - this, SLOT( "slotColorMenu( int )" ) ); + TQObject.connect( _colormenu, TQ_SIGNAL( "activated( int )" ), + this, TQ_SLOT( "slotColorMenu( int )" ) ); _helpmenu = new TQPopupMenu(); // create a help menu - _helpmenu.insertItem( "&About QtScribble", this, SLOT( "slotAbout()" ) ); - _helpmenu.insertItem( "&About Qt", this, SLOT( "slotAboutQt()" ) ); + _helpmenu.insertItem( "&About QtScribble", this, TQ_SLOT( "slotAbout()" ) ); + _helpmenu.insertItem( "&About Qt", this, TQ_SLOT( "slotAboutQt()" ) ); _menubar = new TQMenuBar( this, "" ); // create a menu bar _menubar.insertItem( "&File", _filemenu ); @@ -198,12 +198,12 @@ public class ScribbleWindow extends TQWidget { _scribblearea = new ScribbleArea(); _scribblearea.setGeometry( 0, 0, 1000, 1000 ); _scrollview.addChild( _scribblearea ); - TQObject.connect( this, SIGNAL( "colorChanged( TQColor )" ), - _scribblearea, SLOT( "setColor( TQColor )" ) ); - TQObject.connect( this, SIGNAL( "save( String )" ), - _scribblearea, SLOT( "slotSave( String )" ) ); - TQObject.connect( this, SIGNAL( "load(String)" ), - _scribblearea, SLOT( "slotLoad( String )" ) ); + TQObject.connect( this, TQ_SIGNAL( "colorChanged( TQColor )" ), + _scribblearea, TQ_SLOT( "setColor( TQColor )" ) ); + TQObject.connect( this, TQ_SIGNAL( "save( String )" ), + _scribblearea, TQ_SLOT( "slotSave( String )" ) ); + TQObject.connect( this, TQ_SIGNAL( "load(String)" ), + _scribblearea, TQ_SLOT( "slotLoad( String )" ) ); } protected void resizeEvent( TQResizeEvent event ) diff --git a/qtjava/javalib/test/SignalForwarder.java b/qtjava/javalib/test/SignalForwarder.java index 28d02560..1d6f2726 100644 --- a/qtjava/javalib/test/SignalForwarder.java +++ b/qtjava/javalib/test/SignalForwarder.java @@ -4,8 +4,8 @@ public class SignalForwarder extends TQDialog { SignalForwarder() { TQPushButton searchButton = new TQPushButton("Search", this); - connect( searchButton, SIGNAL("clicked()"), this, SIGNAL("continueSearch()")); - connect( this, SIGNAL("continueSearch()"), this, SLOT("slotContinueSearch()")); + connect( searchButton, TQ_SIGNAL("clicked()"), this, TQ_SIGNAL("continueSearch()")); + connect( this, TQ_SIGNAL("continueSearch()"), this, TQ_SLOT("slotContinueSearch()")); } public void slotContinueSearch() diff --git a/qtjava/javalib/test/TQTimerTest.java b/qtjava/javalib/test/TQTimerTest.java index c10af496..c68fe67e 100644 --- a/qtjava/javalib/test/TQTimerTest.java +++ b/qtjava/javalib/test/TQTimerTest.java @@ -44,7 +44,7 @@ public class TQTimerTest extends TQWidget { // create a pop-up menu _popupmenu = new TQPopupMenu(); - _popupmenu.insertItem( "&Clear", this, Qt.SLOT( "slotClearArea()" ) ); + _popupmenu.insertItem( "&Clear", this, Qt.TQ_SLOT( "slotClearArea()" ) ); } /** @@ -170,10 +170,10 @@ public class TQTimerTest extends TQWidget { /* The next lines build the menu bar. We first create the menus * one by one, then add them to the menu bar. */ _filemenu = new TQPopupMenu(); // create a file menu - _filemenu.insertItem( "&Load", this, Qt.SLOT( "slotLoad()" ) ); - _filemenu.insertItem( "&Save", this, Qt.SLOT( "slotSave()" ) ); + _filemenu.insertItem( "&Load", this, Qt.TQ_SLOT( "slotLoad()" ) ); + _filemenu.insertItem( "&Save", this, Qt.TQ_SLOT( "slotSave()" ) ); _filemenu.insertSeparator(); - _filemenu.insertItem( "&Quit", Qt.qApp(), Qt.SLOT( "quit()" ) ); + _filemenu.insertItem( "&Quit", Qt.qApp(), Qt.TQ_SLOT( "quit()" ) ); _colormenu = new TQPopupMenu(); // create a color menu _colormenu.insertItem( "B&lack", COLOR_MENU_ID_BLACK); @@ -181,12 +181,12 @@ public class TQTimerTest extends TQWidget { _colormenu.insertItem( "&Blue", COLOR_MENU_ID_BLUE); _colormenu.insertItem( "&Green", COLOR_MENU_ID_GREEN); _colormenu.insertItem( "&Yellow", COLOR_MENU_ID_YELLOW); - TQObject.connect( _colormenu, SIGNAL( "activated(int)" ), - this, SLOT( "slotColorMenu(int)" ) ); + TQObject.connect( _colormenu, TQ_SIGNAL( "activated(int)" ), + this, TQ_SLOT( "slotColorMenu(int)" ) ); _helpmenu = new TQPopupMenu(); // create a help menu - _helpmenu.insertItem( "&About QtScribble", this, SLOT( "slotAbout()" ) ); - _helpmenu.insertItem( "&About Qt", this, SLOT( "slotAboutQt()" ) ); + _helpmenu.insertItem( "&About QtScribble", this, TQ_SLOT( "slotAbout()" ) ); + _helpmenu.insertItem( "&About Qt", this, TQ_SLOT( "slotAboutQt()" ) ); _menubar = new TQMenuBar( this, "" ); // create a menu bar _menubar.insertItem( "&File", _filemenu ); @@ -201,12 +201,12 @@ public class TQTimerTest extends TQWidget { _scribblearea = new ScribbleArea(); _scribblearea.setGeometry( 0, 0, 1000, 1000 ); _scrollview.addChild( _scribblearea ); - TQObject.connect( this, SIGNAL( "colorChanged(TQColor)" ), - _scribblearea, SLOT( "setColor(TQColor)" ) ); - TQObject.connect( this, SIGNAL( "save(java.lang.String)" ), - _scribblearea, SLOT( "slotSave(java.lang.String)" ) ); - TQObject.connect( this, SIGNAL( "load(java.lang.String)" ), - _scribblearea, SLOT( "slotLoad(java.lang.String)" ) ); + TQObject.connect( this, TQ_SIGNAL( "colorChanged(TQColor)" ), + _scribblearea, TQ_SLOT( "setColor(TQColor)" ) ); + TQObject.connect( this, TQ_SIGNAL( "save(java.lang.String)" ), + _scribblearea, TQ_SLOT( "slotSave(java.lang.String)" ) ); + TQObject.connect( this, TQ_SIGNAL( "load(java.lang.String)" ), + _scribblearea, TQ_SLOT( "slotLoad(java.lang.String)" ) ); } public void resizeEvent( TQResizeEvent event ) @@ -298,8 +298,8 @@ public class TQTimerTest extends TQWidget { mywidget.setGeometry(50, 500, 400, 400); TQTimer timer = new TQTimer( mywidget ); - connect( timer, Qt.SIGNAL("timeout()"), - mywidget, Qt.SLOT("timerDone()") ); + connect( timer, Qt.TQ_SIGNAL("timeout()"), + mywidget, Qt.TQ_SLOT("timerDone()") ); timer.start( 2000, false ); // 2 seconds single-shot myapp.setMainWidget(mywidget); diff --git a/qtjava/javalib/tutorial/t10/LCDRange.java b/qtjava/javalib/tutorial/t10/LCDRange.java index 877c65de..71fdd7e0 100644 --- a/qtjava/javalib/tutorial/t10/LCDRange.java +++ b/qtjava/javalib/tutorial/t10/LCDRange.java @@ -10,10 +10,10 @@ public class LCDRange extends TQVBox { slider.setRange(0, 99); slider.setValue(0); - connect(slider, SIGNAL("valueChanged(int)"), - lcd, SLOT("display(int)")); - connect(slider, SIGNAL("valueChanged(int)"), - SIGNAL("valueChanged(int)")); + connect(slider, TQ_SIGNAL("valueChanged(int)"), + lcd, TQ_SLOT("display(int)")); + connect(slider, TQ_SIGNAL("valueChanged(int)"), + TQ_SIGNAL("valueChanged(int)")); setFocusProxy(slider); } diff --git a/qtjava/javalib/tutorial/t10/Tut10.java b/qtjava/javalib/tutorial/t10/Tut10.java index 2ad781f8..4fd64bb0 100644 --- a/qtjava/javalib/tutorial/t10/Tut10.java +++ b/qtjava/javalib/tutorial/t10/Tut10.java @@ -5,7 +5,7 @@ public class Tut10 extends TQWidget { TQPushButton quit = new TQPushButton("&Quit", this, "quit"); quit.setFont(new TQFont("Times", 18, TQFont.Bold, false)); - connect(quit, SIGNAL("clicked()"), tqApp(), SLOT("quit()")); + connect(quit, TQ_SIGNAL("clicked()"), tqApp(), TQ_SLOT("quit()")); LCDRange angle = new LCDRange(this, "angle"); angle.setRange(5, 70); @@ -15,15 +15,15 @@ public class Tut10 extends TQWidget { CannonField cannonField = new CannonField(this, "cannonField"); - connect(angle, SIGNAL("valueChanged(int)"), - cannonField, SLOT("setAngle(int)")); - connect(cannonField, SIGNAL("angleChanged(int)"), - angle, SLOT("setValue(int)")); + connect(angle, TQ_SIGNAL("valueChanged(int)"), + cannonField, TQ_SLOT("setAngle(int)")); + connect(cannonField, TQ_SIGNAL("angleChanged(int)"), + angle, TQ_SLOT("setValue(int)")); - connect(force, SIGNAL("valueChanged(int)"), - cannonField, SLOT("setForce(int)")); - connect(cannonField, SIGNAL("forceChanged(int)"), - force, SLOT("setValue(int)")); + connect(force, TQ_SIGNAL("valueChanged(int)"), + cannonField, TQ_SLOT("setForce(int)")); + connect(cannonField, TQ_SIGNAL("forceChanged(int)"), + force, TQ_SLOT("setValue(int)")); TQGridLayout grid = new TQGridLayout(this, 2, 2, 10, -1, null); grid.addWidget(quit, 0, 0); diff --git a/qtjava/javalib/tutorial/t11/CannonField.java b/qtjava/javalib/tutorial/t11/CannonField.java index 8ba81253..5b4e494a 100644 --- a/qtjava/javalib/tutorial/t11/CannonField.java +++ b/qtjava/javalib/tutorial/t11/CannonField.java @@ -16,8 +16,8 @@ public class CannonField extends TQWidget { f = 0; timerCount = 0; autoShootTimer = new TQTimer(this, "movement handler"); - connect(autoShootTimer, SIGNAL("timeout()"), - this, SLOT("moveShot()")); + connect(autoShootTimer, TQ_SIGNAL("timeout()"), + this, TQ_SLOT("moveShot()")); shoot_ang = 0; shoot_f = 0; diff --git a/qtjava/javalib/tutorial/t11/LCDRange.java b/qtjava/javalib/tutorial/t11/LCDRange.java index 877c65de..71fdd7e0 100644 --- a/qtjava/javalib/tutorial/t11/LCDRange.java +++ b/qtjava/javalib/tutorial/t11/LCDRange.java @@ -10,10 +10,10 @@ public class LCDRange extends TQVBox { slider.setRange(0, 99); slider.setValue(0); - connect(slider, SIGNAL("valueChanged(int)"), - lcd, SLOT("display(int)")); - connect(slider, SIGNAL("valueChanged(int)"), - SIGNAL("valueChanged(int)")); + connect(slider, TQ_SIGNAL("valueChanged(int)"), + lcd, TQ_SLOT("display(int)")); + connect(slider, TQ_SIGNAL("valueChanged(int)"), + TQ_SIGNAL("valueChanged(int)")); setFocusProxy(slider); } diff --git a/qtjava/javalib/tutorial/t11/Tut11.java b/qtjava/javalib/tutorial/t11/Tut11.java index 3eb3153f..54effd1f 100644 --- a/qtjava/javalib/tutorial/t11/Tut11.java +++ b/qtjava/javalib/tutorial/t11/Tut11.java @@ -5,7 +5,7 @@ public class Tut11 extends TQWidget { TQPushButton quit = new TQPushButton("&Quit", this, "quit"); quit.setFont(new TQFont("Times", 18, TQFont.Bold, false)); - connect(quit, SIGNAL("clicked()"), tqApp(), SLOT("quit()")); + connect(quit, TQ_SIGNAL("clicked()"), tqApp(), TQ_SLOT("quit()")); LCDRange angle = new LCDRange(this, "angle"); angle.setRange(5, 70); @@ -15,21 +15,21 @@ public class Tut11 extends TQWidget { CannonField cannonField = new CannonField(this, "cannonField"); - connect(angle, SIGNAL("valueChanged(int)"), - cannonField, SLOT("setAngle(int)")); - connect(cannonField, SIGNAL("angleChanged(int)"), - angle, SLOT("setValue(int)")); + connect(angle, TQ_SIGNAL("valueChanged(int)"), + cannonField, TQ_SLOT("setAngle(int)")); + connect(cannonField, TQ_SIGNAL("angleChanged(int)"), + angle, TQ_SLOT("setValue(int)")); - connect(force, SIGNAL("valueChanged(int)"), - cannonField, SLOT("setForce(int)")); - connect(cannonField, SIGNAL("forceChanged(int)"), - force, SLOT("setValue(int)")); + connect(force, TQ_SIGNAL("valueChanged(int)"), + cannonField, TQ_SLOT("setForce(int)")); + connect(cannonField, TQ_SIGNAL("forceChanged(int)"), + force, TQ_SLOT("setValue(int)")); TQPushButton shoot = new TQPushButton("&Shoot", this, "shoot"); shoot.setFont(new TQFont("Times", 18, TQFont.Bold, false)); - connect(shoot, SIGNAL("clicked()"), cannonField, SLOT("shoot()")); + connect(shoot, TQ_SIGNAL("clicked()"), cannonField, TQ_SLOT("shoot()")); TQGridLayout grid = new TQGridLayout(this, 2, 2, 10, -1, null); grid.addWidget(quit, 0, 0); diff --git a/qtjava/javalib/tutorial/t12/CannonField.java b/qtjava/javalib/tutorial/t12/CannonField.java index d5c53ce7..b897b172 100644 --- a/qtjava/javalib/tutorial/t12/CannonField.java +++ b/qtjava/javalib/tutorial/t12/CannonField.java @@ -19,8 +19,8 @@ public class CannonField extends TQWidget { f = 0; timerCount = 0; autoShootTimer = new TQTimer(this, "movement handler"); - connect(autoShootTimer, SIGNAL("timeout()"), - this, SLOT("moveShot()")); + connect(autoShootTimer, TQ_SIGNAL("timeout()"), + this, TQ_SLOT("moveShot()")); shoot_ang = 0; shoot_f = 0; target = new TQPoint(0, 0); diff --git a/qtjava/javalib/tutorial/t12/LCDRange.java b/qtjava/javalib/tutorial/t12/LCDRange.java index 7992b586..c0e96890 100644 --- a/qtjava/javalib/tutorial/t12/LCDRange.java +++ b/qtjava/javalib/tutorial/t12/LCDRange.java @@ -24,10 +24,10 @@ public class LCDRange extends TQVBox { label = new TQLabel(" ", this, "label", 0); label.setAlignment(AlignCenter); - connect(slider, SIGNAL("valueChanged(int)"), - lcd, SLOT("display(int)")); - connect(slider, SIGNAL("valueChanged(int)"), - SIGNAL("valueChanged(int)")); + connect(slider, TQ_SIGNAL("valueChanged(int)"), + lcd, TQ_SLOT("display(int)")); + connect(slider, TQ_SIGNAL("valueChanged(int)"), + TQ_SIGNAL("valueChanged(int)")); setFocusProxy(slider); } diff --git a/qtjava/javalib/tutorial/t12/Tut12.java b/qtjava/javalib/tutorial/t12/Tut12.java index 845a206b..40da9321 100644 --- a/qtjava/javalib/tutorial/t12/Tut12.java +++ b/qtjava/javalib/tutorial/t12/Tut12.java @@ -5,7 +5,7 @@ public class Tut12 extends TQWidget { TQPushButton quit = new TQPushButton("&Quit", this, "quit"); quit.setFont(new TQFont("Times", 18, TQFont.Bold, false)); - connect(quit, SIGNAL("clicked()"), tqApp(), SLOT("quit()")); + connect(quit, TQ_SIGNAL("clicked()"), tqApp(), TQ_SLOT("quit()")); LCDRange angle = new LCDRange("ANGLE", this, "angle"); angle.setRange(5, 70); @@ -15,21 +15,21 @@ public class Tut12 extends TQWidget { CannonField cannonField = new CannonField(this, "cannonField"); - connect(angle, SIGNAL("valueChanged(int)"), - cannonField, SLOT("setAngle(int)")); - connect(cannonField, SIGNAL("angleChanged(int)"), - angle, SLOT("setValue(int)")); + connect(angle, TQ_SIGNAL("valueChanged(int)"), + cannonField, TQ_SLOT("setAngle(int)")); + connect(cannonField, TQ_SIGNAL("angleChanged(int)"), + angle, TQ_SLOT("setValue(int)")); - connect(force, SIGNAL("valueChanged(int)"), - cannonField, SLOT("setForce(int)")); - connect(cannonField, SIGNAL("forceChanged(int)"), - force, SLOT("setValue(int)")); + connect(force, TQ_SIGNAL("valueChanged(int)"), + cannonField, TQ_SLOT("setForce(int)")); + connect(cannonField, TQ_SIGNAL("forceChanged(int)"), + force, TQ_SLOT("setValue(int)")); TQPushButton shoot = new TQPushButton("&Shoot", this, "shoot"); shoot.setFont(new TQFont("Times", 18, TQFont.Bold, false)); - connect(shoot, SIGNAL("clicked()"), cannonField, SLOT("shoot()")); + connect(shoot, TQ_SIGNAL("clicked()"), cannonField, TQ_SLOT("shoot()")); TQGridLayout grid = new TQGridLayout(this, 2, 2, 10, -1, null); grid.addWidget(quit, 0, 0); diff --git a/qtjava/javalib/tutorial/t13/CannonField.java b/qtjava/javalib/tutorial/t13/CannonField.java index b53dfed9..db35ce1b 100644 --- a/qtjava/javalib/tutorial/t13/CannonField.java +++ b/qtjava/javalib/tutorial/t13/CannonField.java @@ -21,8 +21,8 @@ public class CannonField extends TQWidget { f = 0; timerCount = 0; autoShootTimer = new TQTimer(this, "movement handler"); - connect(autoShootTimer, SIGNAL("timeout()"), - this, SLOT("moveShot()")); + connect(autoShootTimer, TQ_SIGNAL("timeout()"), + this, TQ_SLOT("moveShot()")); shoot_ang = 0; shoot_f = 0; target = new TQPoint(0, 0); diff --git a/qtjava/javalib/tutorial/t13/GameBoard.java b/qtjava/javalib/tutorial/t13/GameBoard.java index 25ff0a1e..c887498f 100644 --- a/qtjava/javalib/tutorial/t13/GameBoard.java +++ b/qtjava/javalib/tutorial/t13/GameBoard.java @@ -9,7 +9,7 @@ public class GameBoard extends TQWidget { TQPushButton quit = new TQPushButton("&Quit", this, "quit"); quit.setFont(new TQFont("Times", 18, TQFont.Bold, false)); - connect(quit, SIGNAL("clicked()"), tqApp(), SLOT("quit()")); + connect(quit, TQ_SIGNAL("clicked()"), tqApp(), TQ_SLOT("quit()")); LCDRange angle = new LCDRange("ANGLE", this, "angle"); angle.setRange(5, 70); @@ -19,32 +19,32 @@ public class GameBoard extends TQWidget { cannonField = new CannonField(this, "cannonField"); - connect(angle, SIGNAL("valueChanged(int)"), - cannonField, SLOT("setAngle(int)")); - connect(cannonField, SIGNAL("angleChanged(int)"), - angle, SLOT("setValue(int)")); + connect(angle, TQ_SIGNAL("valueChanged(int)"), + cannonField, TQ_SLOT("setAngle(int)")); + connect(cannonField, TQ_SIGNAL("angleChanged(int)"), + angle, TQ_SLOT("setValue(int)")); - connect(force, SIGNAL("valueChanged(int)"), - cannonField, SLOT("setForce(int)")); - connect(cannonField, SIGNAL("forceChanged(int)"), - force, SLOT("setValue(int)")); + connect(force, TQ_SIGNAL("valueChanged(int)"), + cannonField, TQ_SLOT("setForce(int)")); + connect(cannonField, TQ_SIGNAL("forceChanged(int)"), + force, TQ_SLOT("setValue(int)")); - connect(cannonField, SIGNAL("hit()"), - this, SLOT("hit()")); - connect(cannonField, SIGNAL("missed()"), - this, SLOT("missed()")); + connect(cannonField, TQ_SIGNAL("hit()"), + this, TQ_SLOT("hit()")); + connect(cannonField, TQ_SIGNAL("missed()"), + this, TQ_SLOT("missed()")); TQPushButton shoot = new TQPushButton("&Shoot", this, "shoot"); shoot.setFont(new TQFont("Times", 18, TQFont.Bold, false)); - connect(shoot, SIGNAL("clicked()"), SLOT("fire()")); - connect(cannonField, SIGNAL("canShoot(boolean)"), - shoot, SLOT("setEnabled(boolean)")); + connect(shoot, TQ_SIGNAL("clicked()"), TQ_SLOT("fire()")); + connect(cannonField, TQ_SIGNAL("canShoot(boolean)"), + shoot, TQ_SLOT("setEnabled(boolean)")); TQPushButton restart = new TQPushButton("&New Game", this, "newgame"); restart.setFont(new TQFont("Times", 18, TQFont.Bold, false)); - connect(restart, SIGNAL("clicked()"), this, SLOT("newGame()")); + connect(restart, TQ_SIGNAL("clicked()"), this, TQ_SLOT("newGame()")); hits = new TQLCDNumber(2, this, "hits"); shotsLeft = new TQLCDNumber(2, this, "shotsleft"); diff --git a/qtjava/javalib/tutorial/t13/LCDRange.java b/qtjava/javalib/tutorial/t13/LCDRange.java index 27741f89..794bc72b 100644 --- a/qtjava/javalib/tutorial/t13/LCDRange.java +++ b/qtjava/javalib/tutorial/t13/LCDRange.java @@ -24,10 +24,10 @@ public class LCDRange extends TQWidget { label = new TQLabel(" ", this, "label", 0); label.setAlignment(AlignCenter); - connect(slider, SIGNAL("valueChanged(int)"), - lcd, SLOT("display(int)")); - connect(slider, SIGNAL("valueChanged(int)"), - SIGNAL("valueChanged(int)")); + connect(slider, TQ_SIGNAL("valueChanged(int)"), + lcd, TQ_SLOT("display(int)")); + connect(slider, TQ_SIGNAL("valueChanged(int)"), + TQ_SIGNAL("valueChanged(int)")); setFocusProxy(slider); diff --git a/qtjava/javalib/tutorial/t14/CannonField.java b/qtjava/javalib/tutorial/t14/CannonField.java index a38a71a3..e2a3037f 100644 --- a/qtjava/javalib/tutorial/t14/CannonField.java +++ b/qtjava/javalib/tutorial/t14/CannonField.java @@ -22,8 +22,8 @@ public class CannonField extends TQWidget { f = 0; timerCount = 0; autoShootTimer = new TQTimer(this, "movement handler"); - connect(autoShootTimer, SIGNAL("timeout()"), - this, SLOT("moveShot()")); + connect(autoShootTimer, TQ_SIGNAL("timeout()"), + this, TQ_SLOT("moveShot()")); shoot_ang = 0; shoot_f = 0; target = new TQPoint(0, 0); diff --git a/qtjava/javalib/tutorial/t14/GameBoard.java b/qtjava/javalib/tutorial/t14/GameBoard.java index f44af538..6bc66b17 100644 --- a/qtjava/javalib/tutorial/t14/GameBoard.java +++ b/qtjava/javalib/tutorial/t14/GameBoard.java @@ -10,7 +10,7 @@ public class GameBoard extends TQWidget { TQPushButton quit = new TQPushButton("&Quit", this, "quit"); quit.setFont(new TQFont("Times", 18, TQFont.Bold, false)); - connect(quit, SIGNAL("clicked()"), tqApp(), SLOT("quit()")); + connect(quit, TQ_SIGNAL("clicked()"), tqApp(), TQ_SLOT("quit()")); LCDRange angle = new LCDRange("ANGLE", this, "angle"); angle.setRange(5, 70); @@ -23,30 +23,30 @@ public class GameBoard extends TQWidget { cannonField = new CannonField(box, "cannonField"); - connect(angle, SIGNAL("valueChanged(int)"), - cannonField, SLOT("setAngle(int)")); - connect(cannonField, SIGNAL("angleChanged(int)"), - angle, SLOT("setValue(int)")); + connect(angle, TQ_SIGNAL("valueChanged(int)"), + cannonField, TQ_SLOT("setAngle(int)")); + connect(cannonField, TQ_SIGNAL("angleChanged(int)"), + angle, TQ_SLOT("setValue(int)")); - connect(force, SIGNAL("valueChanged(int)"), - cannonField, SLOT("setForce(int)")); - connect(cannonField, SIGNAL("forceChanged(int)"), - force, SLOT("setValue(int)")); + connect(force, TQ_SIGNAL("valueChanged(int)"), + cannonField, TQ_SLOT("setForce(int)")); + connect(cannonField, TQ_SIGNAL("forceChanged(int)"), + force, TQ_SLOT("setValue(int)")); - connect(cannonField, SIGNAL("hit()"), - this, SLOT("hit()")); - connect(cannonField, SIGNAL("missed()"), - this, SLOT("missed()")); + connect(cannonField, TQ_SIGNAL("hit()"), + this, TQ_SLOT("hit()")); + connect(cannonField, TQ_SIGNAL("missed()"), + this, TQ_SLOT("missed()")); TQPushButton shoot = new TQPushButton("&Shoot", this, "shoot"); shoot.setFont(new TQFont("Times", 18, TQFont.Bold, false)); - connect(shoot, SIGNAL("clicked()"), SLOT("fire()")); + connect(shoot, TQ_SIGNAL("clicked()"), TQ_SLOT("fire()")); TQPushButton restart = new TQPushButton("&New Game", this, "newgame"); restart.setFont(new TQFont("Times", 18, TQFont.Bold, false)); - connect(restart, SIGNAL("clicked()"), this, SLOT("newGame()")); + connect(restart, TQ_SIGNAL("clicked()"), this, TQ_SLOT("newGame()")); hits = new TQLCDNumber(2, this, "hits"); shotsLeft = new TQLCDNumber(2, this, "shotsleft"); @@ -54,13 +54,13 @@ public class GameBoard extends TQWidget { TQLabel shotsLeftL = new TQLabel("SHOTS LEFT", this, "shotsleftLabel", 0); TQAccel accel = new TQAccel(this); - accel.connectItem(accel.insertItem(new TQKeySequence(Key_Enter)), this, SLOT("fire()")); - accel.connectItem(accel.insertItem(new TQKeySequence(Key_Return)), this, SLOT("fire()")); - accel.connectItem(accel.insertItem(new TQKeySequence(CTRL+Key_Q)), tqApp(), SLOT("quit()")); + accel.connectItem(accel.insertItem(new TQKeySequence(Key_Enter)), this, TQ_SLOT("fire()")); + accel.connectItem(accel.insertItem(new TQKeySequence(Key_Return)), this, TQ_SLOT("fire()")); + accel.connectItem(accel.insertItem(new TQKeySequence(CTRL+Key_Q)), tqApp(), TQ_SLOT("quit()")); /*** - accel.connectItem(accel.insertItem(Key_Enter), this, SLOT("fire()")); - accel.connectItem(accel.insertItem(Key_Return), this, SLOT("fire()")); - accel.connectItem(accel.insertItem(CTRL+Key_Q), tqApp(), SLOT("quit()")); + accel.connectItem(accel.insertItem(Key_Enter), this, TQ_SLOT("fire()")); + accel.connectItem(accel.insertItem(Key_Return), this, TQ_SLOT("fire()")); + accel.connectItem(accel.insertItem(CTRL+Key_Q), tqApp(), TQ_SLOT("quit()")); ***/ TQGridLayout grid = new TQGridLayout(this, 2, 2, 10, -1, null); grid.addWidget(quit, 0, 0); diff --git a/qtjava/javalib/tutorial/t14/LCDRange.java b/qtjava/javalib/tutorial/t14/LCDRange.java index 27741f89..794bc72b 100644 --- a/qtjava/javalib/tutorial/t14/LCDRange.java +++ b/qtjava/javalib/tutorial/t14/LCDRange.java @@ -24,10 +24,10 @@ public class LCDRange extends TQWidget { label = new TQLabel(" ", this, "label", 0); label.setAlignment(AlignCenter); - connect(slider, SIGNAL("valueChanged(int)"), - lcd, SLOT("display(int)")); - connect(slider, SIGNAL("valueChanged(int)"), - SIGNAL("valueChanged(int)")); + connect(slider, TQ_SIGNAL("valueChanged(int)"), + lcd, TQ_SLOT("display(int)")); + connect(slider, TQ_SIGNAL("valueChanged(int)"), + TQ_SIGNAL("valueChanged(int)")); setFocusProxy(slider); diff --git a/qtjava/javalib/tutorial/t2/Tut2.java b/qtjava/javalib/tutorial/t2/Tut2.java index f5a31bb2..7b27ff11 100644 --- a/qtjava/javalib/tutorial/t2/Tut2.java +++ b/qtjava/javalib/tutorial/t2/Tut2.java @@ -7,7 +7,7 @@ public class Tut2 extends TQObject { quit.resize( 75, 30 ); quit.setFont(new TQFont("Times", 18, TQFont.Bold, false)); - connect(quit, SIGNAL("clicked()"), a, SLOT("quit()")); + connect(quit, TQ_SIGNAL("clicked()"), a, TQ_SLOT("quit()")); a.setMainWidget(quit); quit.show(); diff --git a/qtjava/javalib/tutorial/t3/Tut3.java b/qtjava/javalib/tutorial/t3/Tut3.java index ef6fc013..119eec97 100644 --- a/qtjava/javalib/tutorial/t3/Tut3.java +++ b/qtjava/javalib/tutorial/t3/Tut3.java @@ -10,7 +10,7 @@ public class Tut3 extends TQObject { TQPushButton quit = new TQPushButton("Quit", box); quit.setFont(new TQFont("Times", 18, TQFont.Bold, false)); - connect(quit, SIGNAL("clicked()"), a, SLOT("quit()")); + connect(quit, TQ_SIGNAL("clicked()"), a, TQ_SLOT("quit()")); a.setMainWidget(box); box.show(); diff --git a/qtjava/javalib/tutorial/t4/Tut4.java b/qtjava/javalib/tutorial/t4/Tut4.java index 6b14729d..801e7235 100644 --- a/qtjava/javalib/tutorial/t4/Tut4.java +++ b/qtjava/javalib/tutorial/t4/Tut4.java @@ -9,7 +9,7 @@ public class Tut4 extends TQWidget { quit.setGeometry(62, 40, 75, 30); quit.setFont(new TQFont("Times", 18, TQFont.Bold, false)); - connect(quit, SIGNAL("clicked()"), tqApp(), SLOT("quit()")); + connect(quit, TQ_SIGNAL("clicked()"), tqApp(), TQ_SLOT("quit()")); } public static void main(String[] args) { diff --git a/qtjava/javalib/tutorial/t5/Tut5.java b/qtjava/javalib/tutorial/t5/Tut5.java index 61e02748..74802681 100644 --- a/qtjava/javalib/tutorial/t5/Tut5.java +++ b/qtjava/javalib/tutorial/t5/Tut5.java @@ -5,7 +5,7 @@ public class Tut5 extends TQVBox { TQPushButton quit = new TQPushButton("Quit", this, "quit"); quit.setFont(new TQFont("Times", 18, TQFont.Bold, false)); - connect(quit, SIGNAL("clicked()"), tqApp(), SLOT("quit()")); + connect(quit, TQ_SIGNAL("clicked()"), tqApp(), TQ_SLOT("quit()")); TQLCDNumber lcd = new TQLCDNumber(2, this, "lcd"); @@ -13,7 +13,7 @@ public class Tut5 extends TQVBox { slider.setRange(0, 99); slider.setValue(0); - connect(slider, SIGNAL("valueChanged(int)"), lcd, SLOT("display(int)")); + connect(slider, TQ_SIGNAL("valueChanged(int)"), lcd, TQ_SLOT("display(int)")); } public static void main(String[] args) { diff --git a/qtjava/javalib/tutorial/t6/LCDRange.java b/qtjava/javalib/tutorial/t6/LCDRange.java index a1d45a47..4d8e6c7c 100644 --- a/qtjava/javalib/tutorial/t6/LCDRange.java +++ b/qtjava/javalib/tutorial/t6/LCDRange.java @@ -7,7 +7,7 @@ public class LCDRange extends TQVBox { TQSlider slider = new TQSlider(Horizontal, this, "slider"); slider.setRange(0, 99); slider.setValue(0); - connect(slider, SIGNAL("valueChanged(int)"), lcd, SLOT("display(int)")); + connect(slider, TQ_SIGNAL("valueChanged(int)"), lcd, TQ_SLOT("display(int)")); } public LCDRange(TQWidget parent) { this(parent, null); diff --git a/qtjava/javalib/tutorial/t6/Tut6.java b/qtjava/javalib/tutorial/t6/Tut6.java index 011742c8..4d3da228 100644 --- a/qtjava/javalib/tutorial/t6/Tut6.java +++ b/qtjava/javalib/tutorial/t6/Tut6.java @@ -5,7 +5,7 @@ public class Tut6 extends TQVBox { TQPushButton quit = new TQPushButton("Quit", this, "quit"); quit.setFont(new TQFont("Times", 18, TQFont.Bold, false)); - connect(quit, SIGNAL("clicked()"), tqApp(), SLOT("quit()")); + connect(quit, TQ_SIGNAL("clicked()"), tqApp(), TQ_SLOT("quit()")); TQGrid grid = new TQGrid(4, this, null, 0); diff --git a/qtjava/javalib/tutorial/t7/LCDRange.java b/qtjava/javalib/tutorial/t7/LCDRange.java index 62590013..2192de7c 100644 --- a/qtjava/javalib/tutorial/t7/LCDRange.java +++ b/qtjava/javalib/tutorial/t7/LCDRange.java @@ -10,10 +10,10 @@ public class LCDRange extends TQVBox { slider.setRange(0, 99); slider.setValue(0); - connect(slider, SIGNAL("valueChanged(int)"), - lcd, SLOT("display(int)")); - connect(slider, SIGNAL("valueChanged(int)"), - SIGNAL("valueChanged(int)")); + connect(slider, TQ_SIGNAL("valueChanged(int)"), + lcd, TQ_SLOT("display(int)")); + connect(slider, TQ_SIGNAL("valueChanged(int)"), + TQ_SIGNAL("valueChanged(int)")); } public LCDRange(TQWidget parent) { this(parent, null); diff --git a/qtjava/javalib/tutorial/t7/Tut7.java b/qtjava/javalib/tutorial/t7/Tut7.java index b1bd1e87..4e63fdea 100644 --- a/qtjava/javalib/tutorial/t7/Tut7.java +++ b/qtjava/javalib/tutorial/t7/Tut7.java @@ -5,7 +5,7 @@ public class Tut7 extends TQVBox { TQPushButton quit = new TQPushButton("Quit", this, "quit"); quit.setFont(new TQFont("Times", 18, TQFont.Bold, false)); - connect(quit, SIGNAL("clicked()"), tqApp(), SLOT("quit()")); + connect(quit, TQ_SIGNAL("clicked()"), tqApp(), TQ_SLOT("quit()")); TQGrid grid = new TQGrid(4, this, null, 0); @@ -14,8 +14,8 @@ public class Tut7 extends TQVBox { for(int c = 0; c < 4; c++) { LCDRange lr = new LCDRange(grid); if (previous!=null) - connect(lr, SIGNAL("valueChanged(int)"), - previous, SLOT("setValue(int)")); + connect(lr, TQ_SIGNAL("valueChanged(int)"), + previous, TQ_SLOT("setValue(int)")); previous = lr; } } diff --git a/qtjava/javalib/tutorial/t8/LCDRange.java b/qtjava/javalib/tutorial/t8/LCDRange.java index 877c65de..71fdd7e0 100644 --- a/qtjava/javalib/tutorial/t8/LCDRange.java +++ b/qtjava/javalib/tutorial/t8/LCDRange.java @@ -10,10 +10,10 @@ public class LCDRange extends TQVBox { slider.setRange(0, 99); slider.setValue(0); - connect(slider, SIGNAL("valueChanged(int)"), - lcd, SLOT("display(int)")); - connect(slider, SIGNAL("valueChanged(int)"), - SIGNAL("valueChanged(int)")); + connect(slider, TQ_SIGNAL("valueChanged(int)"), + lcd, TQ_SLOT("display(int)")); + connect(slider, TQ_SIGNAL("valueChanged(int)"), + TQ_SIGNAL("valueChanged(int)")); setFocusProxy(slider); } diff --git a/qtjava/javalib/tutorial/t8/Tut8.java b/qtjava/javalib/tutorial/t8/Tut8.java index 4159c8e0..4bab948f 100644 --- a/qtjava/javalib/tutorial/t8/Tut8.java +++ b/qtjava/javalib/tutorial/t8/Tut8.java @@ -5,17 +5,17 @@ public class Tut8 extends TQWidget { TQPushButton quit = new TQPushButton("Quit", this, "quit"); quit.setFont(new TQFont("Times", 18, TQFont.Bold, false)); - connect(quit, SIGNAL("clicked()"), tqApp(), SLOT("quit()")); + connect(quit, TQ_SIGNAL("clicked()"), tqApp(), TQ_SLOT("quit()")); LCDRange angle = new LCDRange(this, "angle"); angle.setRange(5, 70); CannonField cannonField = new CannonField(this, "cannonField"); - connect(angle, SIGNAL("valueChanged(int)"), - cannonField, SLOT("setAngle(int)")); - connect(cannonField, SIGNAL("angleChanged(int)"), - angle, SLOT("setValue(int)")); + connect(angle, TQ_SIGNAL("valueChanged(int)"), + cannonField, TQ_SLOT("setAngle(int)")); + connect(cannonField, TQ_SIGNAL("angleChanged(int)"), + angle, TQ_SLOT("setValue(int)")); TQGridLayout grid = new TQGridLayout(this, 2, 2, 10, -1, null); //2x2, 10 pixel border diff --git a/qtjava/javalib/tutorial/t9/LCDRange.java b/qtjava/javalib/tutorial/t9/LCDRange.java index 877c65de..71fdd7e0 100644 --- a/qtjava/javalib/tutorial/t9/LCDRange.java +++ b/qtjava/javalib/tutorial/t9/LCDRange.java @@ -10,10 +10,10 @@ public class LCDRange extends TQVBox { slider.setRange(0, 99); slider.setValue(0); - connect(slider, SIGNAL("valueChanged(int)"), - lcd, SLOT("display(int)")); - connect(slider, SIGNAL("valueChanged(int)"), - SIGNAL("valueChanged(int)")); + connect(slider, TQ_SIGNAL("valueChanged(int)"), + lcd, TQ_SLOT("display(int)")); + connect(slider, TQ_SIGNAL("valueChanged(int)"), + TQ_SIGNAL("valueChanged(int)")); setFocusProxy(slider); } diff --git a/qtjava/javalib/tutorial/t9/Tut9.java b/qtjava/javalib/tutorial/t9/Tut9.java index cd8db787..d04c798d 100644 --- a/qtjava/javalib/tutorial/t9/Tut9.java +++ b/qtjava/javalib/tutorial/t9/Tut9.java @@ -5,17 +5,17 @@ public class Tut9 extends TQWidget { TQPushButton quit = new TQPushButton("Quit", this, "quit"); quit.setFont(new TQFont("Times", 18, TQFont.Bold, false)); - connect(quit, SIGNAL("clicked()"), tqApp(), SLOT("quit()")); + connect(quit, TQ_SIGNAL("clicked()"), tqApp(), TQ_SLOT("quit()")); LCDRange angle = new LCDRange(this, "angle"); angle.setRange(5, 70); CannonField cannonField = new CannonField(this, "cannonField"); - connect(angle, SIGNAL("valueChanged(int)"), - cannonField, SLOT("setAngle(int)")); - connect(cannonField, SIGNAL("angleChanged(int)"), - angle, SLOT("setValue(int)")); + connect(angle, TQ_SIGNAL("valueChanged(int)"), + cannonField, TQ_SLOT("setAngle(int)")); + connect(cannonField, TQ_SIGNAL("angleChanged(int)"), + angle, TQ_SLOT("setValue(int)")); TQGridLayout grid = new TQGridLayout(this, 2, 2, 10, -1, null); //2x2, 10 pixel border diff --git a/qtruby/bin/rbqtsh b/qtruby/bin/rbqtsh index 413a037f..ae52df4e 100755 --- a/qtruby/bin/rbqtsh +++ b/qtruby/bin/rbqtsh @@ -317,13 +317,13 @@ class QtShellControl < TQt::MainWindow @helpExampleAction.addTo(helpMenu) @menubar.insertItem(trUtf8("&Help"), helpMenu) - connect(@fileOpenAction, SIGNAL('activated()'), self, SLOT('fileOpen()')) - connect(@fileSaveAction, SIGNAL('activated()'), self, SLOT('fileSave()')) - connect(@fileSaveAsAction, SIGNAL('activated()'), self, SLOT('fileSaveAs()')) - connect(@filePrintAction, SIGNAL('activated()'), self, SLOT('filePrint()')) - connect(@fileExitAction, SIGNAL('activated()'), self, SLOT('fileExit()')) - connect(@runAction, SIGNAL('activated()'), self, SLOT('runSelection()')) - connect(@helpExampleAction, SIGNAL('activated()'), self, SLOT('helpExample()')) + connect(@fileOpenAction, TQ_SIGNAL('activated()'), self, TQ_SLOT('fileOpen()')) + connect(@fileSaveAction, TQ_SIGNAL('activated()'), self, TQ_SLOT('fileSave()')) + connect(@fileSaveAsAction, TQ_SIGNAL('activated()'), self, TQ_SLOT('fileSaveAs()')) + connect(@filePrintAction, TQ_SIGNAL('activated()'), self, TQ_SLOT('filePrint()')) + connect(@fileExitAction, TQ_SIGNAL('activated()'), self, TQ_SLOT('fileExit()')) + connect(@runAction, TQ_SIGNAL('activated()'), self, TQ_SLOT('runSelection()')) + connect(@helpExampleAction, TQ_SIGNAL('activated()'), self, TQ_SLOT('helpExample()')) @executedLines = [] end @@ -497,13 +497,13 @@ def initialize(*k) self.show @shellWindow.show - connect(@shellWindow.comboBox.lineEdit, SIGNAL('returnPressed()'), self, SLOT('evalInput()')) + connect(@shellWindow.comboBox.lineEdit, TQ_SIGNAL('returnPressed()'), self, TQ_SLOT('evalInput()')) @prompt = '<b><font color="blue">$></font></b>' self.setCaption("MainWindow - this") @shellWindow.sessionLog.setText("Ready.<br>") - connect(@shellWindow, SIGNAL('fileNeedsEval(TQString)'), self, SLOT('evalFile(TQString)')) - connect(@shellWindow, SIGNAL('selection(TQString)'), self, SLOT('evalSelection(TQString)')) + connect(@shellWindow, TQ_SIGNAL('fileNeedsEval(TQString)'), self, TQ_SLOT('evalFile(TQString)')) + connect(@shellWindow, TQ_SIGNAL('selection(TQString)'), self, TQ_SLOT('evalSelection(TQString)')) end def logAppend(str) @@ -620,7 +620,7 @@ self.resize(220,240) @vbox.show @sample = TQt::PopupMenu.new(self) $ slots 'there()' -@sample.insertItem("&There", self, SLOT('there()')) +@sample.insertItem("&There", self, TQ_SLOT('there()')) self.menuBar.insertItem("&Here", sample) $ def there; statusBar.message("There...", 2000); end EXAMPLE diff --git a/qtruby/rubylib/designer/examples/colortool/mainform.ui.rb b/qtruby/rubylib/designer/examples/colortool/mainform.ui.rb index 3f4f5945..e83207d9 100644 --- a/qtruby/rubylib/designer/examples/colortool/mainform.ui.rb +++ b/qtruby/rubylib/designer/examples/colortool/mainform.ui.rb @@ -321,8 +321,8 @@ end def editFind() if ! @findForm @findForm = FindForm.new( self ) - connect( @findForm, SIGNAL( 'lookfor(const TQString&)' ), - self, SLOT( 'lookfor(const TQString&)' ) ) + connect( @findForm, TQ_SIGNAL( 'lookfor(const TQString&)' ), + self, TQ_SLOT( 'lookfor(const TQString&)' ) ) end @findForm.show() end diff --git a/qtruby/rubylib/designer/rbuic/form.cpp b/qtruby/rubylib/designer/rbuic/form.cpp index 45aa9435..2eb8e45a 100644 --- a/qtruby/rubylib/designer/rbuic/form.cpp +++ b/qtruby/rubylib/designer/rbuic/form.cpp @@ -751,7 +751,7 @@ void Uic::createFormImpl( const TQDomElement &e ) receiver = "self"; out << indent << "TQt::Object.connect(" << sender - << ", TQT_SIGNAL(\"" << signal << "\"), "<< receiver << ", TQT_SLOT(\"" << slot << "\") )" << endl; + << ", TQ_SIGNAL(\"" << signal << "\"), "<< receiver << ", TQ_SLOT(\"" << slot << "\") )" << endl; } } else if ( n.tagName() == "tabstops" ) { // setup tab order diff --git a/qtruby/rubylib/designer/uilib/test/test.rb b/qtruby/rubylib/designer/uilib/test/test.rb index ff3570cc..e089c735 100644 --- a/qtruby/rubylib/designer/uilib/test/test.rb +++ b/qtruby/rubylib/designer/uilib/test/test.rb @@ -15,6 +15,6 @@ if ARGV.length == 2 exit
end
w.show()
- a.connect( a, SIGNAL('lastWindowClosed()'), a, SLOT('quit()') )
+ a.connect( a, TQ_SIGNAL('lastWindowClosed()'), a, TQ_SLOT('quit()') )
a.exec()
end
diff --git a/qtruby/rubylib/examples/base/rui.rb b/qtruby/rubylib/examples/base/rui.rb index ad14bc11..8f1df3c8 100644 --- a/qtruby/rubylib/examples/base/rui.rb +++ b/qtruby/rubylib/examples/base/rui.rb @@ -11,7 +11,7 @@ def build_actions(actions) } else qt_action = $kIcons.make_qt_action(self, a.text_with_accel, a.icon_type) - connect(qt_action, SIGNAL('activated()'), a.rec, a.slot) + connect(qt_action, TQ_SIGNAL('activated()'), a.rec, a.slot) a.included_in.each { |to| qt_action.addTo(to) } diff --git a/qtruby/rubylib/examples/canvastest/canvastest.rb b/qtruby/rubylib/examples/canvastest/canvastest.rb index b695505c..5c07875b 100644 --- a/qtruby/rubylib/examples/canvastest/canvastest.rb +++ b/qtruby/rubylib/examples/canvastest/canvastest.rb @@ -43,11 +43,11 @@ class MyWidget < TQt::MainWindow fileMenu = TQt::PopupMenu.new(self) actions = [ - RAction.new("&New", Icons::FILE_NEW, self, SLOT('new()'), [fileTools, fileMenu]), - RAction.new("&Open...", Icons::FILE_OPEN, self, SLOT('open()'), [fileTools, fileMenu]), - @save = RAction.new("Save &As...", Icons::FILE_SAVE_AS, self, SLOT('save_as()'), [fileTools, fileMenu]), + RAction.new("&New", Icons::FILE_NEW, self, TQ_SLOT('new()'), [fileTools, fileMenu]), + RAction.new("&Open...", Icons::FILE_OPEN, self, TQ_SLOT('open()'), [fileTools, fileMenu]), + @save = RAction.new("Save &As...", Icons::FILE_SAVE_AS, self, TQ_SLOT('save_as()'), [fileTools, fileMenu]), RSeperator.new([fileMenu]), - RAction.new("E&xit", Icons::EXIT, $qApp, SLOT('quit()'), [fileMenu]) + RAction.new("E&xit", Icons::EXIT, $qApp, TQ_SLOT('quit()'), [fileMenu]) ] build_actions(actions) diff --git a/qtruby/rubylib/examples/network/clientserver/client/client.rb b/qtruby/rubylib/examples/network/clientserver/client/client.rb index 1272adf0..85e769cb 100644 --- a/qtruby/rubylib/examples/network/clientserver/client/client.rb +++ b/qtruby/rubylib/examples/network/clientserver/client/client.rb @@ -12,20 +12,20 @@ class Client < TQt::VBox close = TQt::PushButton.new( tr("Close connection") , self ) quit = TQt::PushButton.new( tr("Quit") , self ) - connect( send, SIGNAL('clicked()'), SLOT('sendToServer()') ) - connect( close, SIGNAL('clicked()'), SLOT('closeConnection()') ) - connect( quit, SIGNAL('clicked()'), $qApp, SLOT('quit()') ) + connect( send, TQ_SIGNAL('clicked()'), TQ_SLOT('sendToServer()') ) + connect( close, TQ_SIGNAL('clicked()'), TQ_SLOT('closeConnection()') ) + connect( quit, TQ_SIGNAL('clicked()'), $qApp, TQ_SLOT('quit()') ) # create the socket and connect various of its signals @socket = TQt::Socket.new( self ) - connect( @socket, SIGNAL('connected()'), - SLOT('socketConnected()') ) - connect( @socket, SIGNAL('connectionClosed()'), - SLOT('socketConnectionClosed()') ) - connect( @socket, SIGNAL('readyRead()'), - SLOT('socketReadyRead()') ) - connect( @socket, SIGNAL('error(int)'), - SLOT('socketError(int)') ) + connect( @socket, TQ_SIGNAL('connected()'), + TQ_SLOT('socketConnected()') ) + connect( @socket, TQ_SIGNAL('connectionClosed()'), + TQ_SLOT('socketConnectionClosed()') ) + connect( @socket, TQ_SIGNAL('readyRead()'), + TQ_SLOT('socketReadyRead()') ) + connect( @socket, TQ_SIGNAL('error(int)'), + TQ_SLOT('socketError(int)') ) # connect to the server @infoText.append( tr("Trying to connect to the server\n") ) @@ -41,8 +41,8 @@ class Client < TQt::VBox @socket.close() if @socket.state() == TQt::Socket::Closing # We have a delayed close. - connect( @socket, SIGNAL('delayedCloseFinished()'), - SLOT('socketClosed()') ) + connect( @socket, TQ_SIGNAL('delayedCloseFinished()'), + TQ_SLOT('socketClosed()') ) else # The socket is closed. socketClosed() diff --git a/qtruby/rubylib/examples/network/clientserver/server/server.rb b/qtruby/rubylib/examples/network/clientserver/server/server.rb index 4a53fbf0..2454115f 100644 --- a/qtruby/rubylib/examples/network/clientserver/server/server.rb +++ b/qtruby/rubylib/examples/network/clientserver/server/server.rb @@ -9,10 +9,10 @@ class ClientSocket < TQt::Socket def initialize(sock, parent=nil, name=nil) super( parent, name ) @line = 0 - connect( self, SIGNAL('readyRead()'), - SLOT('readClient()') ) - connect( self, SIGNAL('connectionClosed()'), - SLOT('deleteLater()') ) + connect( self, TQ_SIGNAL('readyRead()'), + TQ_SLOT('readClient()') ) + connect( self, TQ_SIGNAL('connectionClosed()'), + TQ_SLOT('deleteLater()') ) setSocket( sock ) end @@ -84,20 +84,20 @@ class ServerInfo < TQt::VBox # See the comment above about why the 'ClientSocket*' # type cannot be used - connect( @server, SIGNAL('newConnect(TQSocket*)'), - SLOT('newConnect(TQSocket*)') ) - connect( quit, SIGNAL('clicked()'), $qApp, - SLOT('quit()') ) + connect( @server, TQ_SIGNAL('newConnect(TQSocket*)'), + TQ_SLOT('newConnect(TQSocket*)') ) + connect( quit, TQ_SIGNAL('clicked()'), $qApp, + TQ_SLOT('quit()') ) end slots 'newConnect(TQSocket*)', 'connectionClosed()' def newConnect( s ) @infoText.append( tr("New connection\n") ) - connect( s, SIGNAL('logText(const TQString&)'), - @infoText, SLOT('append(const TQString&)') ) - connect( s, SIGNAL('connectionClosed()'), - SLOT('connectionClosed()') ) + connect( s, TQ_SIGNAL('logText(const TQString&)'), + @infoText, TQ_SLOT('append(const TQString&)') ) + connect( s, TQ_SIGNAL('connectionClosed()'), + TQ_SLOT('connectionClosed()') ) end def connectionClosed() diff --git a/qtruby/rubylib/examples/passivepopup/passivepopup.rb b/qtruby/rubylib/examples/passivepopup/passivepopup.rb index 5cc2b4ea..ae3e1374 100644 --- a/qtruby/rubylib/examples/passivepopup/passivepopup.rb +++ b/qtruby/rubylib/examples/passivepopup/passivepopup.rb @@ -19,7 +19,7 @@ class PassiveWindow < TQt::Frame TQt::Label.new(message, self) quit=TQt::PushButton.new(tr("Close"), self) - connect(quit, SIGNAL("clicked()"), SLOT("close()")) + connect(quit, TQ_SIGNAL("clicked()"), TQ_SLOT("close()")) end def show diff --git a/qtruby/rubylib/examples/qt-examples/aclock/aclock.rb b/qtruby/rubylib/examples/qt-examples/aclock/aclock.rb index 618b7d76..0e6a13d0 100644 --- a/qtruby/rubylib/examples/qt-examples/aclock/aclock.rb +++ b/qtruby/rubylib/examples/qt-examples/aclock/aclock.rb @@ -11,7 +11,7 @@ class AnalogClock < TQt::Widget @time = TQt::Time::currentTime @internalTimer = TQt::Timer.new(self) - connect(@internalTimer, SIGNAL('timeout()'), self, SLOT('timeout()')) + connect(@internalTimer, TQ_SIGNAL('timeout()'), self, TQ_SLOT('timeout()')) @internalTimer.start(5000) end diff --git a/qtruby/rubylib/examples/qt-examples/chart/chartform.rb b/qtruby/rubylib/examples/qt-examples/chart/chartform.rb index 0ebff47e..dd3523fd 100644 --- a/qtruby/rubylib/examples/qt-examples/chart/chartform.rb +++ b/qtruby/rubylib/examples/qt-examples/chart/chartform.rb @@ -42,41 +42,41 @@ class ChartForm < TQt::MainWindow fileNewAction = TQt::Action.new( "New Chart", TQt::IconSet.new(TQt::Pixmap.new( "images/file_new.xpm" )), "&New", TQt::KeySequence.new(CTRL+Key_N), self, "new" ) - connect( fileNewAction, SIGNAL( 'activated()' ), self, SLOT( 'fileNew()' ) ) + connect( fileNewAction, TQ_SIGNAL( 'activated()' ), self, TQ_SLOT( 'fileNew()' ) ) fileOpenAction = TQt::Action.new( "Open Chart", TQt::IconSet.new(TQt::Pixmap.new( "images/file_open.xpm" )), "&Open...", TQt::KeySequence.new(CTRL+Key_O), self, "open" ) - connect( fileOpenAction, SIGNAL( 'activated()' ), self, SLOT( 'fileOpen()' ) ) + connect( fileOpenAction, TQ_SIGNAL( 'activated()' ), self, TQ_SLOT( 'fileOpen()' ) ) fileSaveAction = TQt::Action.new( "Save Chart", TQt::IconSet.new(TQt::Pixmap.new( "images/file_save.xpm" )), "&Save", TQt::KeySequence.new(CTRL+Key_S), self, "save" ) - connect( fileSaveAction, SIGNAL( 'activated()' ), self, SLOT( 'fileSave()' ) ) + connect( fileSaveAction, TQ_SIGNAL( 'activated()' ), self, TQ_SLOT( 'fileSave()' ) ) fileSaveAsAction = TQt::Action.new( "Save Chart As", TQt::IconSet.new(TQt::Pixmap.new( "images/file_save.xpm" )), "Save &As...", TQt::KeySequence.new(0), self, "save as" ) - connect( fileSaveAsAction, SIGNAL( 'activated()' ), - self, SLOT( 'fileSaveAs()' ) ) + connect( fileSaveAsAction, TQ_SIGNAL( 'activated()' ), + self, TQ_SLOT( 'fileSaveAs()' ) ) fileSaveAsPixmapAction = TQt::Action.new( "Save Chart As Bitmap", TQt::IconSet.new(TQt::Pixmap.new( "images/file_save.xpm" )), "Save As &Bitmap...", TQt::KeySequence.new(CTRL+Key_B), self, "save as bitmap" ) - connect( fileSaveAsPixmapAction, SIGNAL( 'activated()' ), - self, SLOT( 'fileSaveAsPixmap()' ) ) + connect( fileSaveAsPixmapAction, TQ_SIGNAL( 'activated()' ), + self, TQ_SLOT( 'fileSaveAsPixmap()' ) ) filePrintAction = TQt::Action.new( "Print Chart", TQt::IconSet.new(TQt::Pixmap.new( "images/file_print.xpm" )), "&Print Chart...", TQt::KeySequence.new(CTRL+Key_P), self, "print chart" ) - connect( filePrintAction, SIGNAL( 'activated()' ), - self, SLOT( 'filePrint()' ) ) + connect( filePrintAction, TQ_SIGNAL( 'activated()' ), + self, TQ_SLOT( 'filePrint()' ) ) optionsSetDataAction = TQt::Action.new( "Set Data", TQt::IconSet.new(TQt::Pixmap.new( "images/options_setdata.xpm" )), "Set &Data...", TQt::KeySequence.new(CTRL+Key_D), self, "set data" ) - connect( optionsSetDataAction, SIGNAL( 'activated()' ), - self, SLOT( 'optionsSetData()' ) ) + connect( optionsSetDataAction, TQ_SIGNAL( 'activated()' ), + self, TQ_SLOT( 'optionsSetData()' ) ) chartGroup = TQt::ActionGroup.new( self ) # Connected later @@ -102,17 +102,17 @@ class ChartForm < TQt::MainWindow optionsSetFontAction = TQt::Action.new( "Set Font", TQt::IconSet.new(TQt::Pixmap.new( "images/options_setfont.xpm" )), "Set &Font...", TQt::KeySequence.new(CTRL+Key_F), self, "set font" ) - connect( optionsSetFontAction, SIGNAL( 'activated()' ), - self, SLOT( 'optionsSetFont()' ) ) + connect( optionsSetFontAction, TQ_SIGNAL( 'activated()' ), + self, TQ_SLOT( 'optionsSetFont()' ) ) optionsSetOptionsAction = TQt::Action.new( "Set Options", TQt::IconSet.new(TQt::Pixmap.new( "images/options_setoptions.xpm" )), "Set &Options...", TQt::KeySequence.new(0), self, "set options" ) - connect( optionsSetOptionsAction, SIGNAL( 'activated()' ), - self, SLOT( 'optionsSetOptions()' ) ) + connect( optionsSetOptionsAction, TQ_SIGNAL( 'activated()' ), + self, TQ_SLOT( 'optionsSetOptions()' ) ) fileQuitAction = TQt::Action.new( "Quit", "&Quit", TQt::KeySequence.new(CTRL+Key_Q), self, "quit" ) - connect( fileQuitAction, SIGNAL( 'activated()' ), self, SLOT( 'fileQuit()' ) ) + connect( fileQuitAction, TQ_SIGNAL( 'activated()' ), self, TQ_SLOT( 'fileQuit()' ) ) fileTools = TQt::ToolBar.new( self, "file operations" ) @@ -164,9 +164,9 @@ class ChartForm < TQt::MainWindow helpMenu = TQt::PopupMenu.new( self ) menuBar().insertItem( "&Help", helpMenu ) - helpMenu.insertItem( "&Help", self, SLOT('helpHelp()'), TQt::KeySequence.new(Key_F1) ) - helpMenu.insertItem( "&About", self, SLOT('helpAbout()') ) - helpMenu.insertItem( "About &Qt", self, SLOT('helpAboutQt()') ) + helpMenu.insertItem( "&Help", self, TQ_SLOT('helpHelp()'), TQt::KeySequence.new(Key_F1) ) + helpMenu.insertItem( "&About", self, TQ_SLOT('helpAbout()') ) + helpMenu.insertItem( "About &Qt", self, TQ_SLOT('helpAboutQt()') ) @printer = nil @@ -198,8 +198,8 @@ class ChartForm < TQt::MainWindow # Connect *after* we've set the chart type on so we don't call # drawElements() prematurely. - connect( chartGroup, SIGNAL( 'selected(TQAction*)' ), - self, SLOT( 'updateChartType(TQAction*)' ) ) + connect( chartGroup, TQ_SIGNAL( 'selected(TQAction*)' ), + self, TQ_SLOT( 'updateChartType(TQAction*)' ) ) resize( windowWidth, windowHeight ) if windowX != -1 || windowY != -1 @@ -336,7 +336,7 @@ class ChartForm < TQt::MainWindow end if i < @recentFiles.length() @fileMenu.insertItem( "&%d %s" % [i + 1, @recentFiles[i]], - self, SLOT( 'fileOpenRecent(int)' ), + self, TQ_SLOT( 'fileOpenRecent(int)' ), TQt::KeySequence.new(0), i ) end end diff --git a/qtruby/rubylib/examples/qt-examples/chart/optionsform.rb b/qtruby/rubylib/examples/qt-examples/chart/optionsform.rb index 35c2aea8..a83fe828 100644 --- a/qtruby/rubylib/examples/qt-examples/chart/optionsform.rb +++ b/qtruby/rubylib/examples/qt-examples/chart/optionsform.rb @@ -94,9 +94,9 @@ class OptionsForm < TQt::Dialog @buttonsLayout.addWidget( @cancelPushButton ) @optionsFormLayout.addLayout( @buttonsLayout ) - connect( @fontPushButton, SIGNAL( 'clicked()' ), self, SLOT( 'chooseFont()' ) ) - connect( @okPushButton, SIGNAL( 'clicked()' ), self, SLOT( 'accept()' ) ) - connect( @cancelPushButton, SIGNAL( 'clicked()' ), self, SLOT( 'reject()' ) ) + connect( @fontPushButton, TQ_SIGNAL( 'clicked()' ), self, TQ_SLOT( 'chooseFont()' ) ) + connect( @okPushButton, TQ_SIGNAL( 'clicked()' ), self, TQ_SLOT( 'accept()' ) ) + connect( @cancelPushButton, TQ_SIGNAL( 'clicked()' ), self, TQ_SLOT( 'reject()' ) ) @chartTypeTextLabel.setBuddy( @chartTypeComboBox ) @decimalPlacesTextLabel.setBuddy( @decimalPlacesSpinBox ) diff --git a/qtruby/rubylib/examples/qt-examples/chart/setdataform.rb b/qtruby/rubylib/examples/qt-examples/chart/setdataform.rb index 3f361061..5ef31f45 100644 --- a/qtruby/rubylib/examples/qt-examples/chart/setdataform.rb +++ b/qtruby/rubylib/examples/qt-examples/chart/setdataform.rb @@ -64,15 +64,15 @@ class SetDataForm < TQt::Dialog @tableButtonBox.addLayout( @buttonBox ) - connect( @table, SIGNAL( 'clicked(int,int,int,const TQPoint&)' ), - self, SLOT( 'setChosenColor(int,int)' ) ) - connect( @table, SIGNAL( 'currentChanged(int,int)' ), - self, SLOT( 'currentChanged(int,int)' ) ) - connect( @table, SIGNAL( 'valueChanged(int,int)' ), - self, SLOT( 'valueChanged(int,int)' ) ) - connect( @colorPushButton, SIGNAL( 'clicked()' ), self, SLOT( 'setColor()' ) ) - connect( okPushButton, SIGNAL( 'clicked()' ), self, SLOT( 'accept()' ) ) - connect( cancelPushButton, SIGNAL( 'clicked()' ), self, SLOT( 'reject()' ) ) + connect( @table, TQ_SIGNAL( 'clicked(int,int,int,const TQPoint&)' ), + self, TQ_SLOT( 'setChosenColor(int,int)' ) ) + connect( @table, TQ_SIGNAL( 'currentChanged(int,int)' ), + self, TQ_SLOT( 'currentChanged(int,int)' ) ) + connect( @table, TQ_SIGNAL( 'valueChanged(int,int)' ), + self, TQ_SLOT( 'valueChanged(int,int)' ) ) + connect( @colorPushButton, TQ_SIGNAL( 'clicked()' ), self, TQ_SLOT( 'setColor()' ) ) + connect( okPushButton, TQ_SIGNAL( 'clicked()' ), self, TQ_SLOT( 'accept()' ) ) + connect( cancelPushButton, TQ_SIGNAL( 'clicked()' ), self, TQ_SLOT( 'reject()' ) ) patterns = Array.new(MAX_PATTERNS) patterns[0] = TQt::Pixmap.new( "images/pattern01.xpm" ) diff --git a/qtruby/rubylib/examples/qt-examples/checklists/checklists.rb b/qtruby/rubylib/examples/qt-examples/checklists/checklists.rb index 458dc127..9c428c12 100644 --- a/qtruby/rubylib/examples/qt-examples/checklists/checklists.rb +++ b/qtruby/rubylib/examples/qt-examples/checklists/checklists.rb @@ -55,8 +55,8 @@ class CheckLists < TQt::Widget copy1 = TQt::PushButton.new(' -> ', self) tmp.addWidget(copy1) copy1.setMaximumWidth(copy1.sizeHint.width) - # connect the SIGNAL clicked() of the pushbutton with the SLOT copy1to2() - connect(copy1, SIGNAL('clicked()'), self, SLOT('copy1to2()')) + # connect the TQ_SIGNAL clicked() of the pushbutton with the TQ_SLOT copy1to2() + connect(copy1, TQ_SIGNAL('clicked()'), self, TQ_SLOT('copy1to2()')) # another widget for layouting vbox2 = TQt::VBoxLayout.new(lay) @@ -79,8 +79,8 @@ class CheckLists < TQt::Widget copy2 = TQt::PushButton.new(' -> ', self) lay.addWidget( copy2 ) copy2.setMaximumWidth(copy2.sizeHint.width) - # ...and connect its clicked() SIGNAL to the copy2to3() SLOT - connect(copy2, SIGNAL('clicked()'), self, SLOT('copy2to3()')) + # ...and connect its clicked() TQ_SIGNAL to the copy2to3() TQ_SLOT + connect(copy2, TQ_SIGNAL('clicked()'), self, TQ_SLOT('copy2to3()')) tmp = TQt::VBoxLayout.new(lay) tmp.setMargin(5) @@ -90,7 +90,7 @@ class CheckLists < TQt::Widget tmp.addWidget(@label) end - # SLOT copy1to2() + # TQ_SLOT copy1to2() # # Copies all checked ListViewItems from the first ListView to # the second one, and inserts them as Radio-ListViewItem. @@ -121,7 +121,7 @@ class CheckLists < TQt::Widget end - # SLOT copy2to3() + # TQ_SLOT copy2to3() # # Copies the checked item of the second ListView into the # Label at the right. diff --git a/qtruby/rubylib/examples/qt-examples/fonts/simple-qfont-demo/viewer.rb b/qtruby/rubylib/examples/qt-examples/fonts/simple-qfont-demo/viewer.rb index feed96f0..17fb43ef 100644 --- a/qtruby/rubylib/examples/qt-examples/fonts/simple-qfont-demo/viewer.rb +++ b/qtruby/rubylib/examples/qt-examples/fonts/simple-qfont-demo/viewer.rb @@ -27,16 +27,16 @@ class Viewer < TQt::Widget @defaultButton = TQt::PushButton.new('Default', self, 'pushbutton1') @defaultButton.setFont(TQt::Font.new('times')) - connect(@defaultButton, SIGNAL('clicked()'), self, SLOT('setDefault()')) + connect(@defaultButton, TQ_SIGNAL('clicked()'), self, TQ_SLOT('setDefault()')) @sansSerifButton = TQt::PushButton.new('Sans Serif', self, 'pushbutton2') @sansSerifButton.setFont(TQt::Font.new('Helvetica', 12)) - connect(@sansSerifButton, SIGNAL('clicked()'), self, SLOT('setSansSerif()')) + connect(@sansSerifButton, TQ_SIGNAL('clicked()'), self, TQ_SLOT('setSansSerif()')) @italicsButton = TQt::PushButton.new('Italics', self, 'pushbutton1') @italicsButton.setFont(TQt::Font.new('lucida', 12, TQt::Font.Bold, true)) - connect(@italicsButton, SIGNAL('clicked()'), self, SLOT('setItalics()')) + connect(@italicsButton, TQ_SIGNAL('clicked()'), self, TQ_SLOT('setItalics()')) layout end diff --git a/qtruby/rubylib/examples/qt-examples/forever/forever.rb b/qtruby/rubylib/examples/qt-examples/forever/forever.rb index 8cbf9754..1ef42a71 100755 --- a/qtruby/rubylib/examples/qt-examples/forever/forever.rb +++ b/qtruby/rubylib/examples/qt-examples/forever/forever.rb @@ -26,8 +26,8 @@ class Forever < TQt::Widget @rectangles = 0 startTimer( 0 ) # run continuous timer counter = TQt::Timer.new( self ) - connect( counter, SIGNAL("timeout()"), - self, SLOT("updateCaption()") ) + connect( counter, TQ_SIGNAL("timeout()"), + self, TQ_SLOT("updateCaption()") ) counter.start( 1000 ) end diff --git a/qtruby/rubylib/examples/qt-examples/hello/hello.rb b/qtruby/rubylib/examples/qt-examples/hello/hello.rb index ef70154f..4fbb6b69 100644 --- a/qtruby/rubylib/examples/qt-examples/hello/hello.rb +++ b/qtruby/rubylib/examples/qt-examples/hello/hello.rb @@ -13,7 +13,7 @@ class Hello < TQt::Widget @text = text @sin_tbl = [0, 38, 71, 92, 100, 92, 71, 38, 0, -38, -71, -92, -100, -92, -71, -38] timer = TQt::Timer.new(self); - connect(timer, SIGNAL('timeout()'), SLOT('animate()')) + connect(timer, TQ_SIGNAL('timeout()'), TQ_SLOT('animate()')) timer.start(40); resize(260, 130) diff --git a/qtruby/rubylib/examples/qt-examples/hello/main.rb b/qtruby/rubylib/examples/qt-examples/hello/main.rb index 5be3ce68..1b310551 100755 --- a/qtruby/rubylib/examples/qt-examples/hello/main.rb +++ b/qtruby/rubylib/examples/qt-examples/hello/main.rb @@ -14,7 +14,7 @@ end h = Hello.new(s) h.setCaption('QtRuby says hello') -h.connect(h, SIGNAL('clicked()'), a, SLOT('quit()')) +h.connect(h, TQ_SIGNAL('clicked()'), a, TQ_SLOT('quit()')) h.setFont(TQt::Font.new('times', 32, TQt::Font.Bold)) # default font h.setBackgroundColor(TQt::white) # default bg color a.setMainWidget(h) diff --git a/qtruby/rubylib/examples/qt-examples/progress/progress.rb b/qtruby/rubylib/examples/qt-examples/progress/progress.rb index 1ec02614..3b0b11f8 100644 --- a/qtruby/rubylib/examples/qt-examples/progress/progress.rb +++ b/qtruby/rubylib/examples/qt-examples/progress/progress.rb @@ -118,18 +118,18 @@ class CPUWaster < TQt::Widget FIRST_DRAW_ITEM.upto(LAST_DRAW_ITEM) { |i| file.insertItem( "#{drawItemRects(i)} Rectangles", i) } - connect( menubar, SIGNAL('activated(int)'), self, SLOT('doMenuItem(int)') ) + connect( menubar, TQ_SIGNAL('activated(int)'), self, TQ_SLOT('doMenuItem(int)') ) @file.insertSeparator - @file.insertItem("Quit", $qApp, SLOT('quit()')) + @file.insertItem("Quit", $qApp, TQ_SLOT('quit()')) @options = TQt::PopupMenu.new @menubar.insertItem("&Options", options) - @td_id = options.insertItem("Timer driven", self, SLOT('timerDriven()')) - @ld_id = options.insertItem("Loop driven", self, SLOT('loopDriven()')) + @td_id = options.insertItem("Timer driven", self, TQ_SLOT('timerDriven()')) + @ld_id = options.insertItem("Loop driven", self, TQ_SLOT('loopDriven()')) @options.insertSeparator - @dl_id = options.insertItem("Default label", self, SLOT('defaultLabel()')) - @cl_id = options.insertItem("Custom label", self, SLOT('customLabel()')) + @dl_id = options.insertItem("Default label", self, TQ_SLOT('defaultLabel()')) + @cl_id = options.insertItem("Custom label", self, TQ_SLOT('customLabel()')) @options.insertSeparator - @md_id = options.insertItem("No minimum duration", self, SLOT('toggleMinimumDuration()')) + @md_id = options.insertItem("No minimum duration", self, TQ_SLOT('toggleMinimumDuration()')) @options.setCheckable true loopDriven @@ -239,7 +239,7 @@ class CPUWaster < TQt::Widget @rects = n @pb = newProgressDialog("Drawing rectangles.\nUsing timer event.", n, false) @pb.setCaption("Please Wait") - connect(@pb, SIGNAL('cancelled()'), self, SLOT('stopDrawing()')) + connect(@pb, TQ_SIGNAL('cancelled()'), self, TQ_SLOT('stopDrawing()')) enableDrawingItems(false) startTimer(0) @got_stop = false diff --git a/qtruby/rubylib/examples/qt-examples/tictac/tictac.rb b/qtruby/rubylib/examples/qt-examples/tictac/tictac.rb index 1b8bbe35..f16585af 100644 --- a/qtruby/rubylib/examples/qt-examples/tictac/tictac.rb +++ b/qtruby/rubylib/examples/qt-examples/tictac/tictac.rb @@ -48,7 +48,7 @@ class TicTacGameBoard < TQt::Widget ttb = TicTacButton.new(self) ttb.setPalette(p) ttb.setEnabled(false) - connect(ttb, SIGNAL('clicked()'), self, SLOT('buttonClicked()')) + connect(ttb, TQ_SIGNAL('clicked()'), self, TQ_SLOT('buttonClicked()')) grid.addWidget(ttb, i % @nBoard, i / @nBoard) @buttons[i] = ttb @btArray[i] = TicTacButton::Blank @@ -262,7 +262,7 @@ class TicTacToe < TQt::Widget # Create the game board and connect the signal finished() # to this/self gameOver() slot @board = TicTacGameBoard.new(boardSize, self) - connect(@board, SIGNAL('finished()'), self, SLOT('gameOver()')); + connect(@board, TQ_SIGNAL('finished()'), self, TQ_SLOT('gameOver()')); l.addWidget(@board) # Create a horizontal frame line @@ -279,9 +279,9 @@ class TicTacToe < TQt::Widget # Create the push buttons and connect their signals to the right slots @newGame = TQt::PushButton.new('Play!', self) - connect(@newGame, SIGNAL('clicked()'), self, SLOT('newGameClicked()')) + connect(@newGame, TQ_SIGNAL('clicked()'), self, TQ_SLOT('newGameClicked()')) @quit = TQt::PushButton.new('Quit', self) - connect(@quit, SIGNAL('clicked()'), $qApp, SLOT('quit()')) + connect(@quit, TQ_SIGNAL('clicked()'), $qApp, TQ_SLOT('quit()')) b = TQt::HBoxLayout.new l.addLayout(b) b.addWidget(@newGame) diff --git a/qtruby/rubylib/examples/qtscribble/scribble.rb b/qtruby/rubylib/examples/qtscribble/scribble.rb index 0ba2a4b4..a2ce927b 100644 --- a/qtruby/rubylib/examples/qtscribble/scribble.rb +++ b/qtruby/rubylib/examples/qtscribble/scribble.rb @@ -26,7 +26,7 @@ require 'Qt' # create a pop-up menu @_popupmenu = TQt::PopupMenu.new() - @_popupmenu.insertItem( "&Clear", self, SLOT( "slotClearArea()" ) ) + @_popupmenu.insertItem( "&Clear", self, TQ_SLOT( "slotClearArea()" ) ) end # @@ -159,10 +159,10 @@ class ScribbleWindow < TQt::Widget # The next lines build the menu bar. We first create the menus # one by one, then add them to the menu bar. # @_filemenu = TQt::PopupMenu.new() # create a file menu - @_filemenu.insertItem( "&Load", self, SLOT( "slotLoad()" ) ) - @_filemenu.insertItem( "&Save", self, SLOT( "slotSave()" ) ) + @_filemenu.insertItem( "&Load", self, TQ_SLOT( "slotLoad()" ) ) + @_filemenu.insertItem( "&Save", self, TQ_SLOT( "slotSave()" ) ) @_filemenu.insertSeparator() - @_filemenu.insertItem( "&Quit", $qApp, SLOT( "quit()" ) ) + @_filemenu.insertItem( "&Quit", $qApp, TQ_SLOT( "quit()" ) ) @_colormenu = TQt::PopupMenu.new() # create a color menu @_colormenu.insertItem( "B&lack", COLOR_MENU_ID_BLACK) @@ -170,12 +170,12 @@ class ScribbleWindow < TQt::Widget @_colormenu.insertItem( "&Blue", COLOR_MENU_ID_BLUE) @_colormenu.insertItem( "&Green", COLOR_MENU_ID_GREEN) @_colormenu.insertItem( "&Yellow", COLOR_MENU_ID_YELLOW) - TQt::Object.connect( @_colormenu, SIGNAL( "activated( int )" ), - self, SLOT( "slotColorMenu( int )" ) ) + TQt::Object.connect( @_colormenu, TQ_SIGNAL( "activated( int )" ), + self, TQ_SLOT( "slotColorMenu( int )" ) ) @_helpmenu = TQt::PopupMenu.new() # create a help menu - @_helpmenu.insertItem( "&About QtScribble", self, SLOT( "slotAbout()" ) ) - @_helpmenu.insertItem( "&About Qt", self, SLOT( "slotAboutQt()" ) ) + @_helpmenu.insertItem( "&About QtScribble", self, TQ_SLOT( "slotAbout()" ) ) + @_helpmenu.insertItem( "&About Qt", self, TQ_SLOT( "slotAboutQt()" ) ) @_menubar = TQt::MenuBar.new( self, "" ) # create a menu bar @_menubar.insertItem( "&File", @_filemenu ) @@ -190,12 +190,12 @@ class ScribbleWindow < TQt::Widget @_scribblearea = ScribbleArea.new() @_scribblearea.setGeometry( 0, 0, 1000, 1000 ) @_scrollview.addChild( @_scribblearea ) - TQt::Object.connect( self, SIGNAL( "colorChanged(TQColor)" ), - @_scribblearea, SLOT( "setColor(TQColor)" ) ) - TQt::Object.connect( self, SIGNAL( "save(const TQString&)" ), - @_scribblearea, SLOT( "slotSave(const TQString&)" ) ) - TQt::Object.connect( self, SIGNAL( "load(const TQString&)" ), - @_scribblearea, SLOT( "slotLoad(const TQString&)" ) ) + TQt::Object.connect( self, TQ_SIGNAL( "colorChanged(TQColor)" ), + @_scribblearea, TQ_SLOT( "setColor(TQColor)" ) ) + TQt::Object.connect( self, TQ_SIGNAL( "save(const TQString&)" ), + @_scribblearea, TQ_SLOT( "slotSave(const TQString&)" ) ) + TQt::Object.connect( self, TQ_SIGNAL( "load(const TQString&)" ), + @_scribblearea, TQ_SLOT( "slotLoad(const TQString&)" ) ) end def resizeEvent( event ) diff --git a/qtruby/rubylib/examples/ruboids/ruboids/CameraDialog.rb b/qtruby/rubylib/examples/ruboids/ruboids/CameraDialog.rb index 623abe4b..6ac04192 100644 --- a/qtruby/rubylib/examples/ruboids/ruboids/CameraDialog.rb +++ b/qtruby/rubylib/examples/ruboids/ruboids/CameraDialog.rb @@ -96,14 +96,14 @@ class CameraDialog < TQt::Dialog # The Close button button = TQt::PushButton.new('Close', self, 'Dialog Close') - connect(button, SIGNAL('clicked()'), self, SLOT('close()')) + connect(button, TQ_SIGNAL('clicked()'), self, TQ_SLOT('close()')) button.setDefault(true) button.setFixedSize(button.sizeHint()) buttonLayout.addWidget(button) # The Close button button = TQt::PushButton.new('Reset', self, 'Dialog Reset') - connect(button, SIGNAL('clicked()'), self, SLOT('slotReset()')) + connect(button, TQ_SIGNAL('clicked()'), self, TQ_SLOT('slotReset()')) button.setFixedSize(button.sizeHint()) buttonLayout.addWidget(button) @@ -133,7 +133,7 @@ class CameraDialog < TQt::Dialog layout.addWidget(slider, row, 1) # Connection from slider signal to our slot - connect(slider, SIGNAL('valueChanged(int)'), self, SLOT(slot)) + connect(slider, TQ_SIGNAL('valueChanged(int)'), self, TQ_SLOT(slot)) # Number display num = TQt::Label.new('XXXXX', box) diff --git a/qtruby/rubylib/examples/ruboids/ruboids/World.rb b/qtruby/rubylib/examples/ruboids/ruboids/World.rb index 4bd56d88..6c6e8e34 100644 --- a/qtruby/rubylib/examples/ruboids/ruboids/World.rb +++ b/qtruby/rubylib/examples/ruboids/ruboids/World.rb @@ -51,7 +51,7 @@ class World < TQt::Object } @clock = TQt::Timer.new() - connect(@clock, SIGNAL('timeout()'), self, SLOT('slotMove()')) + connect(@clock, TQ_SIGNAL('timeout()'), self, TQ_SLOT('slotMove()')) @camera = Camera.new # Reads values from params setupTranslation() diff --git a/qtruby/rubylib/examples/ruboids/ruboids/WorldWindow.rb b/qtruby/rubylib/examples/ruboids/ruboids/WorldWindow.rb index 56459729..4ce389be 100644 --- a/qtruby/rubylib/examples/ruboids/ruboids/WorldWindow.rb +++ b/qtruby/rubylib/examples/ruboids/ruboids/WorldWindow.rb @@ -31,7 +31,7 @@ class WorldWindow < TQt::MainWindow # Create and populate file menu menu = TQt::PopupMenu.new(self) - menu.insertItem("Exit", $qApp, SLOT("quit()"), TQt::KeySequence.new(CTRL+Key_Q)) + menu.insertItem("Exit", $qApp, TQ_SLOT("quit()"), TQt::KeySequence.new(CTRL+Key_Q)) # Add file menu to menu bar menuBar.insertItem("&File", menu) @@ -42,7 +42,7 @@ class WorldWindow < TQt::MainWindow # Add options menu to menu bar and link it to method below menuBar.insertItem("&Options", menu) - connect(menu, SIGNAL("activated(int)"), self, SLOT('slotMenuActivated(int)')) + connect(menu, TQ_SIGNAL("activated(int)"), self, TQ_SLOT('slotMenuActivated(int)')) end diff --git a/qtruby/rubylib/examples/testcases/bugs.rb b/qtruby/rubylib/examples/testcases/bugs.rb index 92bb8e80..215aea19 100644 --- a/qtruby/rubylib/examples/testcases/bugs.rb +++ b/qtruby/rubylib/examples/testcases/bugs.rb @@ -21,7 +21,7 @@ def bug3 @file.insertSeparator TQt::debug_level = TQt::DebugLevel::High p $qApp - @file.insertItem("Quit", $qApp, SLOT('quit()')) + @file.insertItem("Quit", $qApp, TQ_SLOT('quit()')) @file.exec end #bug3 diff --git a/qtruby/rubylib/examples/textedit/textedit.rb b/qtruby/rubylib/examples/textedit/textedit.rb index 1f80cb7a..bb67fed7 100644 --- a/qtruby/rubylib/examples/textedit/textedit.rb +++ b/qtruby/rubylib/examples/textedit/textedit.rb @@ -40,7 +40,7 @@ class MyTextEditor < TQt::TextEdit end def createPopupMenu(pos) # virtual pm = TQt::PopupMenu.new - pm.insertItem("Insert Image!", self, SLOT('insert_icon()')) + pm.insertItem("Insert Image!", self, TQ_SLOT('insert_icon()')) pm end def has_metadata @@ -111,18 +111,18 @@ class MyWidget < TQt::MainWindow def initialize() super @editor = MyTextEditor.new(self) - connect(@editor, SIGNAL('textChanged()'), self, SLOT('text_changed()')) - connect(@editor, SIGNAL('saved()'), self, SLOT('saved()')) + connect(@editor, TQ_SIGNAL('textChanged()'), self, TQ_SLOT('text_changed()')) + connect(@editor, TQ_SIGNAL('saved()'), self, TQ_SLOT('saved()')) fileTools = TQt::ToolBar.new(self, "file operations") fileMenu = TQt::PopupMenu.new(self) actions = [ - RAction.new("&New", Icons::FILE_NEW, @editor, SLOT('new()'), [fileTools, fileMenu]), - RAction.new("&Open...", Icons::FILE_OPEN, @editor, SLOT('open()'), [fileTools, fileMenu]), - @save = RAction.new("Save &As...", Icons::FILE_SAVE_AS, @editor, SLOT('save_as()'), [fileTools, fileMenu]), + RAction.new("&New", Icons::FILE_NEW, @editor, TQ_SLOT('new()'), [fileTools, fileMenu]), + RAction.new("&Open...", Icons::FILE_OPEN, @editor, TQ_SLOT('open()'), [fileTools, fileMenu]), + @save = RAction.new("Save &As...", Icons::FILE_SAVE_AS, @editor, TQ_SLOT('save_as()'), [fileTools, fileMenu]), RSeperator.new([fileMenu]), - RAction.new("E&xit", Icons::EXIT, $qApp, SLOT('quit()'), [fileMenu]) + RAction.new("E&xit", Icons::EXIT, $qApp, TQ_SLOT('quit()'), [fileMenu]) ] build_actions(actions) diff --git a/qtruby/rubylib/qtruby/lib/Qt/qtruby.rb b/qtruby/rubylib/qtruby/lib/Qt/qtruby.rb index 4197e9f6..bbbb92e3 100644 --- a/qtruby/rubylib/qtruby/lib/Qt/qtruby.rb +++ b/qtruby/rubylib/qtruby/lib/Qt/qtruby.rb @@ -277,13 +277,13 @@ module TQt def inspect str = super str.sub(/>$/, " memberName=%s, memberType=%s, object=%s>" % - [memberName.inspect, memberType == 1 ? "SLOT" : "SIGNAL", object.inspect] ) + [memberName.inspect, memberType == 1 ? "TQ_SLOT" : "TQ_SIGNAL", object.inspect] ) end def pretty_print(pp) str = to_s pp.text str.sub(/>$/, "\n memberName=%s,\n memberType=%s,\n object=%s>" % - [memberName.inspect, memberType == 1 ? "SLOT" : "SIGNAL", object.inspect] ) + [memberName.inspect, memberType == 1 ? "TQ_SLOT" : "TQ_SIGNAL", object.inspect] ) end end @@ -1758,7 +1758,7 @@ module TQt return TQt::Object.connect( src, signal, TQt::BlockInvocation.new(target, block, signature), - SLOT("invoke(#{signature})") ) + TQ_SLOT("invoke(#{signature})") ) end def Internal.signal_connect(src, signal, block) @@ -1766,7 +1766,7 @@ module TQt return TQt::Object.connect( src, signal, TQt::SignalBlockInvocation.new(src, block, signature), - SLOT("invoke(#{signature})") ) + TQ_SLOT("invoke(#{signature})") ) end end # TQt::Internal @@ -1878,7 +1878,7 @@ module TQt end # Qt class Object - def SIGNAL(signal) + def TQ_SIGNAL(signal) if signal.kind_of? Symbol return "2" + signal.to_s + "()" else @@ -1886,7 +1886,7 @@ class Object end end - def SLOT(slot) + def TQ_SLOT(slot) if slot.kind_of? Symbol return "1" + slot.to_s + "()" else diff --git a/qtruby/rubylib/tutorial/t10/lcdrange.rb b/qtruby/rubylib/tutorial/t10/lcdrange.rb index 85ed3c0b..98e80fbd 100644 --- a/qtruby/rubylib/tutorial/t10/lcdrange.rb +++ b/qtruby/rubylib/tutorial/t10/lcdrange.rb @@ -10,8 +10,8 @@ class LCDRange < TQt::VBox @slider = TQt::Slider.new(TQt::VBox::Horizontal, self, 'slider') @slider.setRange(0, 99) @slider.setValue(0) - connect(@slider, SIGNAL('valueChanged(int)'), lcd, SLOT('display(int)')) - connect(@slider, SIGNAL('valueChanged(int)'), SIGNAL('valueChanged(int)')) + connect(@slider, TQ_SIGNAL('valueChanged(int)'), lcd, TQ_SLOT('display(int)')) + connect(@slider, TQ_SIGNAL('valueChanged(int)'), TQ_SIGNAL('valueChanged(int)')) setFocusProxy(@slider) end diff --git a/qtruby/rubylib/tutorial/t10/t10.rb b/qtruby/rubylib/tutorial/t10/t10.rb index b86c9e1b..99b0cd96 100755 --- a/qtruby/rubylib/tutorial/t10/t10.rb +++ b/qtruby/rubylib/tutorial/t10/t10.rb @@ -11,7 +11,7 @@ class MyWidget < TQt::Widget quit = TQt::PushButton.new('Quit', self, 'quit') quit.setFont(TQt::Font.new('Times', 18, TQt::Font::Bold)) - connect(quit, SIGNAL('clicked()'), $qApp, SLOT('quit()')) + connect(quit, TQ_SIGNAL('clicked()'), $qApp, TQ_SLOT('quit()')) angle = LCDRange.new( self, 'angle' ) angle.setRange( 5, 70 ) @@ -21,15 +21,15 @@ class MyWidget < TQt::Widget cannonField = CannonField.new( self, 'cannonField' ) - connect( angle, SIGNAL('valueChanged(int)'), - cannonField, SLOT('setAngle(int)') ) - connect( cannonField, SIGNAL('angleChanged(int)'), - angle, SLOT('setValue(int)') ) + connect( angle, TQ_SIGNAL('valueChanged(int)'), + cannonField, TQ_SLOT('setAngle(int)') ) + connect( cannonField, TQ_SIGNAL('angleChanged(int)'), + angle, TQ_SLOT('setValue(int)') ) - connect( force, SIGNAL('valueChanged(int)'), - cannonField, SLOT('setForce(int)') ) - connect( cannonField, SIGNAL('forceChanged(int)'), - force, SLOT('setValue(int)') ) + connect( force, TQ_SIGNAL('valueChanged(int)'), + cannonField, TQ_SLOT('setForce(int)') ) + connect( cannonField, TQ_SIGNAL('forceChanged(int)'), + force, TQ_SLOT('setValue(int)') ) grid = TQt::GridLayout.new( self, 2, 2, 10 ) grid.addWidget( quit, 0, 0 ) diff --git a/qtruby/rubylib/tutorial/t11/cannon.rb b/qtruby/rubylib/tutorial/t11/cannon.rb index 89a2ca24..8429159b 100644 --- a/qtruby/rubylib/tutorial/t11/cannon.rb +++ b/qtruby/rubylib/tutorial/t11/cannon.rb @@ -12,8 +12,8 @@ class CannonField < TQt::Widget @f = 0 @timerCount = 0; @autoShootTimer = TQt::Timer.new( self, 'movement handler' ) - connect( @autoShootTimer, SIGNAL('timeout()'), - self, SLOT('moveShot()') ); + connect( @autoShootTimer, TQ_SIGNAL('timeout()'), + self, TQ_SLOT('moveShot()') ); @shoot_ang = 0 @shoot_f = 0 setPalette( TQt::Palette.new( TQt::Color.new( 250, 250, 200) ) ) diff --git a/qtruby/rubylib/tutorial/t11/lcdrange.rb b/qtruby/rubylib/tutorial/t11/lcdrange.rb index 85ed3c0b..98e80fbd 100644 --- a/qtruby/rubylib/tutorial/t11/lcdrange.rb +++ b/qtruby/rubylib/tutorial/t11/lcdrange.rb @@ -10,8 +10,8 @@ class LCDRange < TQt::VBox @slider = TQt::Slider.new(TQt::VBox::Horizontal, self, 'slider') @slider.setRange(0, 99) @slider.setValue(0) - connect(@slider, SIGNAL('valueChanged(int)'), lcd, SLOT('display(int)')) - connect(@slider, SIGNAL('valueChanged(int)'), SIGNAL('valueChanged(int)')) + connect(@slider, TQ_SIGNAL('valueChanged(int)'), lcd, TQ_SLOT('display(int)')) + connect(@slider, TQ_SIGNAL('valueChanged(int)'), TQ_SIGNAL('valueChanged(int)')) setFocusProxy(@slider) end diff --git a/qtruby/rubylib/tutorial/t11/t11.rb b/qtruby/rubylib/tutorial/t11/t11.rb index 4b400026..d7ed74c9 100755 --- a/qtruby/rubylib/tutorial/t11/t11.rb +++ b/qtruby/rubylib/tutorial/t11/t11.rb @@ -11,7 +11,7 @@ class MyWidget < TQt::Widget quit = TQt::PushButton.new('Quit', self, 'quit') quit.setFont(TQt::Font.new('Times', 18, TQt::Font::Bold)) - connect(quit, SIGNAL('clicked()'), $qApp, SLOT('quit()')) + connect(quit, TQ_SIGNAL('clicked()'), $qApp, TQ_SLOT('quit()')) angle = LCDRange.new( self, 'angle' ) angle.setRange( 5, 70 ) @@ -21,20 +21,20 @@ class MyWidget < TQt::Widget cannonField = CannonField.new( self, 'cannonField' ) - connect( angle, SIGNAL('valueChanged(int)'), - cannonField, SLOT('setAngle(int)') ) - connect( cannonField, SIGNAL('angleChanged(int)'), - angle, SLOT('setValue(int)') ) + connect( angle, TQ_SIGNAL('valueChanged(int)'), + cannonField, TQ_SLOT('setAngle(int)') ) + connect( cannonField, TQ_SIGNAL('angleChanged(int)'), + angle, TQ_SLOT('setValue(int)') ) - connect( force, SIGNAL('valueChanged(int)'), - cannonField, SLOT('setForce(int)') ) - connect( cannonField, SIGNAL('forceChanged(int)'), - force, SLOT('setValue(int)') ) + connect( force, TQ_SIGNAL('valueChanged(int)'), + cannonField, TQ_SLOT('setForce(int)') ) + connect( cannonField, TQ_SIGNAL('forceChanged(int)'), + force, TQ_SLOT('setValue(int)') ) shoot = TQt::PushButton.new( '&Shoot', self, 'shoot' ) shoot.setFont( TQt::Font.new( 'Times', 18, TQt::Font::Bold ) ) - connect( shoot, SIGNAL('clicked()'), cannonField, SLOT('shoot()') ) + connect( shoot, TQ_SIGNAL('clicked()'), cannonField, TQ_SLOT('shoot()') ) grid = TQt::GridLayout.new( self, 2, 2, 10 ) grid.addWidget( quit, 0, 0 ) diff --git a/qtruby/rubylib/tutorial/t12/cannon.rb b/qtruby/rubylib/tutorial/t12/cannon.rb index 0d17f880..c4c35432 100644 --- a/qtruby/rubylib/tutorial/t12/cannon.rb +++ b/qtruby/rubylib/tutorial/t12/cannon.rb @@ -12,8 +12,8 @@ class CannonField < TQt::Widget @f = 0 @timerCount = 0; @autoShootTimer = TQt::Timer.new( self, 'movement handler' ) - connect( @autoShootTimer, SIGNAL('timeout()'), - self, SLOT('moveShot()') ); + connect( @autoShootTimer, TQ_SIGNAL('timeout()'), + self, TQ_SLOT('moveShot()') ); @shoot_ang = 0 @shoot_f = 0 @target = TQt::Point.new(0, 0) diff --git a/qtruby/rubylib/tutorial/t12/lcdrange.rb b/qtruby/rubylib/tutorial/t12/lcdrange.rb index 54654165..77b81384 100644 --- a/qtruby/rubylib/tutorial/t12/lcdrange.rb +++ b/qtruby/rubylib/tutorial/t12/lcdrange.rb @@ -17,8 +17,8 @@ class LCDRange < TQt::VBox @slider.setValue(0) @label = TQt::Label.new( ' ', self, 'label' ) @label.setAlignment( TQt::AlignCenter ) - connect(@slider, SIGNAL('valueChanged(int)'), lcd, SLOT('display(int)')) - connect(@slider, SIGNAL('valueChanged(int)'), SIGNAL('valueChanged(int)')) + connect(@slider, TQ_SIGNAL('valueChanged(int)'), lcd, TQ_SLOT('display(int)')) + connect(@slider, TQ_SIGNAL('valueChanged(int)'), TQ_SIGNAL('valueChanged(int)')) setFocusProxy(@slider) end diff --git a/qtruby/rubylib/tutorial/t12/t12.rb b/qtruby/rubylib/tutorial/t12/t12.rb index 47f81f3b..c836b750 100755 --- a/qtruby/rubylib/tutorial/t12/t12.rb +++ b/qtruby/rubylib/tutorial/t12/t12.rb @@ -12,7 +12,7 @@ class MyWidget < TQt::Widget quit = TQt::PushButton.new('&Quit', self, 'quit') quit.setFont(TQt::Font.new('Times', 18, TQt::Font::Bold)) - connect(quit, SIGNAL('clicked()'), $qApp, SLOT('quit()')) + connect(quit, TQ_SIGNAL('clicked()'), $qApp, TQ_SLOT('quit()')) angle = LCDRange.new( 'ANGLE', self, 'angle' ) angle.setRange( 5, 70 ) @@ -22,20 +22,20 @@ class MyWidget < TQt::Widget cannonField = CannonField.new( self, 'cannonField' ) - connect( angle, SIGNAL('valueChanged(int)'), - cannonField, SLOT('setAngle(int)') ) - connect( cannonField, SIGNAL('angleChanged(int)'), - angle, SLOT('setValue(int)') ) + connect( angle, TQ_SIGNAL('valueChanged(int)'), + cannonField, TQ_SLOT('setAngle(int)') ) + connect( cannonField, TQ_SIGNAL('angleChanged(int)'), + angle, TQ_SLOT('setValue(int)') ) - connect( force, SIGNAL('valueChanged(int)'), - cannonField, SLOT('setForce(int)') ) - connect( cannonField, SIGNAL('forceChanged(int)'), - force, SLOT('setValue(int)') ) + connect( force, TQ_SIGNAL('valueChanged(int)'), + cannonField, TQ_SLOT('setForce(int)') ) + connect( cannonField, TQ_SIGNAL('forceChanged(int)'), + force, TQ_SLOT('setValue(int)') ) shoot = TQt::PushButton.new( '&Shoot', self, 'shoot' ) shoot.setFont( TQt::Font.new( 'Times', 18, TQt::Font::Bold ) ) - connect( shoot, SIGNAL('clicked()'), cannonField, SLOT('shoot()') ) + connect( shoot, TQ_SIGNAL('clicked()'), cannonField, TQ_SLOT('shoot()') ) grid = TQt::GridLayout.new( self, 2, 2, 10 ) grid.addWidget( quit, 0, 0 ) diff --git a/qtruby/rubylib/tutorial/t13/cannon.rb b/qtruby/rubylib/tutorial/t13/cannon.rb index 315760f0..75b637f9 100644 --- a/qtruby/rubylib/tutorial/t13/cannon.rb +++ b/qtruby/rubylib/tutorial/t13/cannon.rb @@ -16,8 +16,8 @@ class CannonField < TQt::Widget @f = 0 @timerCount = 0; @autoShootTimer = TQt::Timer.new( self, "movement handler" ) - connect( @autoShootTimer, SIGNAL('timeout()'), - self, SLOT('moveShot()') ); + connect( @autoShootTimer, TQ_SIGNAL('timeout()'), + self, TQ_SLOT('moveShot()') ); @shoot_ang = 0 @shoot_f = 0 @target = TQt::Point.new(0, 0) diff --git a/qtruby/rubylib/tutorial/t13/gamebrd.rb b/qtruby/rubylib/tutorial/t13/gamebrd.rb index 938dfd49..9a2f475a 100644 --- a/qtruby/rubylib/tutorial/t13/gamebrd.rb +++ b/qtruby/rubylib/tutorial/t13/gamebrd.rb @@ -11,7 +11,7 @@ class GameBoard < TQt::Widget quit = TQt::PushButton.new('&Quit', self, 'quit') quit.setFont(TQt::Font.new('Times', 18, TQt::Font::Bold)) - connect(quit, SIGNAL('clicked()'), $qApp, SLOT('quit()')) + connect(quit, TQ_SIGNAL('clicked()'), $qApp, TQ_SLOT('quit()')) angle = LCDRange.new( 'ANGLE', self, 'angle' ) angle.setRange( 5, 70 ) @@ -21,32 +21,32 @@ class GameBoard < TQt::Widget @cannonField = CannonField.new( self, 'cannonField' ) - connect( angle, SIGNAL('valueChanged(int)'), - @cannonField, SLOT('setAngle(int)') ) - connect( @cannonField, SIGNAL('angleChanged(int)'), - angle, SLOT('setValue(int)') ) + connect( angle, TQ_SIGNAL('valueChanged(int)'), + @cannonField, TQ_SLOT('setAngle(int)') ) + connect( @cannonField, TQ_SIGNAL('angleChanged(int)'), + angle, TQ_SLOT('setValue(int)') ) - connect( force, SIGNAL('valueChanged(int)'), - @cannonField, SLOT('setForce(int)') ) - connect( @cannonField, SIGNAL('forceChanged(int)'), - force, SLOT('setValue(int)') ) + connect( force, TQ_SIGNAL('valueChanged(int)'), + @cannonField, TQ_SLOT('setForce(int)') ) + connect( @cannonField, TQ_SIGNAL('forceChanged(int)'), + force, TQ_SLOT('setValue(int)') ) - connect( @cannonField, SIGNAL('hit()'), - self, SLOT('hit()') ) - connect( @cannonField, SIGNAL('missed()'), - self, SLOT('missed()') ) + connect( @cannonField, TQ_SIGNAL('hit()'), + self, TQ_SLOT('hit()') ) + connect( @cannonField, TQ_SIGNAL('missed()'), + self, TQ_SLOT('missed()') ) shoot = TQt::PushButton.new( '&Shoot', self, 'shoot' ) shoot.setFont( TQt::Font.new( 'Times', 18, TQt::Font::Bold ) ) - connect( shoot, SIGNAL('clicked()'), SLOT('fire()') ) - connect( @cannonField, SIGNAL('canShoot(bool)'), - shoot, SLOT('setEnabled(bool)') ) + connect( shoot, TQ_SIGNAL('clicked()'), TQ_SLOT('fire()') ) + connect( @cannonField, TQ_SIGNAL('canShoot(bool)'), + shoot, TQ_SLOT('setEnabled(bool)') ) restart = TQt::PushButton.new( '&New Game', self, 'newgame' ) restart.setFont( TQt::Font.new( 'Times', 18, TQt::Font::Bold ) ) - connect( restart, SIGNAL('clicked()'), self, SLOT('newGame()') ) + connect( restart, TQ_SIGNAL('clicked()'), self, TQ_SLOT('newGame()') ) @hits = TQt::LCDNumber.new( 2, self, 'hits' ) @shotsLeft = TQt::LCDNumber.new( 2, self, 'shotsleft' ) diff --git a/qtruby/rubylib/tutorial/t13/lcdrange.rb b/qtruby/rubylib/tutorial/t13/lcdrange.rb index 39eb9b1d..50f9a6fb 100644 --- a/qtruby/rubylib/tutorial/t13/lcdrange.rb +++ b/qtruby/rubylib/tutorial/t13/lcdrange.rb @@ -19,8 +19,8 @@ class LCDRange < TQt::Widget @label = TQt::Label.new( ' ', self, 'label' ) @label.setAlignment( TQt::AlignCenter ) - connect(@slider, SIGNAL('valueChanged(int)'), @lcd, SLOT('display(int)')) - connect(@slider, SIGNAL('valueChanged(int)'), SIGNAL('valueChanged(int)')) + connect(@slider, TQ_SIGNAL('valueChanged(int)'), @lcd, TQ_SLOT('display(int)')) + connect(@slider, TQ_SIGNAL('valueChanged(int)'), TQ_SIGNAL('valueChanged(int)')) setFocusProxy(@slider) diff --git a/qtruby/rubylib/tutorial/t14/cannon.rb b/qtruby/rubylib/tutorial/t14/cannon.rb index c2147714..33d0478d 100644 --- a/qtruby/rubylib/tutorial/t14/cannon.rb +++ b/qtruby/rubylib/tutorial/t14/cannon.rb @@ -15,8 +15,8 @@ class CannonField < TQt::Widget @f = 0 @timerCount = 0; @autoShootTimer = TQt::Timer.new( self, 'movement handler' ) - connect( @autoShootTimer, SIGNAL('timeout()'), - self, SLOT('moveShot()') ) + connect( @autoShootTimer, TQ_SIGNAL('timeout()'), + self, TQ_SLOT('moveShot()') ) @shoot_ang = 0 @shoot_f = 0 @target = TQt::Point.new(0, 0) diff --git a/qtruby/rubylib/tutorial/t14/gamebrd.rb b/qtruby/rubylib/tutorial/t14/gamebrd.rb index 27c403b0..e8ed3096 100644 --- a/qtruby/rubylib/tutorial/t14/gamebrd.rb +++ b/qtruby/rubylib/tutorial/t14/gamebrd.rb @@ -10,7 +10,7 @@ class GameBoard < TQt::Widget quit = TQt::PushButton.new('&Quit', self, 'quit') quit.setFont(TQt::Font.new('Times', 18, TQt::Font::Bold)) - connect(quit, SIGNAL('clicked()'), $qApp, SLOT('quit()')) + connect(quit, TQ_SIGNAL('clicked()'), $qApp, TQ_SLOT('quit()')) angle = LCDRange.new( 'ANGLE', self, 'angle' ) angle.setRange( 5, 70 ) @@ -22,32 +22,32 @@ class GameBoard < TQt::Widget box.setFrameStyle( TQt::Frame::WinPanel | TQt::Frame::Sunken ) @cannonField = CannonField.new( box, 'cannonField' ) - connect( angle, SIGNAL('valueChanged(int)'), - @cannonField, SLOT('setAngle(int)') ) - connect( @cannonField, SIGNAL('angleChanged(int)'), - angle, SLOT('setValue(int)') ) + connect( angle, TQ_SIGNAL('valueChanged(int)'), + @cannonField, TQ_SLOT('setAngle(int)') ) + connect( @cannonField, TQ_SIGNAL('angleChanged(int)'), + angle, TQ_SLOT('setValue(int)') ) - connect( force, SIGNAL('valueChanged(int)'), - @cannonField, SLOT('setForce(int)') ) - connect( @cannonField, SIGNAL('forceChanged(int)'), - force, SLOT('setValue(int)') ) + connect( force, TQ_SIGNAL('valueChanged(int)'), + @cannonField, TQ_SLOT('setForce(int)') ) + connect( @cannonField, TQ_SIGNAL('forceChanged(int)'), + force, TQ_SLOT('setValue(int)') ) - connect( @cannonField, SIGNAL('hit()'), - self, SLOT('hit()') ) - connect( @cannonField, SIGNAL('missed()'), - self, SLOT('missed()') ) + connect( @cannonField, TQ_SIGNAL('hit()'), + self, TQ_SLOT('hit()') ) + connect( @cannonField, TQ_SIGNAL('missed()'), + self, TQ_SLOT('missed()') ) shoot = TQt::PushButton.new( '&Shoot', self, 'shoot' ) shoot.setFont( TQt::Font.new( 'Times', 18, TQt::Font::Bold ) ) - connect( shoot, SIGNAL('clicked()'), SLOT('fire()') ) - connect( @cannonField, SIGNAL('canShoot(bool)'), - shoot, SLOT('setEnabled(bool)') ) + connect( shoot, TQ_SIGNAL('clicked()'), TQ_SLOT('fire()') ) + connect( @cannonField, TQ_SIGNAL('canShoot(bool)'), + shoot, TQ_SLOT('setEnabled(bool)') ) restart = TQt::PushButton.new( '&New Game', self, 'newgame' ) restart.setFont( TQt::Font.new( 'Times', 18, TQt::Font::Bold ) ) - connect( restart, SIGNAL('clicked()'), self, SLOT('newGame()') ) + connect( restart, TQ_SIGNAL('clicked()'), self, TQ_SLOT('newGame()') ) @hits = TQt::LCDNumber.new( 2, self, 'hits' ) @shotsLeft = TQt::LCDNumber.new( 2, self, 'shotsleft' ) @@ -56,11 +56,11 @@ class GameBoard < TQt::Widget accel = TQt::Accel.new( self ) accel.connectItem( accel.insertItem( TQt::KeySequence.new(Key_Enter) ), - self, SLOT('fire()') ) + self, TQ_SLOT('fire()') ) accel.connectItem( accel.insertItem( TQt::KeySequence.new(Key_Return) ), - self, SLOT('fire()') ) + self, TQ_SLOT('fire()') ) accel.connectItem( accel.insertItem( TQt::KeySequence.new(CTRL+Key_Q) ), - $qApp, SLOT('quit()') ) + $qApp, TQ_SLOT('quit()') ) grid = TQt::GridLayout.new( self, 2, 2, 10 ) grid.addWidget( quit, 0, 0 ) diff --git a/qtruby/rubylib/tutorial/t14/lcdrange.rb b/qtruby/rubylib/tutorial/t14/lcdrange.rb index 9cb54b39..e0817103 100644 --- a/qtruby/rubylib/tutorial/t14/lcdrange.rb +++ b/qtruby/rubylib/tutorial/t14/lcdrange.rb @@ -19,8 +19,8 @@ class LCDRange < TQt::Widget @label = TQt::Label.new( ' ', self, 'label' ) @label.setAlignment( TQt::AlignCenter ) - connect(@slider, SIGNAL('valueChanged(int)'), @lcd, SLOT('display(int)')) - connect(@slider, SIGNAL('valueChanged(int)'), SIGNAL('valueChanged(int)')) + connect(@slider, TQ_SIGNAL('valueChanged(int)'), @lcd, TQ_SLOT('display(int)')) + connect(@slider, TQ_SIGNAL('valueChanged(int)'), TQ_SIGNAL('valueChanged(int)')) setFocusProxy(@slider) diff --git a/qtruby/rubylib/tutorial/t2/t2.rb b/qtruby/rubylib/tutorial/t2/t2.rb index b5e62bca..813eb78f 100755 --- a/qtruby/rubylib/tutorial/t2/t2.rb +++ b/qtruby/rubylib/tutorial/t2/t2.rb @@ -9,7 +9,7 @@ quit = TQt::PushButton.new('Quit', nil) quit.resize(75, 30) quit.setFont(TQt::Font.new('Times', 18, TQt::Font::Bold)) -TQt::Object.connect(quit, SIGNAL('clicked()'), a, SLOT('quit()')) +TQt::Object.connect(quit, TQ_SIGNAL('clicked()'), a, TQ_SLOT('quit()')) a.setMainWidget(quit) quit.show diff --git a/qtruby/rubylib/tutorial/t3/t3.rb b/qtruby/rubylib/tutorial/t3/t3.rb index 9a6b32d2..2c1d6b76 100755 --- a/qtruby/rubylib/tutorial/t3/t3.rb +++ b/qtruby/rubylib/tutorial/t3/t3.rb @@ -11,7 +11,7 @@ box.resize(200, 120) quit = TQt::PushButton.new('Quit', box) quit.setFont(TQt::Font.new('Times', 18, TQt::Font::Bold)) -a.connect(quit, SIGNAL('clicked()'), SLOT('quit()')) +a.connect(quit, TQ_SIGNAL('clicked()'), TQ_SLOT('quit()')) a.setMainWidget(box) box.show diff --git a/qtruby/rubylib/tutorial/t4/t4.rb b/qtruby/rubylib/tutorial/t4/t4.rb index dc254a8d..b4f36b78 100755 --- a/qtruby/rubylib/tutorial/t4/t4.rb +++ b/qtruby/rubylib/tutorial/t4/t4.rb @@ -13,7 +13,7 @@ def initialize(parent = nil, name = nil) quit = TQt::PushButton.new('Quit', self, 'quit') quit.setGeometry(62, 40, 75, 30) quit.setFont(TQt::Font.new('Times', 18, TQt::Font::Bold)) - connect(quit, SIGNAL('clicked()'), $qApp, SLOT('quit()')) + connect(quit, TQ_SIGNAL('clicked()'), $qApp, TQ_SLOT('quit()')) end end diff --git a/qtruby/rubylib/tutorial/t5/t5.rb b/qtruby/rubylib/tutorial/t5/t5.rb index 56b50d17..72625321 100755 --- a/qtruby/rubylib/tutorial/t5/t5.rb +++ b/qtruby/rubylib/tutorial/t5/t5.rb @@ -10,7 +10,7 @@ def initialize() quit = TQt::PushButton.new('Quit', self, 'quit') quit.setFont(TQt::Font.new('Times', 18, TQt::Font::Bold)) - connect(quit, SIGNAL('clicked()'), $qApp, SLOT('quit()')) + connect(quit, TQ_SIGNAL('clicked()'), $qApp, TQ_SLOT('quit()')) lcd = TQt::LCDNumber.new(2, self, 'lcd') @@ -18,7 +18,7 @@ def initialize() slider.setRange(0, 99) slider.setValue(0) - connect(slider, SIGNAL('valueChanged(int)'), lcd, SLOT('display(int)')) + connect(slider, TQ_SIGNAL('valueChanged(int)'), lcd, TQ_SLOT('display(int)')) end end diff --git a/qtruby/rubylib/tutorial/t6/t6.rb b/qtruby/rubylib/tutorial/t6/t6.rb index 7d6b4b42..f0bd1afb 100755 --- a/qtruby/rubylib/tutorial/t6/t6.rb +++ b/qtruby/rubylib/tutorial/t6/t6.rb @@ -13,7 +13,7 @@ def initialize(grid) slider.setRange(0, 99) slider.setValue(0) - lcd.connect(slider, SIGNAL('valueChanged(int)'), SLOT('display(int)')) + lcd.connect(slider, TQ_SIGNAL('valueChanged(int)'), TQ_SLOT('display(int)')) end end @@ -25,7 +25,7 @@ def initialize() quit = TQt::PushButton.new('Quit', self, 'quit') quit.setFont(TQt::Font.new('Times', 18, TQt::Font::Bold)) - connect(quit, SIGNAL('clicked()'), $qApp, SLOT('quit()')) + connect(quit, TQ_SIGNAL('clicked()'), $qApp, TQ_SLOT('quit()')) grid = TQt::Grid.new( 4, self ) for c in 0..3 diff --git a/qtruby/rubylib/tutorial/t7/lcdrange.rb b/qtruby/rubylib/tutorial/t7/lcdrange.rb index 0c673284..4e9e7616 100644 --- a/qtruby/rubylib/tutorial/t7/lcdrange.rb +++ b/qtruby/rubylib/tutorial/t7/lcdrange.rb @@ -11,8 +11,8 @@ class LCDRange < TQt::VBox @slider = TQt::Slider.new(TQt::VBox::Horizontal, self, 'slider') @slider.setRange(0, 99) @slider.setValue(0) - connect(@slider, SIGNAL('valueChanged(int)'), lcd, SLOT('display(int)')) - connect(@slider, SIGNAL('valueChanged(int)'), SIGNAL('valueChanged(int)')) + connect(@slider, TQ_SIGNAL('valueChanged(int)'), lcd, TQ_SLOT('display(int)')) + connect(@slider, TQ_SIGNAL('valueChanged(int)'), TQ_SIGNAL('valueChanged(int)')) end def value() diff --git a/qtruby/rubylib/tutorial/t7/t7.rb b/qtruby/rubylib/tutorial/t7/t7.rb index f1d56b20..97cfe8d0 100755 --- a/qtruby/rubylib/tutorial/t7/t7.rb +++ b/qtruby/rubylib/tutorial/t7/t7.rb @@ -11,7 +11,7 @@ def initialize() quit = TQt::PushButton.new('Quit', self, 'quit') quit.setFont(TQt::Font.new('Times', 18, TQt::Font::Bold)) - connect(quit, SIGNAL('clicked()'), $qApp, SLOT('quit()')) + connect(quit, TQ_SIGNAL('clicked()'), $qApp, TQ_SLOT('quit()')) grid = TQt::Grid.new( 4, self ) previous = nil @@ -19,8 +19,8 @@ def initialize() for r in 0..3 lr = LCDRange.new(grid) if previous != nil - connect( lr, SIGNAL('valueChanged(int)'), - previous, SLOT('setValue(int)') ) + connect( lr, TQ_SIGNAL('valueChanged(int)'), + previous, TQ_SLOT('setValue(int)') ) end previous = lr end diff --git a/qtruby/rubylib/tutorial/t8/lcdrange.rb b/qtruby/rubylib/tutorial/t8/lcdrange.rb index 4e3d856f..32481913 100644 --- a/qtruby/rubylib/tutorial/t8/lcdrange.rb +++ b/qtruby/rubylib/tutorial/t8/lcdrange.rb @@ -10,8 +10,8 @@ class LCDRange < TQt::VBox @slider = TQt::Slider.new(TQt::VBox::Horizontal, self, 'slider') @slider.setRange(0, 99) @slider.setValue(0) - connect(@slider, SIGNAL('valueChanged(int)'), lcd, SLOT('display(int)')) - connect(@slider, SIGNAL('valueChanged(int)'), SIGNAL('valueChanged(int)')) + connect(@slider, TQ_SIGNAL('valueChanged(int)'), lcd, TQ_SLOT('display(int)')) + connect(@slider, TQ_SIGNAL('valueChanged(int)'), TQ_SIGNAL('valueChanged(int)')) setFocusProxy(@slider) end diff --git a/qtruby/rubylib/tutorial/t8/t8.rb b/qtruby/rubylib/tutorial/t8/t8.rb index fad11dd0..bc6a468a 100755 --- a/qtruby/rubylib/tutorial/t8/t8.rb +++ b/qtruby/rubylib/tutorial/t8/t8.rb @@ -11,17 +11,17 @@ class MyWidget < TQt::Widget quit = TQt::PushButton.new('Quit', self, 'quit') quit.setFont(TQt::Font.new('Times', 18, TQt::Font::Bold)) - connect(quit, SIGNAL('clicked()'), $qApp, SLOT('quit()')) + connect(quit, TQ_SIGNAL('clicked()'), $qApp, TQ_SLOT('quit()')) angle = LCDRange.new( self, 'angle' ) angle.setRange( 5, 70 ) cannonField = CannonField.new( self, 'cannonField' ) - connect( angle, SIGNAL('valueChanged(int)'), - cannonField, SLOT('setAngle(int)') ) - connect( cannonField, SIGNAL('angleChanged(int)'), - angle, SLOT('setValue(int)') ) + connect( angle, TQ_SIGNAL('valueChanged(int)'), + cannonField, TQ_SLOT('setAngle(int)') ) + connect( cannonField, TQ_SIGNAL('angleChanged(int)'), + angle, TQ_SLOT('setValue(int)') ) grid = TQt::GridLayout.new( self, 2, 2, 10 ) # 2x2, 10 pixel border diff --git a/qtruby/rubylib/tutorial/t9/lcdrange.rb b/qtruby/rubylib/tutorial/t9/lcdrange.rb index 208650f3..dddbc381 100644 --- a/qtruby/rubylib/tutorial/t9/lcdrange.rb +++ b/qtruby/rubylib/tutorial/t9/lcdrange.rb @@ -10,8 +10,8 @@ class LCDRange < TQt::VBox @slider = TQt::Slider.new(TQt::VBox::Horizontal, self, 'slider') @slider.setRange(0, 99) @slider.setValue(0) - connect(@slider, SIGNAL('valueChanged(int)'), lcd, SLOT('display(int)')) - connect(@slider, SIGNAL('valueChanged(int)'), SIGNAL('valueChanged(int)')) + connect(@slider, TQ_SIGNAL('valueChanged(int)'), lcd, TQ_SLOT('display(int)')) + connect(@slider, TQ_SIGNAL('valueChanged(int)'), TQ_SIGNAL('valueChanged(int)')) setFocusProxy(@slider) end diff --git a/qtruby/rubylib/tutorial/t9/t9.rb b/qtruby/rubylib/tutorial/t9/t9.rb index 8a9cf81d..090fc9b0 100755 --- a/qtruby/rubylib/tutorial/t9/t9.rb +++ b/qtruby/rubylib/tutorial/t9/t9.rb @@ -11,17 +11,17 @@ class MyWidget < TQt::Widget quit = TQt::PushButton.new('Quit', self, 'quit') quit.setFont(TQt::Font.new('Times', 18, TQt::Font::Bold)) - connect(quit, SIGNAL('clicked()'), $qApp, SLOT('quit()')) + connect(quit, TQ_SIGNAL('clicked()'), $qApp, TQ_SLOT('quit()')) angle = LCDRange.new( self, 'angle' ) angle.setRange( 5, 70 ) cannonField = CannonField.new( self, 'cannonField' ) - connect( angle, SIGNAL('valueChanged(int)'), - cannonField, SLOT('setAngle(int)') ) - connect( cannonField, SIGNAL('angleChanged(int)'), - angle, SLOT('setValue(int)') ) + connect( angle, TQ_SIGNAL('valueChanged(int)'), + cannonField, TQ_SLOT('setAngle(int)') ) + connect( cannonField, TQ_SIGNAL('angleChanged(int)'), + angle, TQ_SLOT('setValue(int)') ) grid = TQt::GridLayout.new( self, 2, 2, 10 ) # 2x2, 10 pixel border diff --git a/qtsharp/src/bindings/static/QtSignal.cs b/qtsharp/src/bindings/static/QtSignal.cs index 6660de87..6a76ed09 100644 --- a/qtsharp/src/bindings/static/QtSignal.cs +++ b/qtsharp/src/bindings/static/QtSignal.cs @@ -162,120 +162,120 @@ namespace Qt { switch (slotobj.Args) { case "()": del = Delegate.CreateDelegate (typeof (del_void), receiver, slotobj.Name); - slotobj.WrapperPtr = csharp_connect_void (sender.RawObject, TQT_SIGNAL (signal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_void (sender.RawObject, TQ_SIGNAL (signal), receiver.RawObject, del); break; case "(bool)": del = Delegate.CreateDelegate (typeof (del_bool), receiver, slotobj.Name); - slotobj.WrapperPtr = csharp_connect_bool (sender.RawObject, TQT_SIGNAL (signal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_bool (sender.RawObject, TQ_SIGNAL (signal), receiver.RawObject, del); break; case "(short)": del = Delegate.CreateDelegate (typeof (del_short), receiver, slotobj.Name); - slotobj.WrapperPtr = csharp_connect_short (sender.RawObject, TQT_SIGNAL (signal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_short (sender.RawObject, TQ_SIGNAL (signal), receiver.RawObject, del); break; case "(int)": del = Delegate.CreateDelegate (typeof (del_int), receiver, slotobj.Name); - slotobj.WrapperPtr = csharp_connect_int (sender.RawObject, TQT_SIGNAL (signal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_int (sender.RawObject, TQ_SIGNAL (signal), receiver.RawObject, del); break; case "(long)": del = Delegate.CreateDelegate (typeof (del_long), receiver, slotobj.Name); - slotobj.WrapperPtr = csharp_connect_long (sender.RawObject, TQT_SIGNAL (signal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_long (sender.RawObject, TQ_SIGNAL (signal), receiver.RawObject, del); break; case "(float)": del = Delegate.CreateDelegate (typeof (del_float), receiver, slotobj.Name); - slotobj.WrapperPtr = csharp_connect_float (sender.RawObject, TQT_SIGNAL (signal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_float (sender.RawObject, TQ_SIGNAL (signal), receiver.RawObject, del); break; case "(double)": del = Delegate.CreateDelegate (typeof (del_double), receiver, slotobj.Name); - slotobj.WrapperPtr = csharp_connect_double (sender.RawObject, TQT_SIGNAL (signal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_double (sender.RawObject, TQ_SIGNAL (signal), receiver.RawObject, del); break; case "(TQString)": realsignal = sigobj.Name + "(const TQString&)"; Console.WriteLine("Connecting signal, sigobj.Name = {0}, realsignal = {1}", sigobj.Name, realsignal); del = Delegate.CreateDelegate (typeof (del_QString), slotobj, "SlotBridge_QString"); - slotobj.WrapperPtr = csharp_connect_QString (sender.RawObject, TQT_SIGNAL (realsignal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_QString (sender.RawObject, TQ_SIGNAL (realsignal), receiver.RawObject, del); break; case "(TQDockWindow)": realsignal = sigobj.Name + "(TQDockWindow*)"; del = Delegate.CreateDelegate (typeof (del_QDockWindow), slotobj, "SlotBridge_QDockWindow"); - slotobj.WrapperPtr = csharp_connect_QDockWindow (sender.RawObject, TQT_SIGNAL (realsignal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_QDockWindow (sender.RawObject, TQ_SIGNAL (realsignal), receiver.RawObject, del); break; case "(TQDropEvent)": realsignal = sigobj.Name + "(TQDropEvent*)"; del = Delegate.CreateDelegate (typeof (del_QDropEvent), slotobj, "SlotBridge_QDropEvent"); - slotobj.WrapperPtr = csharp_connect_QDropEvent (sender.RawObject, TQT_SIGNAL (realsignal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_QDropEvent (sender.RawObject, TQ_SIGNAL (realsignal), receiver.RawObject, del); break; case "(TQDropEvent,TQListViewItem)": realsignal = sigobj.Name + "(TQDropEvent*,TQListViewItem*)"; del = Delegate.CreateDelegate (typeof (del_QDropEventTQListViewItem), slotobj, "SlotBridge_QDropEventTQListViewItem"); - slotobj.WrapperPtr = csharp_connect_QDropEventTQListViewItem (sender.RawObject, TQT_SIGNAL (realsignal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_QDropEventTQListViewItem (sender.RawObject, TQ_SIGNAL (realsignal), receiver.RawObject, del); break; case "(TQIconViewItem)": realsignal = sigobj.Name + "(TQIconViewItem*)"; del = Delegate.CreateDelegate (typeof (del_QIconViewItem), slotobj, "SlotBridge_QIconViewItem"); - slotobj.WrapperPtr = csharp_connect_QIconViewItem (sender.RawObject, TQT_SIGNAL (realsignal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_QIconViewItem (sender.RawObject, TQ_SIGNAL (realsignal), receiver.RawObject, del); break; case "(TQListBoxItem)": realsignal = sigobj.Name + "(TQListBoxItem*)"; del = Delegate.CreateDelegate (typeof (del_QListBoxItem), slotobj, "SlotBridge_QListBoxItem"); - slotobj.WrapperPtr = csharp_connect_QListBoxItem (sender.RawObject, TQT_SIGNAL (realsignal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_QListBoxItem (sender.RawObject, TQ_SIGNAL (realsignal), receiver.RawObject, del); break; case "(TQListViewItem)": realsignal = sigobj.Name + "(TQListViewItem*)"; del = Delegate.CreateDelegate (typeof (del_QListViewItem), slotobj, "SlotBridge_QListViewItem"); - slotobj.WrapperPtr = csharp_connect_QListViewItem (sender.RawObject, TQT_SIGNAL (realsignal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_QListViewItem (sender.RawObject, TQ_SIGNAL (realsignal), receiver.RawObject, del); break; case "(TQListViewItem,TQListViewItem)": realsignal = sigobj.Name + "(TQListViewItem*,TQListViewItem*)"; del = Delegate.CreateDelegate (typeof (del_QListViewItemTQListViewItem), slotobj, "SlotBridge_QListViewItemTQListViewItem"); - slotobj.WrapperPtr = csharp_connect_QListViewItemTQListViewItem (sender.RawObject, TQT_SIGNAL (realsignal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_QListViewItemTQListViewItem (sender.RawObject, TQ_SIGNAL (realsignal), receiver.RawObject, del); break; case "(TQListViewItem,TQListViewItem,TQListViewItem)": realsignal = sigobj.Name + "(TQListViewItem*,TQListViewItem*,TQListViewItem*)"; del = Delegate.CreateDelegate (typeof (del_QListViewItemTQListViewItemTQListViewItem), slotobj, "SlotBridge_QListViewItemTQListViewItemTQListViewItem"); - slotobj.WrapperPtr = csharp_connect_QListViewItemTQListViewItemTQListViewItem (sender.RawObject, TQT_SIGNAL (realsignal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_QListViewItemTQListViewItemTQListViewItem (sender.RawObject, TQ_SIGNAL (realsignal), receiver.RawObject, del); break; case "(TQNetworkOperation)": realsignal = sigobj.Name + "(TQNetworkOperation*)"; del = Delegate.CreateDelegate (typeof (del_QNetworkOperation), slotobj, "SlotBridge_QNetworkOperation"); - slotobj.WrapperPtr = csharp_connect_QNetworkOperation (sender.RawObject, TQT_SIGNAL (realsignal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_QNetworkOperation (sender.RawObject, TQ_SIGNAL (realsignal), receiver.RawObject, del); break; case "(TQObject)": realsignal = sigobj.Name + "(TQObject*)"; del = Delegate.CreateDelegate (typeof (del_QObject), slotobj, "SlotBridge_QObject"); - slotobj.WrapperPtr = csharp_connect_QObject (sender.RawObject, TQT_SIGNAL (realsignal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_QObject (sender.RawObject, TQ_SIGNAL (realsignal), receiver.RawObject, del); break; case "(TQToolBar)": realsignal = sigobj.Name + "(TQToolBar*)"; del = Delegate.CreateDelegate (typeof (del_QToolBar), slotobj, "SlotBridge_QToolBar"); - slotobj.WrapperPtr = csharp_connect_QToolBar (sender.RawObject, TQT_SIGNAL (realsignal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_QToolBar (sender.RawObject, TQ_SIGNAL (realsignal), receiver.RawObject, del); break; case "(TQWidget)": realsignal = sigobj.Name + "(TQWidget*)"; del = Delegate.CreateDelegate (typeof (del_QWidget), slotobj, "SlotBridge_QWidget"); - slotobj.WrapperPtr = csharp_connect_QWidget (sender.RawObject, TQT_SIGNAL (realsignal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_QWidget (sender.RawObject, TQ_SIGNAL (realsignal), receiver.RawObject, del); break; case "(int,TQIconViewItem)": realsignal = sigobj.Name + "(int,TQIconViewItem*)"; del = Delegate.CreateDelegate (typeof (del_intTQIconViewItem), slotobj, "SlotBridge_intTQIconViewItem"); - slotobj.WrapperPtr = csharp_connect_intTQIconViewItem (sender.RawObject, TQT_SIGNAL (realsignal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_intTQIconViewItem (sender.RawObject, TQ_SIGNAL (realsignal), receiver.RawObject, del); break; case "(int,TQListBoxItem)": realsignal = sigobj.Name + "(int,TQListBoxItem*)"; del = Delegate.CreateDelegate (typeof (del_intTQListBoxItem), slotobj, "SlotBridge_intTQListBoxItem"); - slotobj.WrapperPtr = csharp_connect_intTQListBoxItem (sender.RawObject, TQT_SIGNAL (realsignal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_intTQListBoxItem (sender.RawObject, TQ_SIGNAL (realsignal), receiver.RawObject, del); break; case "(int,bool)": del = Delegate.CreateDelegate (typeof (del_intbool), receiver, slotobj.Name); - slotobj.WrapperPtr = csharp_connect_intbool (sender.RawObject, TQT_SIGNAL (signal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_intbool (sender.RawObject, TQ_SIGNAL (signal), receiver.RawObject, del); break; case "(int,int)": del = Delegate.CreateDelegate (typeof (del_intint), receiver, slotobj.Name); - slotobj.WrapperPtr = csharp_connect_intint (sender.RawObject, TQT_SIGNAL (signal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_intint (sender.RawObject, TQ_SIGNAL (signal), receiver.RawObject, del); break; case "(int,int,int)": del = Delegate.CreateDelegate (typeof (del_intintint), receiver, slotobj.Name); - slotobj.WrapperPtr = csharp_connect_intintint (sender.RawObject, TQT_SIGNAL (signal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_intintint (sender.RawObject, TQ_SIGNAL (signal), receiver.RawObject, del); break; default: throw new ArgumentException ("Unsupported method prototype for C++ signal -> C# slot connection: " + slotobj.Args); @@ -292,7 +292,7 @@ namespace Qt { // ...a C++ slot. C++ slots are C# methods, so we should never get here. else { throw new ArgumentException(receiver+" has no slot '"+slot+"'"); - // return qt_QObject_connect1(sender.RawObject, TQT_SIGNAL(signal), receiver.RawObject, TQT_SLOT(slot)); + // return qt_QObject_connect1(sender.RawObject, TQ_SIGNAL(signal), receiver.RawObject, TQ_SLOT(slot)); } } } @@ -330,11 +330,11 @@ namespace Qt { string mangle = MangleArgs(args); // HACK Wrap target signal in a slot and connect the slot to the sender. - return Connect(sender, TQT_SIGNAL(signal), targetobj, TQT_SLOT("Emit_"+mangle+args)); + return Connect(sender, TQ_SIGNAL(signal), targetobj, TQ_SLOT("Emit_"+mangle+args)); } // ...a C++ signal else - return qt_QObject_connect1(sender.RawObject, TQT_SIGNAL(signal), receiver.RawObject, TQT_SIGNAL(target)); + return qt_QObject_connect1(sender.RawObject, TQ_SIGNAL(signal), receiver.RawObject, TQ_SIGNAL(target)); } } @@ -410,7 +410,7 @@ namespace Qt { // ...a C++ slot. C++ slots are C# methods, so we should never get here. else { throw new ArgumentException(receiver+" has no slot '"+slot+"'"); - // return qt_QObject_disconnect2(sender.RawObject, TQT_SIGNAL(signal), receiver.RawObject, TQT_SLOT(slot)); + // return qt_QObject_disconnect2(sender.RawObject, TQ_SIGNAL(signal), receiver.RawObject, TQ_SLOT(slot)); } } } @@ -449,11 +449,11 @@ namespace Qt { if (receiver.CsSignalMap.Contains(target)) { QtSignal targetobj = receiver.CsSignalMap[target]; string args = "(" + target.Split(new char[] {'('})[1]; - return Disconnect(sender, TQT_SIGNAL(signal), targetobj, TQT_SLOT("emit_"+args)); + return Disconnect(sender, TQ_SIGNAL(signal), targetobj, TQ_SLOT("emit_"+args)); } // ...a C++ signal else { - return qt_QObject_disconnect2(sender.RawObject, TQT_SIGNAL(signal), receiver.RawObject, TQT_SLOT(target)); + return qt_QObject_disconnect2(sender.RawObject, TQ_SIGNAL(signal), receiver.RawObject, TQ_SLOT(target)); } } } @@ -474,7 +474,7 @@ namespace Qt { foreach (QtSignal signal in signals) foreach (QtSlot slot in new ArrayList (signal.Slots)) - Disconnect (sender, TQT_SIGNAL (signal.Signal), slot.Receiver, TQT_SLOT (slot.Slot)); + Disconnect (sender, TQ_SIGNAL (signal.Signal), slot.Receiver, TQ_SLOT (slot.Slot)); return true; } @@ -495,7 +495,7 @@ namespace Qt { foreach (QtSignal signal in signals) foreach (QtSlot slot in new ArrayList (signal.Slots)) - Disconnect (signal.Sender, TQT_SIGNAL (signal.Name), receiver, TQT_SLOT (slot.Name)); + Disconnect (signal.Sender, TQ_SIGNAL (signal.Name), receiver, TQ_SLOT (slot.Name)); return true; } @@ -509,7 +509,7 @@ namespace Qt { QtSignal sig = map[signal]; if (sig != null) { foreach (QtSlot slot in new ArrayList (sig.Slots)) - Disconnect (sender, TQT_SIGNAL(signal), slot.Receiver, TQT_SLOT(slot.Slot)); + Disconnect (sender, TQ_SIGNAL(signal), slot.Receiver, TQ_SLOT(slot.Slot)); } } @@ -527,7 +527,7 @@ namespace Qt { if (sig != null) { foreach (QtSlot slot in new ArrayList (sig.Slots)) if (slot.Receiver == receiver) - Disconnect (sender, signal, receiver, TQT_SLOT (slot.Name)); + Disconnect (sender, signal, receiver, TQ_SLOT (slot.Name)); } } diff --git a/qtsharp/src/bindings/static/QtSupport.cs b/qtsharp/src/bindings/static/QtSupport.cs index 155bdd62..d7cddad0 100644 --- a/qtsharp/src/bindings/static/QtSupport.cs +++ b/qtsharp/src/bindings/static/QtSupport.cs @@ -165,7 +165,7 @@ namespace Qt { Console.WriteLine (format, arg); } - public static string TQT_SIGNAL (string signal) + public static string TQ_SIGNAL (string signal) { return "2"+ Regex.Replace (signal, @"\s*\(\s*\)", "()"); @@ -173,7 +173,7 @@ namespace Qt { } - public static string TQT_SLOT (string slot) + public static string TQ_SLOT (string slot) { return "1" + Regex.Replace (slot, @"\s*\(\s*\)", "()"); diff --git a/qtsharp/src/bindings/static/TQToolButton.cs b/qtsharp/src/bindings/static/TQToolButton.cs index 855a9202..54a3410a 100644 --- a/qtsharp/src/bindings/static/TQToolButton.cs +++ b/qtsharp/src/bindings/static/TQToolButton.cs @@ -38,7 +38,7 @@ namespace Qt { qparent.AddChild (this); RegisterObject (this); - Connect (this, TQT_SIGNAL ("destroyed ()"), TQT_SLOT ("NativeDestroyed ()")); + Connect (this, TQ_SIGNAL ("destroyed ()"), TQ_SLOT ("NativeDestroyed ()")); } [DllImport("libtqtc", CharSet=CharSet.Ansi)] @@ -46,14 +46,14 @@ namespace Qt { public TQToolButton (TQIconSet iconSet, TQString textLabel, TQString groupText, TQObject receiver, string slot, TQToolBar parent, string name) : this (TQNull.Instance) { rawObject = qt_new_QToolButton1 (iconSet.RawObject, textLabel.RawObject, groupText.RawObject, IntPtr.Zero, null, parent != null ? parent.RawObject : IntPtr.Zero, name); - Connect( this, TQT_SIGNAL("clicked()"), receiver, slot ); + Connect( this, TQ_SIGNAL("clicked()"), receiver, slot ); if ((qparent = parent) != null) qparent.AddChild (this); RegisterObject (this); - Connect (this, TQT_SIGNAL ("destroyed ()"), TQT_SLOT ("NativeDestroyed ()")); + Connect (this, TQ_SIGNAL ("destroyed ()"), TQ_SLOT ("NativeDestroyed ()")); } [DllImport("libtqtc", CharSet=CharSet.Ansi)] @@ -66,7 +66,7 @@ namespace Qt { qparent.AddChild (this); RegisterObject (this); - Connect (this, TQT_SIGNAL ("destroyed ()"), TQT_SLOT ("NativeDestroyed ()")); + Connect (this, TQ_SIGNAL ("destroyed ()"), TQ_SLOT ("NativeDestroyed ()")); } public TQToolButton (TQWidget parent) : this (parent, "") {} diff --git a/qtsharp/src/examples/samples/display.cs b/qtsharp/src/examples/samples/display.cs index daf8daa0..8d94b5f8 100644 --- a/qtsharp/src/examples/samples/display.cs +++ b/qtsharp/src/examples/samples/display.cs @@ -26,10 +26,10 @@ namespace QtSamples { public Display () { filemenu = new TQPopupMenu (null, "filemenu"); - filemenu.InsertItem ("&Quit", tqApp, TQT_SLOT ("quit()")); + filemenu.InsertItem ("&Quit", tqApp, TQ_SLOT ("quit()")); aboutmenu = new TQPopupMenu(null, "aboutmenu"); - aboutmenu.InsertItem("&About Qt-Sharp", this, TQT_SLOT("slotAbout()")); + aboutmenu.InsertItem("&About Qt-Sharp", this, TQ_SLOT("slotAbout()")); menubar = new TQMenuBar(this, ""); menubar.InsertItem("&File", filemenu); diff --git a/qtsharp/src/examples/samples/emit.cs b/qtsharp/src/examples/samples/emit.cs index 125166a2..08a27555 100644 --- a/qtsharp/src/examples/samples/emit.cs +++ b/qtsharp/src/examples/samples/emit.cs @@ -13,8 +13,8 @@ namespace QtSamples { { TQPushButton pb = new TQPushButton ("Papa Smurf", this); - Connect (pb, TQT_SIGNAL ("clicked ()"), TQT_SLOT ("DoEmit ()")); - Connect (this, TQT_SIGNAL ("MySignal ()"), TQT_SLOT ("PrintStuff ()")); + Connect (pb, TQ_SIGNAL ("clicked ()"), TQ_SLOT ("DoEmit ()")); + Connect (this, TQ_SIGNAL ("MySignal ()"), TQ_SLOT ("PrintStuff ()")); } public void DoEmit () diff --git a/qtsharp/src/examples/samples/hello.cs b/qtsharp/src/examples/samples/hello.cs index 1039aa34..524c4d4c 100644 --- a/qtsharp/src/examples/samples/hello.cs +++ b/qtsharp/src/examples/samples/hello.cs @@ -25,7 +25,7 @@ namespace QtSamples { public HelloWorld () : base (null) { TQPushButton pb = new TQPushButton ("Hello Qt-Sharp-0.7!", this); - TQObject.Connect (pb, TQT_SIGNAL ("clicked()"), this, TQT_SLOT("SlotClicked()")); + TQObject.Connect (pb, TQ_SIGNAL ("clicked()"), this, TQ_SLOT("SlotClicked()")); } public void SlotClicked () diff --git a/qtsharp/src/examples/samples/mandelbrot.cs b/qtsharp/src/examples/samples/mandelbrot.cs index 3850b781..77acb98d 100644 --- a/qtsharp/src/examples/samples/mandelbrot.cs +++ b/qtsharp/src/examples/samples/mandelbrot.cs @@ -213,7 +213,7 @@ public class ImageDialog : TQDialog { pixmapLabel.SetScaledContents (true); dialogLayout.AddWidget (pixmapLabel); - TQObject.Connect (redrawButton, TQT_SIGNAL ("clicked()"), this, TQT_SLOT ("Redraw()")); + TQObject.Connect (redrawButton, TQ_SIGNAL ("clicked()"), this, TQ_SLOT ("Redraw()")); Redraw (); } diff --git a/qtsharp/src/examples/samples/mandelbrot2.cs b/qtsharp/src/examples/samples/mandelbrot2.cs index 175ef9bc..08f7bc56 100644 --- a/qtsharp/src/examples/samples/mandelbrot2.cs +++ b/qtsharp/src/examples/samples/mandelbrot2.cs @@ -272,7 +272,7 @@ public class ImageDialog : TQDialog { //pixmapLabel.SetPixmap( new TQPixmap( image ) ); - TQObject.Connect (redrawButton, TQT_SIGNAL ("clicked()"), pixmapLabel, TQT_SLOT ("Repaint()")); + TQObject.Connect (redrawButton, TQ_SIGNAL ("clicked()"), pixmapLabel, TQ_SLOT ("Repaint()")); //Redraw (); } diff --git a/qtsharp/src/examples/samples/qstring-slot.cs b/qtsharp/src/examples/samples/qstring-slot.cs index c0559f5b..be807ea0 100644 --- a/qtsharp/src/examples/samples/qstring-slot.cs +++ b/qtsharp/src/examples/samples/qstring-slot.cs @@ -15,7 +15,7 @@ public class MyWidget : TQVBox label = new TQLabel( this, "label" ); label.SetText("Default"); - TQObject.Connect( lineEdit, TQT_SIGNAL("textChanged(TQString)"), + TQObject.Connect( lineEdit, TQ_SIGNAL("textChanged(TQString)"), label, "SetText(TQString)" ); } diff --git a/qtsharp/src/examples/samples/quantumfractals.cs b/qtsharp/src/examples/samples/quantumfractals.cs index 3020eae6..a213f948 100644 --- a/qtsharp/src/examples/samples/quantumfractals.cs +++ b/qtsharp/src/examples/samples/quantumfractals.cs @@ -37,9 +37,9 @@ namespace Qf { //Setup the filemenu filemenu = new TQPopupMenu (null, "filemenu"); - filemenu.InsertItem ("&Screenshot", display, TQT_SLOT ("SlotScreenshot()")); + filemenu.InsertItem ("&Screenshot", display, TQ_SLOT ("SlotScreenshot()")); filemenu.InsertSeparator (); - filemenu.InsertItem ("&Quit", tqApp, TQT_SLOT ("quit()")); + filemenu.InsertItem ("&Quit", tqApp, TQ_SLOT ("quit()")); //Setup the shapemenu shapemenu = new TQPopupMenu (null, "typemenu"); @@ -52,12 +52,12 @@ namespace Qf { shapemenu.InsertItem( "&Icosidodecahedron", 6); //Connect the shapemenu - TQObject.Connect (shapemenu, TQT_SIGNAL ("activated(int)"), - display, TQT_SLOT("SlotShapeMenu(int)")); + TQObject.Connect (shapemenu, TQ_SIGNAL ("activated(int)"), + display, TQ_SLOT("SlotShapeMenu(int)")); //Setup the settingsmenu settingsmenu = new TQPopupMenu (null, "settingsmenu"); - settingsmenu.InsertItem ("&Alpha", display, TQT_SLOT ("SlotSetAlpha()")); + settingsmenu.InsertItem ("&Alpha", display, TQ_SLOT ("SlotSetAlpha()")); //Setup the menubar menubar = new TQMenuBar (this, ""); @@ -144,20 +144,20 @@ namespace Qf { buttons.AddWidget (intense); //Connect the buttons and SlotQuit - TQObject.Connect (start, TQT_SIGNAL ("clicked()"), - this, TQT_SLOT ("SlotStart()")); - TQObject.Connect (stop, TQT_SIGNAL ("clicked()"), - this, TQT_SLOT ("SlotStop()")); - TQObject.Connect (reset, TQT_SIGNAL ("clicked()"), - this, TQT_SLOT ("SlotReset()")); - TQObject.Connect (gray, TQT_SIGNAL ("clicked()"), - this, TQT_SLOT ("SlotGray()")); - TQObject.Connect (intense, TQT_SIGNAL ("clicked()"), - this, TQT_SLOT ("SlotIntense()")); - TQObject.Connect (buffer, TQT_SIGNAL ("Painted()"), - this, TQT_SLOT ("SlotSetLabels()")); - TQObject.Connect (tqApp, TQT_SIGNAL ("lastWindowClosed ()"), - this, TQT_SLOT ("SlotQuit ()")); + TQObject.Connect (start, TQ_SIGNAL ("clicked()"), + this, TQ_SLOT ("SlotStart()")); + TQObject.Connect (stop, TQ_SIGNAL ("clicked()"), + this, TQ_SLOT ("SlotStop()")); + TQObject.Connect (reset, TQ_SIGNAL ("clicked()"), + this, TQ_SLOT ("SlotReset()")); + TQObject.Connect (gray, TQ_SIGNAL ("clicked()"), + this, TQ_SLOT ("SlotGray()")); + TQObject.Connect (intense, TQ_SIGNAL ("clicked()"), + this, TQ_SLOT ("SlotIntense()")); + TQObject.Connect (buffer, TQ_SIGNAL ("Painted()"), + this, TQ_SLOT ("SlotSetLabels()")); + TQObject.Connect (tqApp, TQ_SIGNAL ("lastWindowClosed ()"), + this, TQ_SLOT ("SlotQuit ()")); //Layout labels labels = new TQVBoxLayout (layout); diff --git a/qtsharp/src/examples/samples/scribblewindow.cs b/qtsharp/src/examples/samples/scribblewindow.cs index 405b0e31..e078387c 100644 --- a/qtsharp/src/examples/samples/scribblewindow.cs +++ b/qtsharp/src/examples/samples/scribblewindow.cs @@ -36,18 +36,18 @@ namespace QtSamples { ScribbleWindow () : base (null, null) { filemenu = new TQPopupMenu (null, "filemenu"); - filemenu.InsertItem ("&Load", this, TQT_SLOT ("SlotLoad()") ); - filemenu.InsertItem ("&Save", this, TQT_SLOT ("SlotSave()") ); + filemenu.InsertItem ("&Load", this, TQ_SLOT ("SlotLoad()") ); + filemenu.InsertItem ("&Save", this, TQ_SLOT ("SlotSave()") ); filemenu.InsertSeparator (); - filemenu.InsertItem ("&Quit", tqApp, TQT_SLOT ("quit()")); + filemenu.InsertItem ("&Quit", tqApp, TQ_SLOT ("quit()")); aboutmenu = new TQPopupMenu (null, "helpmenu"); - aboutmenu.InsertItem ("&About Qt-Sharp", this, TQT_SLOT ("SlotAboutQtSharp()")); - aboutmenu.InsertItem ("&About Qt", this, TQT_SLOT ("SlotAboutQt()")); + aboutmenu.InsertItem ("&About Qt-Sharp", this, TQ_SLOT ("SlotAboutQtSharp()")); + aboutmenu.InsertItem ("&About Qt", this, TQ_SLOT ("SlotAboutQt()")); menubar = new TQMenuBar (this, ""); menubar.InsertItem ("&File", filemenu); - menubar.InsertItem ("&Color", this, TQT_SLOT("SlotColorChooser()")); + menubar.InsertItem ("&Color", this, TQ_SLOT("SlotColorChooser()")); menubar.InsertItem ("&About", aboutmenu); scrollview = new TQScrollView (this); @@ -58,12 +58,12 @@ namespace QtSamples { this.SetCentralWidget (scrollview); SetMaximumSize (Width (), Height () - menubar.Height ()); - TQObject.Connect (this, TQT_SIGNAL ("colorChanged(TQColor)"), - scribblearea, TQT_SLOT ("SlotSetColor(TQColor)") ); - TQObject.Connect (this, TQT_SIGNAL ("load(TQString)"), - scribblearea, TQT_SLOT ("PerformLoad(TQString)") ); - TQObject.Connect (this, TQT_SIGNAL ("save(TQString)"), - scribblearea, TQT_SLOT ("PerformSave(TQString)") ); + TQObject.Connect (this, TQ_SIGNAL ("colorChanged(TQColor)"), + scribblearea, TQ_SLOT ("SlotSetColor(TQColor)") ); + TQObject.Connect (this, TQ_SIGNAL ("load(TQString)"), + scribblearea, TQ_SLOT ("PerformLoad(TQString)") ); + TQObject.Connect (this, TQ_SIGNAL ("save(TQString)"), + scribblearea, TQ_SLOT ("PerformSave(TQString)") ); } public void SlotLoad () @@ -123,7 +123,7 @@ namespace QtSamples { SetBackgroundMode (Qt.BackgroundMode.NoBackground); popupmenu = new TQPopupMenu(); - popupmenu.InsertItem ("&Clear", this, TQT_SLOT ("SlotClearArea()") ); + popupmenu.InsertItem ("&Clear", this, TQ_SLOT ("SlotClearArea()") ); mouseMoveEvent += new MouseMoveEvent (MouseMoved); mousePressEvent += new MousePressEvent (MousePressed); diff --git a/qtsharp/src/examples/tutorials/t2.cs b/qtsharp/src/examples/tutorials/t2.cs index 5dbe07d1..3692e8f4 100644 --- a/qtsharp/src/examples/tutorials/t2.cs +++ b/qtsharp/src/examples/tutorials/t2.cs @@ -18,8 +18,8 @@ public class Example { quit.SetFont (new TQFont ("Times", 18, TQFont.Weight.Bold)); // In C++, TQFont::Bold is sufficient - TQObject.Connect ( quit, QtSupport.TQT_SIGNAL ("clicked()"), a, QtSupport.TQT_SLOT ("Quit()") ); - // TQT_SIGNAL and TQT_SLOT are static functions of QtSupport + TQObject.Connect ( quit, QtSupport.TQ_SIGNAL ("clicked()"), a, QtSupport.TQ_SLOT ("Quit()") ); + // TQ_SIGNAL and TQ_SLOT are static functions of QtSupport a.SetMainWidget (quit); quit.Show (); diff --git a/qtsharp/src/examples/tutorials/t3.cs b/qtsharp/src/examples/tutorials/t3.cs index 26fece72..90e9b803 100644 --- a/qtsharp/src/examples/tutorials/t3.cs +++ b/qtsharp/src/examples/tutorials/t3.cs @@ -19,8 +19,8 @@ public class Example { quit.SetFont (new TQFont ("Times", 18, TQFont.Weight.Bold)); // In C++, TQFont::Bold is sufficient - TQObject.Connect ( quit, QtSupport.TQT_SIGNAL ("clicked()"), a, QtSupport.TQT_SLOT ("Quit()") ); - // TQT_SIGNAL and TQT_SLOT are static functions of QtSupport + TQObject.Connect ( quit, QtSupport.TQ_SIGNAL ("clicked()"), a, QtSupport.TQ_SLOT ("Quit()") ); + // TQ_SIGNAL and TQ_SLOT are static functions of QtSupport a.SetMainWidget (box); box.Show (); diff --git a/qtsharp/src/examples/tutorials/t4.cs b/qtsharp/src/examples/tutorials/t4.cs index b3e66a07..1e182bb2 100644 --- a/qtsharp/src/examples/tutorials/t4.cs +++ b/qtsharp/src/examples/tutorials/t4.cs @@ -17,7 +17,7 @@ public class MyWidget : TQWidget { quit.SetGeometry (62, 40, 75, 30); quit.SetFont (new TQFont ("Times", 18, TQFont.Weight.Bold) ); - Connect ( quit, TQT_SIGNAL ("clicked()"), tqApp, TQT_SLOT ("Quit()") ); + Connect ( quit, TQ_SIGNAL ("clicked()"), tqApp, TQ_SLOT ("Quit()") ); // In C++, tqApp is a global variable. Here it's a property of the TQObject // class, which we inherit, giving the same effect. We also inherit the // static method connect(). diff --git a/qtsharp/src/examples/tutorials/t5.cs b/qtsharp/src/examples/tutorials/t5.cs index 05ff5e96..4500af56 100644 --- a/qtsharp/src/examples/tutorials/t5.cs +++ b/qtsharp/src/examples/tutorials/t5.cs @@ -13,7 +13,7 @@ public class MyWidget : TQVBox { TQPushButton quit = new TQPushButton ("Quit", this, "quit"); quit.SetFont ( new TQFont ("Times", 18, TQFont.Weight.Bold) ); - TQObject.Connect ( quit, TQT_SIGNAL ("clicked()"), tqApp, TQT_SLOT ("Quit()") ); + TQObject.Connect ( quit, TQ_SIGNAL ("clicked()"), tqApp, TQ_SLOT ("Quit()") ); TQLCDNumber lcd = new TQLCDNumber (2, this, "lcd" ); @@ -22,7 +22,7 @@ public class MyWidget : TQVBox { slider.SetRange (0, 99); slider.SetValue (0); - Connect ( slider, TQT_SIGNAL ("valueChanged(int)"), lcd, TQT_SLOT ("Display(int)") ); + Connect ( slider, TQ_SIGNAL ("valueChanged(int)"), lcd, TQ_SLOT ("Display(int)") ); } public MyWidget (TQWidget parent) : this (parent, "") {} diff --git a/qtsharp/src/examples/tutorials/t6.cs b/qtsharp/src/examples/tutorials/t6.cs index 910d13d1..90d94b5b 100644 --- a/qtsharp/src/examples/tutorials/t6.cs +++ b/qtsharp/src/examples/tutorials/t6.cs @@ -15,7 +15,7 @@ public class LCDRange : TQVBox { slider.SetRange (0, 99); slider.SetValue (0); - Connect ( slider, TQT_SIGNAL ("valueChanged(int)"), lcd, TQT_SLOT ("Display(int)") ); + Connect ( slider, TQ_SIGNAL ("valueChanged(int)"), lcd, TQ_SLOT ("Display(int)") ); } public LCDRange (TQWidget parent) : this (parent, "") {} @@ -31,7 +31,7 @@ public class MyWidget : TQVBox { TQPushButton quit = new TQPushButton ("Quit", this, "quit"); quit.SetFont ( new TQFont ("Times", 18, TQFont.Weight.Bold) ); - Connect ( quit, TQT_SIGNAL ("clicked()"), tqApp, TQT_SLOT ("Quit()") ); + Connect ( quit, TQ_SIGNAL ("clicked()"), tqApp, TQ_SLOT ("Quit()") ); TQGrid grid = new TQGrid (4, this); diff --git a/qtsharp/src/examples/tutorials/t7.cs b/qtsharp/src/examples/tutorials/t7.cs index 1372bf15..ecc9b244 100644 --- a/qtsharp/src/examples/tutorials/t7.cs +++ b/qtsharp/src/examples/tutorials/t7.cs @@ -21,8 +21,8 @@ public class LCDRange : TQVBox { slider.SetRange (0, 99); slider.SetValue (0); - Connect ( slider, TQT_SIGNAL ("valueChanged(int)"), lcd, TQT_SLOT ("Display(int)") ); - Connect ( slider, TQT_SIGNAL ("valueChanged(int)"), TQT_SIGNAL ("valueChanged(int)")); + Connect ( slider, TQ_SIGNAL ("valueChanged(int)"), lcd, TQ_SLOT ("Display(int)") ); + Connect ( slider, TQ_SIGNAL ("valueChanged(int)"), TQ_SIGNAL ("valueChanged(int)")); } public LCDRange (TQWidget parent) : this (parent, "") {} @@ -43,7 +43,7 @@ public class MyWidget : TQVBox { TQPushButton quit = new TQPushButton ("Quit", this, "quit"); quit.SetFont ( new TQFont ("Times", 18, TQFont.Weight.Bold) ); - Connect ( quit, TQT_SIGNAL ("clicked()"), tqApp, TQT_SLOT ("Quit()") ); + Connect ( quit, TQ_SIGNAL ("clicked()"), tqApp, TQ_SLOT ("Quit()") ); TQGrid grid = new TQGrid (4, this); @@ -53,8 +53,8 @@ public class MyWidget : TQVBox { for ( int r = 0; r < 4; r++ ) { LCDRange lr = new LCDRange (grid); if (previous != null) - Connect (lr, TQT_SIGNAL ("valueChanged(int)"), - previous, TQT_SLOT ("SetValue(int)") ); + Connect (lr, TQ_SIGNAL ("valueChanged(int)"), + previous, TQ_SLOT ("SetValue(int)") ); previous = lr; } } diff --git a/qtsharp/src/generator/Printer.cs b/qtsharp/src/generator/Printer.cs index 1289f107..3b852e72 100644 --- a/qtsharp/src/generator/Printer.cs +++ b/qtsharp/src/generator/Printer.cs @@ -518,7 +518,7 @@ namespace QtCSharp { public string DefaultConnections () { if (qtype.IsTQObject) - return "\n\t\t\tConnect (this, TQT_SIGNAL (\"destroyed ()\"), TQT_SLOT (\"NativeDestroyed ()\"));"; + return "\n\t\t\tConnect (this, TQ_SIGNAL (\"destroyed ()\"), TQ_SLOT (\"NativeDestroyed ()\"));"; else return ""; } diff --git a/qtsharp/src/libtqtsharp/qtsharp.cpp b/qtsharp/src/libtqtsharp/qtsharp.cpp index 7f433d76..bf3dc28f 100644 --- a/qtsharp/src/libtqtsharp/qtsharp.cpp +++ b/qtsharp/src/libtqtsharp/qtsharp.cpp @@ -22,7 +22,7 @@ void qtsharp_QObject_registerEventDelegate (qtsharp_EventDelegate delegate) TQObject *csharp_connect_void (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(void)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (void)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (void)))) { delete cs; cs = 0L; } @@ -32,7 +32,7 @@ TQObject *csharp_connect_void (TQObject *sender, const char *signal, TQObject *r TQObject *csharp_connect_item_void (TQMenuData *instance, int id, TQObject *receiver, void (*ptr)(void)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! instance->connectItem (id, cs, TQT_SLOT (callback (void)))) { + if (! instance->connectItem (id, cs, TQ_SLOT (callback (void)))) { delete cs; cs = 0L; } @@ -42,7 +42,7 @@ TQObject *csharp_connect_item_void (TQMenuData *instance, int id, TQObject *rece TQObject *csharp_connect_bool (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(bool)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (bool)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (bool)))) { delete cs; cs = 0L; } @@ -52,7 +52,7 @@ TQObject *csharp_connect_bool (TQObject *sender, const char *signal, TQObject *r TQObject *csharp_connect_short (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(short)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (short)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (short)))) { delete cs; cs = 0L; } @@ -62,7 +62,7 @@ TQObject *csharp_connect_short (TQObject *sender, const char *signal, TQObject * TQObject *csharp_connect_int (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(int)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (int)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (int)))) { delete cs; cs = 0L; } @@ -72,7 +72,7 @@ TQObject *csharp_connect_int (TQObject *sender, const char *signal, TQObject *re TQObject *csharp_connect_item_int (TQMenuData *instance, int id, TQObject *receiver, void (*ptr)(int)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! instance->connectItem (id, cs, TQT_SLOT (callback (int)))) { + if (! instance->connectItem (id, cs, TQ_SLOT (callback (int)))) { delete cs; cs = 0L; } @@ -82,7 +82,7 @@ TQObject *csharp_connect_item_int (TQMenuData *instance, int id, TQObject *recei TQObject *csharp_connect_long (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(long)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (long)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (long)))) { delete cs; cs = 0L; } @@ -92,7 +92,7 @@ TQObject *csharp_connect_long (TQObject *sender, const char *signal, TQObject *r TQObject *csharp_connect_float (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(float)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (float)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (float)))) { delete cs; cs = 0L; } @@ -102,7 +102,7 @@ TQObject *csharp_connect_float (TQObject *sender, const char *signal, TQObject * TQObject *csharp_connect_double (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(double)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (double)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (double)))) { delete cs; cs = 0L; } @@ -112,7 +112,7 @@ TQObject *csharp_connect_double (TQObject *sender, const char *signal, TQObject TQObject *csharp_connect_QString (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(const TQString&)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (const TQString&)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (const TQString&)))) { delete cs; cs = 0L; } @@ -122,7 +122,7 @@ TQObject *csharp_connect_QString (TQObject *sender, const char *signal, TQObject TQObject *csharp_connect_QDockWindow (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(TQDockWindow*)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (TQDockWindow*)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (TQDockWindow*)))) { delete cs; cs = 0L; } @@ -132,7 +132,7 @@ TQObject *csharp_connect_QDockWindow (TQObject *sender, const char *signal, TQOb TQObject *csharp_connect_QDropEvent (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(TQDropEvent*)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (TQDropEvent*)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (TQDropEvent*)))) { delete cs; cs = 0L; } @@ -142,7 +142,7 @@ TQObject *csharp_connect_QDropEvent (TQObject *sender, const char *signal, TQObj TQObject *csharp_connect_QDropEventTQListViewItem (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(TQDropEvent*,TQListViewItem*)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (TQDropEvent*,TQListViewItem*)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (TQDropEvent*,TQListViewItem*)))) { delete cs; cs = 0L; } @@ -152,7 +152,7 @@ TQObject *csharp_connect_QDropEventTQListViewItem (TQObject *sender, const char TQObject *csharp_connect_QIconViewItem (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(TQIconViewItem*)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (TQIconViewItem*)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (TQIconViewItem*)))) { delete cs; cs = 0L; } @@ -162,7 +162,7 @@ TQObject *csharp_connect_QIconViewItem (TQObject *sender, const char *signal, TQ TQObject *csharp_connect_QListBoxItem (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(TQListBoxItem*)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (TQListBoxItem*)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (TQListBoxItem*)))) { delete cs; cs = 0L; } @@ -172,7 +172,7 @@ TQObject *csharp_connect_QListBoxItem (TQObject *sender, const char *signal, TQO TQObject *csharp_connect_QListViewItem (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(TQListViewItem*)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (TQListViewItem*)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (TQListViewItem*)))) { delete cs; cs = 0L; } @@ -182,7 +182,7 @@ TQObject *csharp_connect_QListViewItem (TQObject *sender, const char *signal, TQ TQObject *csharp_connect_QListViewItemTQListViewItem (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(TQListViewItem*,TQListViewItem*)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (TQListViewItem*,TQListViewItem*)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (TQListViewItem*,TQListViewItem*)))) { delete cs; cs = 0L; } @@ -192,7 +192,7 @@ TQObject *csharp_connect_QListViewItemTQListViewItem (TQObject *sender, const ch TQObject *csharp_connect_QListViewItemTQListViewItemTQListViewItem (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(TQListViewItem*,TQListViewItem*,TQListViewItem*)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (TQListViewItem*,TQListViewItem*,TQListViewItem*)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (TQListViewItem*,TQListViewItem*,TQListViewItem*)))) { delete cs; cs = 0L; } @@ -202,7 +202,7 @@ TQObject *csharp_connect_QListViewItemTQListViewItemTQListViewItem (TQObject *se TQObject *csharp_connect_QNetworkOperation (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(TQNetworkOperation*)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (TQNetworkOperation*)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (TQNetworkOperation*)))) { delete cs; cs = 0L; } @@ -212,7 +212,7 @@ TQObject *csharp_connect_QNetworkOperation (TQObject *sender, const char *signal TQObject *csharp_connect_QObject (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(TQObject*)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (TQObject*)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (TQObject*)))) { delete cs; cs = 0L; } @@ -222,7 +222,7 @@ TQObject *csharp_connect_QObject (TQObject *sender, const char *signal, TQObject TQObject *csharp_connect_QToolBar (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(TQToolBar*)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (TQToolBar*)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (TQToolBar*)))) { delete cs; cs = 0L; } @@ -232,7 +232,7 @@ TQObject *csharp_connect_QToolBar (TQObject *sender, const char *signal, TQObjec TQObject *csharp_connect_QWidget (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(TQWidget*)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (TQWidget*)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (TQWidget*)))) { delete cs; cs = 0L; } @@ -242,7 +242,7 @@ TQObject *csharp_connect_QWidget (TQObject *sender, const char *signal, TQObject TQObject *csharp_connect_intTQIconViewItem (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(int,TQIconViewItem*)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (int,TQIconViewItem*)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (int,TQIconViewItem*)))) { delete cs; cs = 0L; } @@ -252,7 +252,7 @@ TQObject *csharp_connect_intTQIconViewItem (TQObject *sender, const char *signal TQObject *csharp_connect_intTQListBoxItem (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(int,TQListBoxItem*)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (int,TQListBoxItem*)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (int,TQListBoxItem*)))) { delete cs; cs = 0L; } @@ -262,7 +262,7 @@ TQObject *csharp_connect_intTQListBoxItem (TQObject *sender, const char *signal, TQObject *csharp_connect_intbool (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(int,bool)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (int,bool)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (int,bool)))) { delete cs; cs = 0L; } @@ -272,7 +272,7 @@ TQObject *csharp_connect_intbool (TQObject *sender, const char *signal, TQObject TQObject *csharp_connect_intint (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(int,int)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (int,int)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (int,int)))) { delete cs; cs = 0L; } @@ -282,7 +282,7 @@ TQObject *csharp_connect_intint (TQObject *sender, const char *signal, TQObject TQObject *csharp_connect_intintint (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(int,int,int)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (int,int,int)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (int,int,int)))) { delete cs; cs = 0L; } diff --git a/qtsharp/src/tests/lookuptest.cs b/qtsharp/src/tests/lookuptest.cs index bfcae6c3..ce3ac8b9 100644 --- a/qtsharp/src/tests/lookuptest.cs +++ b/qtsharp/src/tests/lookuptest.cs @@ -28,7 +28,7 @@ namespace Qt { if (size.GetHashCode () != size2.GetHashCode ()) Console.WriteLine ("ERROR: Hash codes differ for size and size2!"); - Connect (button, TQT_SIGNAL ("clicked()"), TQObject.qApp, TQT_SLOT ("Quit()")); + Connect (button, TQ_SIGNAL ("clicked()"), TQObject.qApp, TQ_SLOT ("Quit()")); } public static void Main (string[] args) diff --git a/qtsharp/src/uicsharp/uicsharp.cs b/qtsharp/src/uicsharp/uicsharp.cs index b6306a1e..b0483258 100644 --- a/qtsharp/src/uicsharp/uicsharp.cs +++ b/qtsharp/src/uicsharp/uicsharp.cs @@ -334,7 +334,7 @@ namespace QtSharp { tmp=tmp.NextSibling as XmlElement; String slot=tmp.InnerText; - writer.WriteLine("\t\tTQObject.Connect({0},TQT_SIGNAL(\"{1}\"),{2},TQT_SLOT(\"{3}\"));", + writer.WriteLine("\t\tTQObject.Connect({0},TQ_SIGNAL(\"{1}\"),{2},TQ_SLOT(\"{3}\"));", sender,signal,receiver,slot); } break; 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/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/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 ); diff --git a/xparts/mozilla/kshell.cpp b/xparts/mozilla/kshell.cpp index 6417973e..152469f3 100644 --- a/xparts/mozilla/kshell.cpp +++ b/xparts/mozilla/kshell.cpp @@ -22,7 +22,7 @@ public: setCentralWidget( m_host->widget() ); - connect(m_host, TQT_SIGNAL( actionsInitialized() ), this, TQT_SLOT( mergeGUI() ) ); + connect(m_host, TQ_SIGNAL( actionsInitialized() ), this, TQ_SLOT( mergeGUI() ) ); #if 1 m_partProcess = new TDEProcess; @@ -31,10 +31,10 @@ public: m_partProcess->start(); #endif - KStdAction::quit( this, TQT_SLOT( close() ), actionCollection() ); + KStdAction::quit( this, TQ_SLOT( close() ), actionCollection() ); TDESelectAction *s = new TDESelectAction( "http://www.kde.org" , 0, actionCollection(), "location" ); - connect( s, TQT_SIGNAL(activated( const TQString& ) ), this, TQT_SLOT( slotOpenUrl( const TQString & ) ) ); + connect( s, TQ_SIGNAL(activated( const TQString& ) ), this, TQ_SLOT( slotOpenUrl( const TQString & ) ) ); s->setEditable(true); } virtual ~ShellWindow() diff --git a/xparts/src/tde/xparthost_kpart.cpp b/xparts/src/tde/xparthost_kpart.cpp index 54bcb804..84848017 100644 --- a/xparts/src/tde/xparthost_kpart.cpp +++ b/xparts/src/tde/xparthost_kpart.cpp @@ -77,9 +77,9 @@ void XPartHost_KPart::createActions( const TQCString &xmlActions ) TQString type = e.attribute("type"); if(type.isEmpty()) - new TDEAction( name, 0, this, TQT_SLOT( actionActivated() ), actionCollection(), name.latin1() ); + new TDEAction( name, 0, this, TQ_SLOT( actionActivated() ), actionCollection(), name.latin1() ); else if( type == "toggle" ) - new TDEToggleAction( name, 0, this, TQT_SLOT( actionActivated() ), actionCollection(), name.latin1() ); + new TDEToggleAction( name, 0, this, TQ_SLOT( actionActivated() ), actionCollection(), name.latin1() ); kdDebug() << "action=" << name << " type=" << type << endl; } else if ( e.tagName() == "XMLFile" ) { TQString location = e.attribute("location"); diff --git a/xparts/xpart_notepad/shell_xparthost.cpp b/xparts/xpart_notepad/shell_xparthost.cpp index 666c16a6..c6f35a87 100644 --- a/xparts/xpart_notepad/shell_xparthost.cpp +++ b/xparts/xpart_notepad/shell_xparthost.cpp @@ -19,7 +19,7 @@ ShellWindow::ShellWindow() setCentralWidget( m_host->widget() ); - connect(m_host, TQT_SIGNAL( actionsInitialized() ), this, TQT_SLOT( mergeGUI() ) ); + connect(m_host, TQ_SIGNAL( actionsInitialized() ), this, TQ_SLOT( mergeGUI() ) ); // Launch our XPart child. m_partProcess = new TDEProcess; @@ -28,11 +28,11 @@ ShellWindow::ShellWindow() m_partProcess->start(); // Init our Gui - (void) new TDEAction( "Hop", 0, this, TQT_SLOT(hop()), actionCollection(), "hop" ); - KStdAction::quit( this, TQT_SLOT( close() ), actionCollection() ); + (void) new TDEAction( "Hop", 0, this, TQ_SLOT(hop()), actionCollection(), "hop" ); + KStdAction::quit( this, TQ_SLOT( close() ), actionCollection() ); TDESelectAction *s = new TDESelectAction( "http://www.kde.org" , 0, actionCollection(), "location" ); - connect( s, TQT_SIGNAL(activated( const TQString& ) ), this, TQT_SLOT( slotOpenUrl( const TQString & ) ) ); + connect( s, TQ_SIGNAL(activated( const TQString& ) ), this, TQ_SLOT( slotOpenUrl( const TQString & ) ) ); s->setEditable(true); kdDebug() << "KShell window created" << endl; |