summaryrefslogtreecommitdiffstats
path: root/nsplugins
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-11-30 14:52:22 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-11-30 14:52:22 -0600
commitc1dcc6c589304cca46a8aa2fb8c0277d60fe22ba (patch)
tree6baa81a75ffc7e2b9bd39a86e6c5e0485f130bb2 /nsplugins
parentd4c4140b6667a35cf7d0e604006e94b52e5b17a0 (diff)
downloadtdebase-c1dcc6c589304cca46a8aa2fb8c0277d60fe22ba.tar.gz
tdebase-c1dcc6c589304cca46a8aa2fb8c0277d60fe22ba.zip
Remove unused obsolete code from nsplugin viewer
Diffstat (limited to 'nsplugins')
-rw-r--r--nsplugins/viewer/CMakeLists.txt2
-rw-r--r--nsplugins/viewer/Makefile.am2
-rw-r--r--nsplugins/viewer/kxt.cpp629
-rw-r--r--nsplugins/viewer/kxt.h99
-rw-r--r--nsplugins/viewer/nsplugin.cpp1
-rw-r--r--nsplugins/viewer/viewer.cpp25
6 files changed, 3 insertions, 755 deletions
diff --git a/nsplugins/viewer/CMakeLists.txt b/nsplugins/viewer/CMakeLists.txt
index 14cd6913..89e0ef32 100644
--- a/nsplugins/viewer/CMakeLists.txt
+++ b/nsplugins/viewer/CMakeLists.txt
@@ -28,7 +28,7 @@ link_directories(
tde_add_executable( nspluginviewer AUTOMOC
SOURCES
../NSPluginCallbackIface.stub NSPluginClassIface.skel
- nsplugin.cpp viewer.cpp kxt.cpp qxteventloop.cpp
+ nsplugin.cpp viewer.cpp qxteventloop.cpp
glibevents.cpp
LINK tdeparts-shared tdeio-shared ${GLIB2_LIBRARIES} Xt dl
DESTINATION ${BIN_INSTALL_DIR}
diff --git a/nsplugins/viewer/Makefile.am b/nsplugins/viewer/Makefile.am
index 6b2bbb05..d8597321 100644
--- a/nsplugins/viewer/Makefile.am
+++ b/nsplugins/viewer/Makefile.am
@@ -4,7 +4,7 @@ METASOURCES = AUTO
bin_PROGRAMS = nspluginviewer
nspluginviewer_SOURCES = NSPluginCallbackIface.stub NSPluginClassIface.skel \
- nsplugin.cpp viewer.cpp kxt.cpp qxteventloop.cpp glibevents.cpp
+ nsplugin.cpp viewer.cpp qxteventloop.cpp glibevents.cpp
nspluginviewer_LDFLAGS = $(all_libraries) $(KDE_RPATH) -export-dynamic `pkg-config --libs glib-2.0`
nspluginviewer_LDADD = $(LIB_TDEIO) $(LIB_TDEPARTS) -lXt
diff --git a/nsplugins/viewer/kxt.cpp b/nsplugins/viewer/kxt.cpp
deleted file mode 100644
index 2c374f2c..00000000
--- a/nsplugins/viewer/kxt.cpp
+++ /dev/null
@@ -1,629 +0,0 @@
-/*
-
- kxt.cpp - Xt enabled Qt classed (derived from Qt Extension QXt)
-
- Copyright (c) 2000,2001 Stefan Schimanski <1Stein@gmx.de>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-*/
-
-/****************************************************************************
-**
-** Implementation of Qt extension classes for Xt/Motif support.
-**
-** Created : 980107
-**
-** Copyright (C) 1992-2000 Troll Tech AS. All rights reserved.
-**
-** This file is part of the Qt GUI Toolkit.
-**
-** This file may be distributed under the terms of the Q Public License
-** as defined by Troll Tech AS of Norway and appearing in the file
-** LICENSE.QPL included in the packaging of this file.
-**
-** Licensees holding valid Qt Professional Edition licenses may use this
-** file in accordance with the Qt Professional Edition License Agreement
-** provided with the Qt Professional Edition.
-**
-** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-** information about the Professional Edition licensing, or see
-** http://www.trolltech.com/qpl/ for QPL licensing information.
-**
-*****************************************************************************/
-
-#include <tqglobal.h>
-#if TQT_VERSION < 0x030100
-
-#include <tdeapplication.h>
-#include <tqwidget.h>
-#include <tqobjectlist.h>
-#include <tqwidgetlist.h>
-#include <kdebug.h>
-#include <tqtimer.h>
-
-#include "kxt.h"
-
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
-#include <limits.h>
-
-#include <X11/Xlib.h>
-#include <X11/Intrinsic.h>
-#include <X11/IntrinsicP.h> // for XtCreateWindow
-#include <X11/Shell.h>
-#include <X11/StringDefs.h>
-#include <X11/Xutil.h>
-#include <X11/Xos.h>
-
-const int XKeyPress = KeyPress;
-const int XKeyRelease = KeyRelease;
-#undef KeyPress
-#undef KeyRelease
-
-extern Atom tqt_wm_state;
-
-//#define HAVE_MOTIF
-#ifdef HAVE_MOTIF
-#include <Xm/Xm.h>
-#endif
-
-typedef void (*SameAsXtTimerCallbackProc)(void*,void*);
-typedef void (*IntervalSetter)(int);
-typedef void (*ForeignEventProc)(XEvent*);
-
-extern XtEventDispatchProc
- qt_np_cascade_event_handler[LASTEvent]; // defined in qnpsupport.cpp
-void qt_reset_color_avail(); // defined in qcolor_x11.cpp
-int qt_activate_timers(); // defined in qapplication_x11.cpp
-timeval *qt_wait_timer(); // defined in qapplication_x11.cpp
-void qt_x11SendPostedEvents(); // defined in qapplication_x11.cpp
-int qt_event_handler( XEvent* event ); // defined in qnpsupport.cpp
-extern int qt_np_count; // defined in qnpsupport.cpp
-void qt_np_timeout( void* p, void* id ); // defined in qnpsupport.cpp
-void qt_np_add_timeoutcb(
- SameAsXtTimerCallbackProc cb ); // defined in qnpsupport.cpp
-void qt_np_remove_timeoutcb(
- SameAsXtTimerCallbackProc cb ); // defined in qnpsupport.cpp
-void qt_np_add_timer_setter(
- IntervalSetter is ); // defined in qnpsupport.cpp
-void qt_np_remove_timer_setter(
- IntervalSetter is ); // defined in qnpsupport.cpp
-extern XtIntervalId qt_np_timerid; // defined in qnpsupport.cpp
-extern void (*qt_np_leave_cb)
- (XLeaveWindowEvent*); // defined in qnpsupport.cpp
-void qt_np_add_event_proc(
- ForeignEventProc fep ); // defined in qnpsupport.cpp
-void qt_np_remove_event_proc(
- ForeignEventProc fep ); // defined in qnpsupport.cpp
-
-
-typedef struct {
- int empty;
-} QWidgetClassPart;
-
-typedef struct _QWidgetClassRec {
- CoreClassPart core_class;
- QWidgetClassPart qwidget_class;
-} QWidgetClassRec;
-
-//static QWidgetClassRec qwidgetClassRec;
-
-typedef struct {
- /* resources */
- /* (none) */
- /* private state */
- KXtWidget* qxtwidget;
-} QWidgetPart;
-
-typedef struct _QWidgetRec {
- CorePart core;
- QWidgetPart qwidget;
-} QWidgetRec;
-
-
-static
-void reparentChildrenOf(TQWidget* parent)
-{
-
- if ( !parent->children() )
- return; // nothing to do
-
- for ( TQObjectListIt it( *parent->children() ); it.current(); ++it ) {
- if ( it.current()->isWidgetType() ) {
- TQWidget* widget = (TQWidget*)it.current();
- XReparentWindow( tqt_xdisplay(),
- widget->winId(),
- parent->winId(),
- widget->x(),
- widget->y() );
- if ( widget->isVisible() )
- XMapWindow( tqt_xdisplay(), widget->winId() );
- }
- }
-
-}
-
-void qwidget_realize(
- Widget widget,
- XtValueMask* mask,
- XSetWindowAttributes* attributes
- )
-{
- widgetClassRec.core_class.realize(widget, mask, attributes);
- KXtWidget* qxtw = ((QWidgetRec*)widget)->qwidget.qxtwidget;
- if (XtWindow(widget) != qxtw->winId()) {
- qxtw->create(XtWindow(widget), FALSE, FALSE);
- reparentChildrenOf(qxtw);
- }
- qxtw->show();
- XMapWindow( tqt_xdisplay(), qxtw->winId() );
-}
-
-static
-QWidgetClassRec qwidgetClassRec = {
- { /* core fields */
- /* superclass */ (WidgetClass) &widgetClassRec,
- /* class_name */ (char*)TQWIDGET_OBJECT_NAME_STRING,
- /* widget_size */ sizeof(QWidgetRec),
- /* class_initialize */ 0,
- /* class_part_initialize */ 0,
- /* class_inited */ FALSE,
- /* initialize */ 0,
- /* initialize_hook */ 0,
- /* realize */ qwidget_realize,
- /* actions */ 0,
- /* num_actions */ 0,
- /* resources */ 0,
- /* num_resources */ 0,
- /* xrm_class */ NULLQUARK,
- /* compress_motion */ TRUE,
- /* compress_exposure */ TRUE,
- /* compress_enterleave */ TRUE,
- /* visible_interest */ FALSE,
- /* destroy */ 0,
- /* resize */ XtInheritResize,
- /* expose */ XtInheritExpose,
- /* set_values */ 0,
- /* set_values_hook */ 0,
- /* set_values_almost */ XtInheritSetValuesAlmost,
- /* get_values_hook */ 0,
- /* accept_focus */ XtInheritAcceptFocus,
- /* version */ XtVersion,
- /* callback_private */ 0,
- /* tm_table */ XtInheritTranslations,
- /* query_geometry */ XtInheritQueryGeometry,
- /* display_accelerator */ XtInheritDisplayAccelerator,
- /* extension */ 0
- },
- { /* qwidget fields */
- /* empty */ 0
- }
-};
-static WidgetClass qWidgetClass = (WidgetClass)&qwidgetClassRec;
-
-static bool filters_installed = FALSE;
-static KXtApplication* qxtapp = 0;
-static XtAppContext appcon;
-
-static
-Boolean qt_event_handler_wrapper( XEvent* event )
-{
- return (Boolean)qt_event_handler( event );
-}
-
-static
-void installXtEventFilters()
-{
- if (filters_installed) return;
- // Get Xt out of our face - install filter on every event type
- for (int et=2; et < LASTEvent; et++) {
- qt_np_cascade_event_handler[et] = XtSetEventDispatcher(
- tqt_xdisplay(), et, qt_event_handler_wrapper );
- }
- filters_installed = TRUE;
-}
-
-static
-void removeXtEventFilters()
-{
- if (!filters_installed) return;
- // We aren't needed any more... slink back into the shadows.
- for (int et=2; et < LASTEvent; et++) {
- XtSetEventDispatcher(
- tqt_xdisplay(), et, qt_np_cascade_event_handler[et] );
- }
- filters_installed = FALSE;
-}
-
-// When we are in an event loop of TQApplication rather than the browser's
-// event loop (eg. for a modal dialog), we still send events to Xt.
-static
-void np_event_proc( XEvent* e )
-{
- Widget xtw = XtWindowToWidget( e->xany.display, e->xany.window );
- if ( xtw && tqApp->loopLevel() > 0 ) {
- // Allow Xt to process the event
- qt_np_cascade_event_handler[e->type]( e );
- }
-}
-
-static void np_set_timer( int interval )
-{
- // Ensure we only have one timeout in progress - TQApplication is
- // computing the one amount of time we need to wait.
- if ( qt_np_timerid ) {
- XtRemoveTimeOut( qt_np_timerid );
- }
- qt_np_timerid = XtAppAddTimeOut(appcon, interval,
- (XtTimerCallbackProc)qt_np_timeout, 0);
-}
-
-static void np_do_timers( void*, void* )
-{
- qt_np_timerid = 0; // It's us, and we just expired, that's why we are here.
-
- qt_activate_timers();
-
- timeval *tm = qt_wait_timer();
-
- if (tm) {
- int interval = TQMIN(tm->tv_sec,INT_MAX/1000)*1000 + tm->tv_usec/1000;
- np_set_timer( interval );
- }
- qxtapp->sendPostedEvents();
-}
-
-/*!
- \class KXtApplication qxt.h
- \brief Allows mixing of Xt/Motif and Qt widgets.
-
- \extension Xt/Motif
-
- The KXtApplication and KXtWidget classes allow old Xt or Motif widgets
- to be used in new Qt applications. They also allow Qt widgets to
- be used in primarily Xt/Motif applications. The facility is intended
- to aid migration from Xt/Motif to the more comfortable Qt system.
-*/
-
-static bool my_xt;
-
-/*!
- Constructs a TQApplication and initializes the Xt toolkit.
- The \a appclass, \a options, \a num_options, and \a resources
- arguments are passed on to XtAppSetFallbackResources and
- XtDisplayInitialize.
-
- Use this constructor when writing a new Qt application which
- needs to use some existing Xt/Motif widgets.
-*/
-KXtApplication::KXtApplication(int& argc, char** argv,
- const TQCString& rAppName, bool allowStyles, bool GUIenabled,
- XrmOptionDescRec *options, int num_options,
- char** resources)
- : TDEApplication(argc, argv, rAppName, allowStyles, GUIenabled)
-{
- my_xt = TRUE;
-
- XtToolkitInitialize();
- appcon = XtCreateApplicationContext();
- if (resources) XtAppSetFallbackResources(appcon, (char**)resources);
- XtDisplayInitialize(appcon, tqt_xdisplay(), name(), rAppName, options,
- num_options, &argc, argv);
- init();
-}
-
-/*!
- Constructs a TQApplication from the \a display of an already-initialized
- Xt application.
-
- Use this constructor when introducing Qt widgets into an existing
- Xt/Motif application.
-*/
-KXtApplication::KXtApplication(Display* dpy, int& argc, char** argv,
- const TQCString& rAppName, bool allowStyles, bool GUIenabled)
- : TDEApplication(dpy, argc, argv, rAppName, allowStyles, GUIenabled)
-{
- my_xt = FALSE;
- init();
- appcon = XtDisplayToApplicationContext(dpy);
-}
-
-/*!
- Destructs the application. Does not close the Xt toolkit.
-*/
-KXtApplication::~KXtApplication()
-{
- Q_ASSERT(qxtapp==this);
- removeXtEventFilters();
- qxtapp = 0;
-
- // the manpage says: "or just exit", that's what we do to avoid
- // double closing of the display
-// if (my_xt) {
-// XtDestroyApplicationContext(appcon);
-// }
-}
-
-void KXtApplication::init()
-{
- Q_ASSERT(qxtapp==0);
- qxtapp = this;
- installXtEventFilters();
- qt_np_add_timeoutcb(np_do_timers);
- qt_np_add_timer_setter(np_set_timer);
- qt_np_add_event_proc(np_event_proc);
- qt_np_count++;
-/* TQTimer *timer = new TQTimer( this );
- timer->start(500);*/
-}
-
-/*!
- \class KXtWidget qxt.h
- \brief Allows mixing of Xt/Motif and Qt widgets.
-
- \extension Xt/Motif
-
- KXtWidget acts as a bridge between Xt and Qt. For utilizing old
- Xt widgets, it can be a QWidget
- based on a Xt widget class. For including Qt widgets in an existing
- Xt/Motif application, it can be a special Xt widget class that is
- a TQWidget. See the constructors for the different behaviors.
-*/
-
-void KXtWidget::init(const char* name, WidgetClass widget_class,
- Widget parent, TQWidget* qparent,
- ArgList args, Cardinal num_args,
- bool managed)
-{
- need_reroot=FALSE;
- xtparent = 0;
- if (parent ) {
- Q_ASSERT(!qparent);
- xtw = XtCreateWidget(name, widget_class, parent, args, num_args);
- if ( widget_class == qWidgetClass )
- ((QWidgetRec*)xtw)->qwidget.qxtwidget = this;
- xtparent = parent;
- if (managed)
- XtManageChild(xtw);
- } else {
- Q_ASSERT(!managed);
-
- String n, c;
- XtGetApplicationNameAndClass(tqt_xdisplay(), &n, &c);
- xtw = XtAppCreateShell(n, c, widget_class, tqt_xdisplay(),
- args, num_args);
- if ( widget_class == qWidgetClass )
- ((QWidgetRec*)xtw)->qwidget.qxtwidget = this;
- }
-
- if ( qparent ) {
- XtResizeWidget( xtw, 100, 100, 0 );
- XtSetMappedWhenManaged(xtw, False);
- XtRealizeWidget(xtw);
- XSync(tqt_xdisplay(), False); // I want all windows to be created now
- XReparentWindow(tqt_xdisplay(), XtWindow(xtw), qparent->winId(), x(), y());
- XtSetMappedWhenManaged(xtw, True);
- need_reroot=TRUE;
- }
-
- Arg reqargs[20];
- Cardinal nargs=0;
- XtSetArg(reqargs[nargs], XtNx, x()); nargs++;
- XtSetArg(reqargs[nargs], XtNy, y()); nargs++;
- XtSetArg(reqargs[nargs], XtNwidth, width()); nargs++;
- XtSetArg(reqargs[nargs], XtNheight, height()); nargs++;
- //XtSetArg(reqargs[nargs], "mappedWhenManaged", False); nargs++;
- XtSetValues(xtw, reqargs, nargs);
-
- //#### destroy(); MLK
-
- if (!parent || XtIsRealized(parent))
- XtRealizeWidget(xtw);
-}
-
-
-/*!
- Constructs a KXtWidget of the special Xt widget class known as
- TQWIDGET_OBJECT_NAME_STRING to the resource manager.
-
- Use this constructor to utilize Qt widgets in an Xt/Motif
- application. The KXtWidget is a TQWidget, so you can create
- subwidgets, layouts, etc. using Qt functionality.
-*/
-KXtWidget::KXtWidget(const char* name, Widget parent, bool managed) :
- TQWidget( 0, name, WResizeNoErase )
-{
- init(name, qWidgetClass, parent, 0, 0, 0, managed);
- Arg reqargs[20];
- Cardinal nargs=0;
- XtSetArg(reqargs[nargs], XtNborderWidth, 0);
- nargs++;
- XtSetValues(xtw, reqargs, nargs);
-}
-
-/*!
- Constructs a KXtWidget of the given \a widget_class.
-
- Use this constructor to utilize Xt or Motif widgets in a Qt
- application. The KXtWidget looks and behaves
- like the Xt class, but can be used like any TQWidget.
-
- Note that Xt requires that the most toplevel Xt widget is a shell.
- That means, if \a parent is a KXtWidget, the \a widget_class can be
- of any kind. If there isn't a parent or the parent is just a normal
- TQWidget, \a widget_class should be something like \c
- topLevelShellWidgetClass.
-
- If the \a managed parameter is TRUE and \a parent in not NULL,
- XtManageChild it used to manage the child.
-*/
-KXtWidget::KXtWidget(const char* name, WidgetClass widget_class,
- TQWidget *parent, ArgList args, Cardinal num_args,
- bool managed) :
- TQWidget( parent, name, WResizeNoErase )
-{
- if ( !parent )
- init(name, widget_class, 0, 0, args, num_args, managed);
- else if ( parent->inherits("KXtWidget") )
- init(name, widget_class, ( (KXtWidget*)parent)->xtw , 0, args, num_args, managed);
- else
- init(name, widget_class, 0, parent, args, num_args, managed);
- create(XtWindow(xtw), FALSE, FALSE);
-}
-
-/*!
- Destructs the KXtWidget.
-*/
-KXtWidget::~KXtWidget()
-{
- // Delete children first, as Xt will destroy their windows
- //
- TQObjectList* list = queryList(TQWIDGET_OBJECT_NAME_STRING, 0, FALSE, FALSE);
- if ( list ) {
- TQWidget* c;
- TQObjectListIt it( *list );
- while ( (c = (TQWidget*)it.current()) ) {
- delete c;
- ++it;
- }
- delete list;
- }
-
- if ( need_reroot ) {
- hide();
- XReparentWindow(tqt_xdisplay(), winId(), tqApp->desktop()->winId(),
- x(), y());
- }
-
- XtDestroyWidget(xtw);
- destroy( FALSE, FALSE );
-}
-
-/*!
- \fn Widget KXtWidget::xtWidget() const
- Returns the Xt widget equivalent for the Qt widget.
-*/
-
-
-
-/*!
- Reimplemented to produce the Xt effect of getting focus when the
- mouse enters the widget. <em>This may be changed.</em>
-*/
-bool KXtWidget::x11Event( XEvent * e )
-{
- if ( e->type == EnterNotify ) {
- if ( xtparent )
- setActiveWindow();
- }
- return TQWidget::x11Event( e );
-}
-
-
-/*!
- Implement a degree of focus handling for Xt widgets.
-*/
-void KXtWidget::setActiveWindow()
-{
- if ( xtparent ) {
- if ( !TQWidget::isActiveWindow() && isActiveWindow() ) {
- XFocusChangeEvent e;
- e.type = FocusIn;
- e.window = winId();
- e.mode = NotifyNormal;
- e.detail = NotifyInferior;
- XSendEvent( tqt_xdisplay(), e.window, TRUE, NoEventMask, (XEvent*)&e );
- }
- } else {
- TQWidget::setActiveWindow();
- }
-}
-
-/*!
- Different from TQWidget::isActiveWindow()
- */
-bool KXtWidget::isActiveWindow() const
-{
- Window win;
- int revert;
- XGetInputFocus( tqt_xdisplay(), &win, &revert );
-
- if ( win == None) return FALSE;
-
- TQWidget *w = find( (WId)win );
- if ( w ) {
- // We know that window
- return w->topLevelWidget() == topLevelWidget();
- } else {
- // Window still may be a parent (if top-level is foreign window)
- Window root, parent;
- Window cursor = winId();
- Window *ch;
- unsigned int nch;
- while ( XQueryTree(tqt_xdisplay(), cursor, &root, &parent, &ch, &nch) ) {
- if (ch) XFree( (char*)ch);
- if ( parent == win ) return TRUE;
- if ( parent == root ) return FALSE;
- cursor = parent;
- }
- return FALSE;
- }
-}
-
-/*!\reimp
- */
-void KXtWidget::moveEvent( TQMoveEvent* )
-{
- if ( xtparent )
- return;
- XConfigureEvent c;
- c.type = ConfigureNotify;
- c.event = winId();
- c.window = winId();
- c.x = x();
- c.y = y();
- c.width = width();
- c.height = height();
- c.border_width = 0;
- XSendEvent( tqt_xdisplay(), c.event, TRUE, NoEventMask, (XEvent*)&c );
- XtMoveWidget( xtw, x(), y() );
-}
-
-/*!\reimp
- */
-void KXtWidget::resizeEvent( TQResizeEvent* )
-{
- if ( xtparent )
- return;
- XtWidgetGeometry preferred;
- (void ) XtQueryGeometry( xtw, 0, &preferred );
- XConfigureEvent c;
- c.type = ConfigureNotify;
- c.event = winId();
- c.window = winId();
- c.x = x();
- c.y = y();
- c.width = width();
- c.height = height();
- c.border_width = 0;
- XSendEvent( tqt_xdisplay(), c.event, TRUE, NoEventMask, (XEvent*)&c );
- XtResizeWidget( xtw, width(), height(), preferred.border_width );
-}
-
-#include "kxt.moc"
-
-#endif
diff --git a/nsplugins/viewer/kxt.h b/nsplugins/viewer/kxt.h
deleted file mode 100644
index 5a1c4f1a..00000000
--- a/nsplugins/viewer/kxt.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
-
- kxt.h - Xt enabled Qt classed (derived from Qt Extension QXt)
-
- Copyright (c) 2000 Stefan Schimanski <1Stein@gmx.de>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-*/
-
-/****************************************************************************
-**
-** Definition of Qt extension classes for Xt/Motif support.
-**
-** Created : 980107
-**
-** Copyright (C) 1992-2000 Troll Tech AS. All rights reserved.
-**
-** This file is part of the Qt GUI Toolkit.
-**
-** This file may be distributed under the terms of the Q Public License
-** as defined by Troll Tech AS of Norway and appearing in the file
-** LICENSE.QPL included in the packaging of this file.
-**
-** Licensees holding valid Qt Professional Edition licenses may use this
-** file in accordance with the Qt Professional Edition License Agreement
-** provided with the Qt Professional Edition.
-**
-** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-** information about the Professional Edition licensing, or see
-** http://www.trolltech.com/qpl/ for QPL licensing information.
-**
-*****************************************************************************/
-#ifndef KXT_H
-#define KXT_H
-
-#include <tqglobal.h>
-#if TQT_VERSION < 0x030100
-
-#include <tdeapplication.h>
-#include <tqwidget.h>
-#include <X11/Intrinsic.h>
-
-class KXtApplication : public TDEApplication {
- Q_OBJECT
- void init();
-
-public:
- KXtApplication(int& argc, char** argv,
- const TQCString& rAppName, bool allowStyles=true, bool GUIenabled=true,
- XrmOptionDescRec *options=0, int num_options=0, char** resources=0);
- KXtApplication(Display*, int& argc, char** argv, const TQCString& rAppName,
- bool allowStyles=true, bool GUIenabled=true);
- ~KXtApplication();
-};
-
-class KXtWidget : public TQWidget {
- Q_OBJECT
- Widget xtw;
- Widget xtparent;
- bool need_reroot;
- void init(const char* name, WidgetClass widget_class,
- Widget parent, TQWidget* qparent,
- ArgList args, Cardinal num_args,
- bool managed);
- friend void qwidget_realize( Widget widget, XtValueMask* mask,
- XSetWindowAttributes* attributes );
-
-public:
- KXtWidget(const char* name, Widget parent, bool managed=FALSE);
- KXtWidget(const char* name, WidgetClass widget_class,
- TQWidget *parent=0, ArgList args=0, Cardinal num_args=0,
- bool managed=FALSE);
- ~KXtWidget();
-
- Widget xtWidget() const { return xtw; }
- bool isActiveWindow() const;
- void setActiveWindow();
-
-protected:
- void moveEvent( TQMoveEvent* );
- void resizeEvent( TQResizeEvent* );
- bool x11Event( XEvent * );
-};
-
-#endif
-#endif
diff --git a/nsplugins/viewer/nsplugin.cpp b/nsplugins/viewer/nsplugin.cpp
index 09e4f382..4f3cb309 100644
--- a/nsplugins/viewer/nsplugin.cpp
+++ b/nsplugins/viewer/nsplugin.cpp
@@ -35,7 +35,6 @@
#include <tqfile.h>
#include <tqtimer.h>
-#include "kxt.h"
#include "nsplugin.h"
#include "resolve.h"
diff --git a/nsplugins/viewer/viewer.cpp b/nsplugins/viewer/viewer.cpp
index a7469b4f..6007e5b0 100644
--- a/nsplugins/viewer/viewer.cpp
+++ b/nsplugins/viewer/viewer.cpp
@@ -46,14 +46,8 @@
#endif
#include <tdeconfig.h>
-#if TQT_VERSION < 0x030100
-#include "kxt.h"
-#include <X11/Intrinsic.h>
-#include <X11/Shell.h>
-#else
#include "qxteventloop.h"
#include "glibevents.h"
-#endif
/**
* Use RLIMIT_DATA on systems that don't define RLIMIT_AS,
@@ -227,31 +221,14 @@ int main(int argc, char** argv)
kdDebug(1430) << "2 - parseCommandLine" << endl;
parseCommandLine(argc, argv);
-#if TQT_VERSION < 0x030100
- // Create application
- kdDebug(1430) << "3 - XtToolkitInitialize" << endl;
- XtToolkitInitialize();
- g_appcon = XtCreateApplicationContext();
- Display *dpy = XtOpenDisplay(g_appcon, NULL, "nspluginviewer", "nspluginviewer",
- 0, 0, &argc, argv);
-
- _notifiers[0].setAutoDelete( TRUE );
- _notifiers[1].setAutoDelete( TRUE );
- _notifiers[2].setAutoDelete( TRUE );
-
- kdDebug(1430) << "4 - KXtApplication app" << endl;
- TDELocale::setMainCatalogue("nsplugin");
- KXtApplication app(dpy, argc, argv, "nspluginviewer");
-#else
kdDebug(1430) << "3 - create QXtEventLoop" << endl;
QXtEventLoop integrator( "nspluginviewer" );
parseCommandLine(argc, argv);
TDELocale::setMainCatalogue("nsplugin");
kdDebug(1430) << "4 - create TDEApplication" << endl;
- TDEApplication app( argc, argv, "nspluginviewer" );
+ TDEApplication app( argc, argv, "nspluginviewer", true, true, true );
GlibEvents glibevents;
-#endif
{
TDEConfig cfg("kcmnspluginrc", true);