Automated update from Qt3

pull/1/head
Timothy Pearson 12 years ago
parent f5b03149e8
commit 7e8d6ff0bc

@ -321,6 +321,7 @@ void tqt_init( int *, char **, TQApplication::Type );
void tqt_cleanup(); void tqt_cleanup();
#if defined(Q_WS_X11) #if defined(Q_WS_X11)
void tqt_init( Display* dpy, TQt::HANDLE, TQt::HANDLE ); void tqt_init( Display* dpy, TQt::HANDLE, TQt::HANDLE );
void tqt_init( int *, char **, Display* dpy, TQt::HANDLE, TQt::HANDLE );
#endif #endif
Q_EXPORT bool tqt_tryModalHelper( TQWidget *widget, TQWidget **rettop ); Q_EXPORT bool tqt_tryModalHelper( TQWidget *widget, TQWidget **rettop );
@ -962,7 +963,7 @@ TQApplication::TQApplication(Display *dpy, int argc, char **argv,
tqt_init( &argc, argv, GuiClient ); tqt_init( &argc, argv, GuiClient );
} else { } else {
tqt_init(dpy, visual, colormap); tqt_init( &argc, argv, dpy, visual, colormap );
} }
process_cmdline( &argc, argv ); process_cmdline( &argc, argv );

@ -1652,7 +1652,7 @@ void tqt_init_internal( int *argcptr, char **argv,
} }
#endif #endif
if ( display ) { if ( display && ((!argcptr) || (!argv)) ) {
// TQt part of other application // TQt part of other application
appForeignDpy = TRUE; appForeignDpy = TRUE;
@ -2465,6 +2465,11 @@ void tqt_init( Display *display, TQt::HANDLE visual, TQt::HANDLE colormap )
tqt_init_internal( 0, 0, display, visual, colormap ); tqt_init_internal( 0, 0, display, visual, colormap );
} }
void tqt_init( int *argcptr, char **argv, Display *display, TQt::HANDLE visual, TQt::HANDLE colormap )
{
tqt_init_internal( argcptr, argv, display, visual, colormap );
}
/***************************************************************************** /*****************************************************************************
tqt_cleanup() - cleans up when the application is finished tqt_cleanup() - cleans up when the application is finished

Loading…
Cancel
Save