From f67cd2d3fcf56b6bf82449c1f32b417c6c3c08ac Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 7 Nov 2011 20:26:50 -0600 Subject: Rename kwin to twin (part 1 of 2) --- kdejava/koala/kdejava/KWindowInfo.cpp | 2 +- kdejava/koala/org/kde/koala/KApplication.java | 4 ++-- kjsembed/jsconsolewidget.cpp | 2 +- qtjava/javalib/qtjava/QDockWindow.cpp | 2 +- qtruby/rubylib/qtruby/Qt.cpp | 6 +++--- qtruby/rubylib/qtruby/handlers.cpp | 2 +- qtsharp/src/libqtsharp/customslot.h | 2 +- smoke/kde/header_list | 2 +- smoke/kde/kde_header_list | 10 +++++----- smoke/qt/header_list | 2 +- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/kdejava/koala/kdejava/KWindowInfo.cpp b/kdejava/koala/kdejava/KWindowInfo.cpp index 1cb07777..64bbe2c2 100644 --- a/kdejava/koala/kdejava/KWindowInfo.cpp +++ b/kdejava/koala/kdejava/KWindowInfo.cpp @@ -1,6 +1,6 @@ //Auto-generated by kalyptus. DO NOT EDIT. #include -#include +#include #include #include diff --git a/kdejava/koala/org/kde/koala/KApplication.java b/kdejava/koala/org/kde/koala/KApplication.java index 818256e3..2d851e11 100644 --- a/kdejava/koala/org/kde/koala/KApplication.java +++ b/kdejava/koala/org/kde/koala/KApplication.java @@ -472,7 +472,7 @@ public class KApplication extends QApplication implements KInstanceInterface { /** Updates the last user action timestamp to the given time, or to the current time, if 0 is given. Do not use unless you're really sure what you're doing. - Consult focus stealing prevention section in kdebase/kwin/README. + Consult focus stealing prevention section in kdebase/twin/README. @short Updates the last user action timestamp to the given time, or to the current time, if 0 is given. */ public native void updateUserTimestamp(long time); @@ -488,7 +488,7 @@ public class KApplication extends QApplication implements KInstanceInterface { to the given time, or to this application's user time, if 0 is given. Use before causing user interaction in the remote application, e.g. invoking a dialog in the application using a DCOP call. - Consult focus stealing prevention section in kdebase/kwin/README. + Consult focus stealing prevention section in kdebase/twin/README. @short Updates the last user action timestamp in the application registered to DCOP with dcopId to the given time, or to this application's user time, if 0 is given. */ public native void updateRemoteUserTimestamp(String dcopId, long time); diff --git a/kjsembed/jsconsolewidget.cpp b/kjsembed/jsconsolewidget.cpp index b494f55d..f69ba6c5 100644 --- a/kjsembed/jsconsolewidget.cpp +++ b/kjsembed/jsconsolewidget.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include diff --git a/qtjava/javalib/qtjava/QDockWindow.cpp b/qtjava/javalib/qtjava/QDockWindow.cpp index 368e58fd..832ae4c4 100644 --- a/qtjava/javalib/qtjava/QDockWindow.cpp +++ b/qtjava/javalib/qtjava/QDockWindow.cpp @@ -1,6 +1,6 @@ //Auto-generated by kalyptus. DO NOT EDIT. #include -#include +#include #include #include diff --git a/qtruby/rubylib/qtruby/Qt.cpp b/qtruby/rubylib/qtruby/Qt.cpp index 37cfd637..dbb5b54a 100644 --- a/qtruby/rubylib/qtruby/Qt.cpp +++ b/qtruby/rubylib/qtruby/Qt.cpp @@ -104,7 +104,7 @@ VALUE kconfigskeleton_class = Qnil; VALUE kconfigskeleton_itemenum_class = Qnil; VALUE kconfigskeleton_itemenum_choice_class = Qnil; VALUE kio_udsatom_class = Qnil; -VALUE kwin_class = Qnil; +VALUE twin_class = Qnil; VALUE konsole_part_class = Qnil; bool application_terminated = false; }; @@ -2674,7 +2674,7 @@ static TQRegExp * scope_op = 0; rb_define_method(klass, "immutable?", (VALUE (*) (...)) _kconfigskeletonitem_immutable, 0); rb_define_method(klass, "isImmutable", (VALUE (*) (...)) _kconfigskeletonitem_immutable, 0); } else if (packageName.startsWith("KDE::Win::")) { - klass = rb_define_class_under(kwin_class, package+strlen("KDE::Win::"), base_class); + klass = rb_define_class_under(twin_class, package+strlen("KDE::Win::"), base_class); rb_define_singleton_method(klass, "new", (VALUE (*) (...)) _new_kde, -1); } else if (packageName.startsWith("KDE::")) { klass = rb_define_class_under(kde_module, package+strlen("KDE::"), base_class); @@ -2845,7 +2845,7 @@ set_new_kde(VALUE (*new_kde) (int, VALUE *, VALUE)) rb_define_singleton_method(ktexteditor_module, "method_missing", (VALUE (*) (...)) kde_module_method_missing, -1); rb_define_singleton_method(ktexteditor_module, "const_missing", (VALUE (*) (...)) kde_module_method_missing, -1); - kwin_class = rb_define_class_under(kde_module, "Win", qt_base_class); + twin_class = rb_define_class_under(kde_module, "Win", qt_base_class); kate_module = rb_define_module("Kate"); rb_define_singleton_method(kate_module, "method_missing", (VALUE (*) (...)) kde_module_method_missing, -1); diff --git a/qtruby/rubylib/qtruby/handlers.cpp b/qtruby/rubylib/qtruby/handlers.cpp index e6cf263c..9386ce15 100644 --- a/qtruby/rubylib/qtruby/handlers.cpp +++ b/qtruby/rubylib/qtruby/handlers.cpp @@ -1743,7 +1743,7 @@ void marshall_QPairintint(Marshall *m) { #include #include #include -#include +#include #include #include #include diff --git a/qtsharp/src/libqtsharp/customslot.h b/qtsharp/src/libqtsharp/customslot.h index 70108dcd..aa2f7f54 100644 --- a/qtsharp/src/libqtsharp/customslot.h +++ b/qtsharp/src/libqtsharp/customslot.h @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/smoke/kde/header_list b/smoke/kde/header_list index 3e4979da..1c3eb7c1 100644 --- a/smoke/kde/header_list +++ b/smoke/kde/header_list @@ -57,7 +57,7 @@ qdict.h qdir.h qdns.h qdockarea.h -qdockwindow.h +qdoctwindow.h qdom.h qdragobject.h qdrawutil.h diff --git a/smoke/kde/kde_header_list b/smoke/kde/kde_header_list index c0c4ba3c..ba1fd5d4 100644 --- a/smoke/kde/kde_header_list +++ b/smoke/kde/kde_header_list @@ -130,7 +130,7 @@ kdirsize.h kdirwatch.h kdiskfreesp.h kdockwidget.h -kdockwindow.h +kdoctwindow.h kdrawutil.h kdualcolorbtn.h kdualcolorbutton.h @@ -367,10 +367,10 @@ kurlrequesterdlg.h kurlrequester.h kuserprofile.h kvmallocator.h -kwindowinfo.h -kwindowlistmenu.h -kwin.h -kwinmodule.h +twindowinfo.h +twindowlistmenu.h +twin.h +twinmodule.h kwizard.h kwordwrap.h kxmessages.h diff --git a/smoke/qt/header_list b/smoke/qt/header_list index 3e4979da..1c3eb7c1 100644 --- a/smoke/qt/header_list +++ b/smoke/qt/header_list @@ -57,7 +57,7 @@ qdict.h qdir.h qdns.h qdockarea.h -qdockwindow.h +qdoctwindow.h qdom.h qdragobject.h qdrawutil.h -- cgit v1.2.1