summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--qtjava/javalib/examples/application/ApplicationWindow.java6
-rw-r--r--qtjava/javalib/examples/helpviewer/HelpWindow.java6
-rw-r--r--qtjava/javalib/examples/mdi/ApplicationWindow.java6
-rw-r--r--qtjava/javalib/examples/menu/MenuExample.java6
-rw-r--r--qtjava/javalib/org/kde/qt/QApplication.java2
-rw-r--r--qtjava/javalib/org/kde/qt/QMessageBox.java4
-rw-r--r--qtjava/javalib/qtjava/QApplication.cpp4
-rw-r--r--qtjava/javalib/qtjava/QApplication.h2
-rw-r--r--qtjava/javalib/qtjava/QMessageBox.cpp8
-rw-r--r--qtjava/javalib/qtjava/QMessageBox.h4
-rw-r--r--qtjava/javalib/test/QTimerTest.java2
-rw-r--r--qtjava/javalib/test/ScribbleWindow.java2
-rw-r--r--qtruby/rubylib/examples/qt-examples/chart/chartform.rb2
-rw-r--r--qtruby/rubylib/examples/qtscribble/scribble.rb2
-rw-r--r--qtsharp/src/api/qt.xml2
15 files changed, 29 insertions, 29 deletions
diff --git a/qtjava/javalib/examples/application/ApplicationWindow.java b/qtjava/javalib/examples/application/ApplicationWindow.java
index 8e393df2..f214d240 100644
--- a/qtjava/javalib/examples/application/ApplicationWindow.java
+++ b/qtjava/javalib/examples/application/ApplicationWindow.java
@@ -159,7 +159,7 @@ public class ApplicationWindow extends TQMainWindow {
menuBar().insertSeparator();
menuBar().insertItem("&Help", help);
help.insertItem("&About", this, SLOT("about()"), new TQKeySequence(Key_F1), -1, -1);
- help.insertItem("About &Qt", this, SLOT("aboutQt()"));
+ help.insertItem("About &Qt", this, SLOT("aboutTQt()"));
help.insertSeparator();
help.insertItem("What's &This", this, SLOT("whatsThis()"), new TQKeySequence(SHIFT+Key_F1), -1, -1);
@@ -312,7 +312,7 @@ public class ApplicationWindow extends TQMainWindow {
}
- private void aboutQt() {
- TQMessageBox.aboutQt(this, "Qt Application Example");
+ private void aboutTQt() {
+ TQMessageBox.aboutTQt(this, "Qt Application Example");
}
}
diff --git a/qtjava/javalib/examples/helpviewer/HelpWindow.java b/qtjava/javalib/examples/helpviewer/HelpWindow.java
index 1da9c337..d220d35e 100644
--- a/qtjava/javalib/examples/helpviewer/HelpWindow.java
+++ b/qtjava/javalib/examples/helpviewer/HelpWindow.java
@@ -79,7 +79,7 @@ HelpWindow( String home_, String _path,
TQPopupMenu help = new TQPopupMenu( this );
help.insertItem( tr("&About ..."), this, SLOT(" about()") );
- help.insertItem( tr("About &Qt ..."), this, SLOT(" aboutQt()") );
+ help.insertItem( tr("About &Qt ..."), this, SLOT(" aboutTQt()") );
hist = new TQPopupMenu( this );
Iterator it = history.iterator();
@@ -232,9 +232,9 @@ void about()
}
-void aboutQt()
+void aboutTQt()
{
- TQMessageBox.aboutQt( this, "TQBrowser" );
+ TQMessageBox.aboutTQt( this, "TQBrowser" );
}
void openFile()
diff --git a/qtjava/javalib/examples/mdi/ApplicationWindow.java b/qtjava/javalib/examples/mdi/ApplicationWindow.java
index a2d3cbbc..624dfa4a 100644
--- a/qtjava/javalib/examples/mdi/ApplicationWindow.java
+++ b/qtjava/javalib/examples/mdi/ApplicationWindow.java
@@ -172,7 +172,7 @@ ApplicationWindow()
menuBar().insertItem( "&Help", help );
help.insertItem( "&About", this, SLOT("about()"), new TQKeySequence(Key_F1));
- help.insertItem( "About &Qt", this, SLOT("aboutQt()"));
+ help.insertItem( "About &Qt", this, SLOT("aboutTQt()"));
help.insertSeparator();
help.insertItem( "What's &This", this, SLOT("whatsThis()"), new TQKeySequence(SHIFT+Key_F1));
@@ -251,9 +251,9 @@ void about()
}
-void aboutQt()
+void aboutTQt()
{
- TQMessageBox.aboutQt( this, "Qt Application Example" );
+ TQMessageBox.aboutTQt( this, "Qt Application Example" );
}
diff --git a/qtjava/javalib/examples/menu/MenuExample.java b/qtjava/javalib/examples/menu/MenuExample.java
index 1c4e7231..c7b72ce7 100644
--- a/qtjava/javalib/examples/menu/MenuExample.java
+++ b/qtjava/javalib/examples/menu/MenuExample.java
@@ -182,7 +182,7 @@ 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("aboutQt()") );
+ help.insertItem( "About &Qt", this, SLOT("aboutTQt()") );
menu = new TQMenuBar( this );
menu.insertItem( "&File", file );
@@ -275,9 +275,9 @@ void about()
}
-void aboutQt()
+void aboutTQt()
{
- TQMessageBox.aboutQt( this, "Qt Menu Example" );
+ TQMessageBox.aboutTQt( this, "Qt Menu Example" );
}
diff --git a/qtjava/javalib/org/kde/qt/QApplication.java b/qtjava/javalib/org/kde/qt/QApplication.java
index 1a3e6736..171536ab 100644
--- a/qtjava/javalib/org/kde/qt/QApplication.java
+++ b/qtjava/javalib/org/kde/qt/QApplication.java
@@ -72,7 +72,7 @@ public class TQApplication extends TQObject {
public native void wakeUpGuiThread();
public native void quit();
public native void closeAllWindows();
- public native void aboutQt();
+ public native void aboutTQt();
public static native String tr(String arg1, String arg2);
public static native String tr(String arg1);
public static native TQStyle style();
diff --git a/qtjava/javalib/org/kde/qt/QMessageBox.java b/qtjava/javalib/org/kde/qt/QMessageBox.java
index 2b5131a0..8129e5fe 100644
--- a/qtjava/javalib/org/kde/qt/QMessageBox.java
+++ b/qtjava/javalib/org/kde/qt/QMessageBox.java
@@ -117,8 +117,8 @@ public class TQMessageBox extends TQDialog {
public static native int critical(TQWidget parent, String caption, String text, String button0Text);
public static native int critical(TQWidget parent, String caption, String text);
public static native void about(TQWidget parent, String caption, String text);
- public static native void aboutQt(TQWidget parent, String caption);
- public static native void aboutQt(TQWidget parent);
+ public static native void aboutTQt(TQWidget parent, String caption);
+ public static native void aboutTQt(TQWidget parent);
public static native int message(String caption, String text, String buttonText, TQWidget parent, String arg5);
public static native int message(String caption, String text, String buttonText, TQWidget parent);
public static native int message(String caption, String text, String buttonText);
diff --git a/qtjava/javalib/qtjava/QApplication.cpp b/qtjava/javalib/qtjava/QApplication.cpp
index ad40f816..8c374ebd 100644
--- a/qtjava/javalib/qtjava/QApplication.cpp
+++ b/qtjava/javalib/qtjava/QApplication.cpp
@@ -96,9 +96,9 @@ public:
};
JNIEXPORT void JNICALL
-Java_org_kde_qt_QApplication_aboutQt(JNIEnv* env, jobject obj)
+Java_org_kde_qt_QApplication_aboutTQt(JNIEnv* env, jobject obj)
{
- ((TQApplication*) QtSupport::getQt(env, obj))->aboutQt();
+ ((TQApplication*) QtSupport::getQt(env, obj))->aboutTQt();
return;
}
diff --git a/qtjava/javalib/qtjava/QApplication.h b/qtjava/javalib/qtjava/QApplication.h
index 094b9e3e..3b659e8f 100644
--- a/qtjava/javalib/qtjava/QApplication.h
+++ b/qtjava/javalib/qtjava/QApplication.h
@@ -47,7 +47,7 @@ extern JNIEXPORT void JNICALL Java_org_kde_qt_QApplication_saveState (JNIEnv *en
extern JNIEXPORT void JNICALL Java_org_kde_qt_QApplication_wakeUpGuiThread (JNIEnv *env, jobject);
extern JNIEXPORT void JNICALL Java_org_kde_qt_QApplication_quit (JNIEnv *env, jobject);
extern JNIEXPORT void JNICALL Java_org_kde_qt_QApplication_closeAllWindows (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_org_kde_qt_QApplication_aboutQt (JNIEnv *env, jobject);
+extern JNIEXPORT void JNICALL Java_org_kde_qt_QApplication_aboutTQt (JNIEnv *env, jobject);
extern JNIEXPORT jstring JNICALL Java_org_kde_qt_QApplication_tr__Ljava_lang_String_2Ljava_lang_String_2 (JNIEnv *env, jclass, jstring, jstring);
extern JNIEXPORT jstring JNICALL Java_org_kde_qt_QApplication_tr__Ljava_lang_String_2 (JNIEnv *env, jclass, jstring);
extern JNIEXPORT jobject JNICALL Java_org_kde_qt_QApplication_style (JNIEnv *env, jclass);
diff --git a/qtjava/javalib/qtjava/QMessageBox.cpp b/qtjava/javalib/qtjava/QMessageBox.cpp
index 8189d761..0316cc87 100644
--- a/qtjava/javalib/qtjava/QMessageBox.cpp
+++ b/qtjava/javalib/qtjava/QMessageBox.cpp
@@ -364,19 +364,19 @@ public:
};
JNIEXPORT void JNICALL
-Java_org_kde_qt_QMessageBox_aboutQt__Lorg_kde_qt_QWidget_2(JNIEnv* env, jclass cls, jobject parent)
+Java_org_kde_qt_QMessageBox_aboutTQt__Lorg_kde_qt_QWidget_2(JNIEnv* env, jclass cls, jobject parent)
{
(void) cls;
- TQMessageBoxJBridge::aboutQt((TQWidget*) QtSupport::getQt(env, parent));
+ TQMessageBoxJBridge::aboutTQt((TQWidget*) QtSupport::getQt(env, parent));
return;
}
JNIEXPORT void JNICALL
-Java_org_kde_qt_QMessageBox_aboutQt__Lorg_kde_qt_QWidget_2Ljava_lang_String_2(JNIEnv* env, jclass cls, jobject parent, jstring caption)
+Java_org_kde_qt_QMessageBox_aboutTQt__Lorg_kde_qt_QWidget_2Ljava_lang_String_2(JNIEnv* env, jclass cls, jobject parent, jstring caption)
{
(void) cls;
static TQString* _qstring_caption = 0;
- TQMessageBoxJBridge::aboutQt((TQWidget*) QtSupport::getQt(env, parent), (const TQString&)*(TQString*) QtSupport::toTQString(env, caption, &_qstring_caption));
+ TQMessageBoxJBridge::aboutTQt((TQWidget*) QtSupport::getQt(env, parent), (const TQString&)*(TQString*) QtSupport::toTQString(env, caption, &_qstring_caption));
return;
}
diff --git a/qtjava/javalib/qtjava/QMessageBox.h b/qtjava/javalib/qtjava/QMessageBox.h
index d81c03f5..b97e2ddc 100644
--- a/qtjava/javalib/qtjava/QMessageBox.h
+++ b/qtjava/javalib/qtjava/QMessageBox.h
@@ -69,8 +69,8 @@ extern JNIEXPORT jint JNICALL Java_org_kde_qt_QMessageBox_critical__Lorg_kde_qt_
extern JNIEXPORT jint JNICALL Java_org_kde_qt_QMessageBox_critical__Lorg_kde_qt_QWidget_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2 (JNIEnv *env, jclass, jobject, jstring, jstring, jstring);
extern JNIEXPORT jint JNICALL Java_org_kde_qt_QMessageBox_critical__Lorg_kde_qt_QWidget_2Ljava_lang_String_2Ljava_lang_String_2 (JNIEnv *env, jclass, jobject, jstring, jstring);
extern JNIEXPORT void JNICALL Java_org_kde_qt_QMessageBox_about (JNIEnv *env, jclass, jobject, jstring, jstring);
-extern JNIEXPORT void JNICALL Java_org_kde_qt_QMessageBox_aboutQt__Lorg_kde_qt_QWidget_2Ljava_lang_String_2 (JNIEnv *env, jclass, jobject, jstring);
-extern JNIEXPORT void JNICALL Java_org_kde_qt_QMessageBox_aboutQt__Lorg_kde_qt_QWidget_2 (JNIEnv *env, jclass, jobject);
+extern JNIEXPORT void JNICALL Java_org_kde_qt_QMessageBox_aboutTQt__Lorg_kde_qt_QWidget_2Ljava_lang_String_2 (JNIEnv *env, jclass, jobject, jstring);
+extern JNIEXPORT void JNICALL Java_org_kde_qt_QMessageBox_aboutTQt__Lorg_kde_qt_QWidget_2 (JNIEnv *env, jclass, jobject);
extern JNIEXPORT jint JNICALL Java_org_kde_qt_QMessageBox_message__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Lorg_kde_qt_QWidget_2Ljava_lang_String_2 (JNIEnv *env, jclass, jstring, jstring, jstring, jobject, jstring);
extern JNIEXPORT jint JNICALL Java_org_kde_qt_QMessageBox_message__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Lorg_kde_qt_QWidget_2 (JNIEnv *env, jclass, jstring, jstring, jstring, jobject);
extern JNIEXPORT jint JNICALL Java_org_kde_qt_QMessageBox_message__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2 (JNIEnv *env, jclass, jstring, jstring, jstring);
diff --git a/qtjava/javalib/test/QTimerTest.java b/qtjava/javalib/test/QTimerTest.java
index c364f68b..4baf19f9 100644
--- a/qtjava/javalib/test/QTimerTest.java
+++ b/qtjava/javalib/test/QTimerTest.java
@@ -230,7 +230,7 @@ public class TQTimerTest extends TQWidget {
public void slotAboutQt()
{
- TQMessageBox.aboutQt( this, "About Qt" );
+ TQMessageBox.aboutTQt( this, "About Qt" );
}
public void slotColorMenu( int item )
diff --git a/qtjava/javalib/test/ScribbleWindow.java b/qtjava/javalib/test/ScribbleWindow.java
index c8e98166..abad9d30 100644
--- a/qtjava/javalib/test/ScribbleWindow.java
+++ b/qtjava/javalib/test/ScribbleWindow.java
@@ -227,7 +227,7 @@ public class ScribbleWindow extends TQWidget {
private void slotAboutQt()
{
- TQMessageBox.aboutQt( this, "About Qt" );
+ TQMessageBox.aboutTQt( this, "About Qt" );
}
private void slotColorMenu( int item )
diff --git a/qtruby/rubylib/examples/qt-examples/chart/chartform.rb b/qtruby/rubylib/examples/qt-examples/chart/chartform.rb
index 45d8d1ed..0ebff47e 100644
--- a/qtruby/rubylib/examples/qt-examples/chart/chartform.rb
+++ b/qtruby/rubylib/examples/qt-examples/chart/chartform.rb
@@ -481,7 +481,7 @@ class ChartForm < TQt::MainWindow
def helpAboutQt()
- TQt::MessageBox.aboutQt( self, "Chart -- About Qt" )
+ TQt::MessageBox.aboutTQt( self, "Chart -- About Qt" )
end
end
diff --git a/qtruby/rubylib/examples/qtscribble/scribble.rb b/qtruby/rubylib/examples/qtscribble/scribble.rb
index 2d931088..1614b14c 100644
--- a/qtruby/rubylib/examples/qtscribble/scribble.rb
+++ b/qtruby/rubylib/examples/qtscribble/scribble.rb
@@ -215,7 +215,7 @@ class ScribbleWindow < TQt::Widget
end
def slotAboutQt()
- TQt::MessageBox.aboutQt( self, "About Qt" )
+ TQt::MessageBox.aboutTQt( self, "About Qt" )
end
def slotColorMenu( item )
diff --git a/qtsharp/src/api/qt.xml b/qtsharp/src/api/qt.xml
index 12db6433..e779d99e 100644
--- a/qtsharp/src/api/qt.xml
+++ b/qtsharp/src/api/qt.xml
@@ -11130,7 +11130,7 @@ id="0"/>
<qparam type="TQStringamp" name="caption"/>
<qparam type="TQStringamp" name="text"/>
</qmethod>
- <qmethod name="aboutQt" access="public static" return="void" id="0">
+ <qmethod name="aboutTQt" access="public static" return="void" id="0">
<qparam type="TQWidget*" name="parent"/>
<qparam type="TQStringamp" name="caption" default="TQString::null"/>
</qmethod>
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-25 06:11:04 +0000