diff -urEb kdelibs-3.5.0_/kcmshell/main.cpp kdelibs-3.5.0/kcmshell/main.cpp --- kdelibs-3.5.0_/kcmshell/main.cpp 2005-10-10 17:05:27.000000000 +0200 +++ kdelibs-3.5.0/kcmshell/main.cpp 2005-12-08 22:30:26.000000000 +0100 @@ -25,7 +25,7 @@ #include #include -#include +//#include #include #include @@ -148,7 +148,8 @@ { kdDebug(780) << k_funcinfo << endl; - KStartupInfo::setNewStartupId( this, asn_id ); +// PERHAPS THE KSTARTUPINFO HASNT BEEN WRITTEN FOR MAC YET OR MAYBE ITS NOT NEEDED. SEE kdecore/kstartupinfo.h +// KStartupInfo::setNewStartupId( this, asn_id ); } void KCMShell::setDCOPName(const QCString &dcopName, bool rootMode ) @@ -295,7 +296,7 @@ { KCModuleProxy *module = new KCModuleProxy( modules.first()->desktopEntryName() ); module->realModule(); - QXEmbed::embedClientIntoWindow( module, id); +// QXEmbed::embedClientIntoWindow( module, id); app.exec(); delete module; } @@ -317,7 +318,7 @@ id = args->getOption( "embed" ).toInt(&idValid); if( idValid ) { - QXEmbed::embedClientIntoWindow( dlg, id ); +// QXEmbed::embedClientIntoWindow( dlg, id ); dlg->exec(); delete dlg; } diff -urEb kdelibs-3.5.0_/kdecore/kapplication.cpp kdelibs-3.5.0/kdecore/kapplication.cpp --- kdelibs-3.5.0_/kdecore/kapplication.cpp 2005-10-10 17:06:03.000000000 +0200 +++ kdelibs-3.5.0/kdecore/kapplication.cpp 2005-12-25 11:51:17.000000000 +0100 @@ -538,14 +538,14 @@ if( ic == NULL ) ic = new QPixmap( KGlobal::iconLoader()->loadIcon( iconName(), KIcon::NoGroup, 0, KIcon::DefaultState, NULL, true )); - if( !ic->isNull()) +/* if( !ic->isNull()) { w->setIcon( *ic ); #if defined Q_WS_X11 KWin::setIcons( w->winId(), *ic, miniIcon()); #endif } - } +*/ } } return QApplication::notify(receiver, event); } @@ -2848,7 +2848,7 @@ } // set the specified icons - topWidget->setIcon( icon() ); //standard X11 +// topWidget->setIcon( icon() ); //standard X11 #if defined Q_WS_X11 //#ifdef Q_WS_X11 // FIXME(E): Implement for Qt/Embedded KWin::setIcons(topWidget->winId(), icon(), miniIcon() ); // NET_WM hints for KWin diff -urEb kdelibs-3.5.0_/kdecore/kglobalaccel.cpp kdelibs-3.5.0/kdecore/kglobalaccel.cpp --- kdelibs-3.5.0_/kdecore/kglobalaccel.cpp 2005-10-10 17:06:03.000000000 +0200 +++ kdelibs-3.5.0/kdecore/kglobalaccel.cpp 2005-12-08 13:25:33.000000000 +0100 @@ -65,12 +65,12 @@ void KGlobalAccel::setEnabled( bool bEnabled ) { d->setEnabled( bEnabled ); } -void KGlobalAccel::blockShortcuts( bool block ) +/*void KGlobalAccel::blockShortcuts( bool block ) { KGlobalAccelPrivate::blockShortcuts( block ); } void KGlobalAccel::disableBlocking( bool disable ) { d->disableBlocking( disable ); } - +*/ KAccelAction* KGlobalAccel::insert( const QString& sAction, const QString& sDesc, const QString& sHelp, const KShortcut& cutDef3, const KShortcut& cutDef4, const QObject* pObjSlot, const char* psMethodSlot, diff -urEb kdelibs-3.5.0_/kdecore/kmountpoint.cpp kdelibs-3.5.0/kdecore/kmountpoint.cpp --- kdelibs-3.5.0_/kdecore/kmountpoint.cpp 2005-10-10 17:06:02.000000000 +0200 +++ kdelibs-3.5.0/kdecore/kmountpoint.cpp 2005-12-08 13:43:54.000000000 +0100 @@ -130,6 +130,7 @@ { KMountPoint::List result; +#undef HAVE_SETMNTENT #ifdef HAVE_SETMNTENT STRUCT_SETMNTENT fstab; if ((fstab = SETMNTENT(FSTAB, "r")) == 0) diff -urEb kdelibs-3.5.0_/kdesu/kdesu_pty.cpp kdelibs-3.5.0/kdesu/kdesu_pty.cpp --- kdelibs-3.5.0_/kdesu/kdesu_pty.cpp 2005-09-10 10:27:02.000000000 +0200 +++ kdelibs-3.5.0/kdesu/kdesu_pty.cpp 2005-12-08 19:04:18.000000000 +0100 @@ -93,7 +93,7 @@ int PTY::getpt() { - +#undef HAVE_GETPT #if defined(HAVE_GETPT) && defined(HAVE_PTSNAME) // 1: UNIX98: preferred way diff -urEb kdelibs-3.5.0_/kdeui/kdetrayproxy/kdetrayproxy.cpp kdelibs-3.5.0/kdeui/kdetrayproxy/kdetrayproxy.cpp --- kdelibs-3.5.0_/kdeui/kdetrayproxy/kdetrayproxy.cpp 2005-10-10 17:06:37.000000000 +0200 +++ kdelibs-3.5.0/kdeui/kdetrayproxy/kdetrayproxy.cpp 2005-12-08 18:41:26.000000000 +0100 @@ -22,7 +22,7 @@ #include #include #include -#include +//#include #include #include #include @@ -30,34 +30,34 @@ #include KDETrayProxy::KDETrayProxy() - : selection( makeSelectionAtom()) + /* : selection( makeSelectionAtom())*/ { - connect( &selection, SIGNAL( newOwner( Window )), SLOT( newOwner( Window ))); +// connect( &selection, SIGNAL( newOwner( Window )), SLOT( newOwner( Window ))); connect( &module, SIGNAL( windowAdded( WId )), SLOT( windowAdded( WId ))); - selection.owner(); +// selection.owner(); for( QValueList< WId >::ConstIterator it = module.windows().begin(); it != module.windows().end(); ++it ) windowAdded( *it ); - kapp->installX11EventFilter( this ); // XSelectInput( StructureNotifyMask ) on windows is done by KWinModule +// kapp->installX11EventFilter( this ); // XSelectInput( StructureNotifyMask ) on windows is done by KWinModule // kdDebug() << "Init done" << endl; } -Atom KDETrayProxy::makeSelectionAtom() +/*Atom KDETrayProxy::makeSelectionAtom() { return XInternAtom( qt_xdisplay(), "_NET_SYSTEM_TRAY_S" + QCString().setNum( qt_xscreen()), False ); } - -extern Time qt_x_time; +*/ +//extern Time qt_x_time; void KDETrayProxy::windowAdded( WId w ) { - NETWinInfo ni( qt_xdisplay(), w, qt_xrootwin(), NET::WMKDESystemTrayWinFor ); - WId trayWinFor = ni.kdeSystemTrayWinFor(); - if ( !trayWinFor ) // not a KDE tray window +// NETWinInfo ni( qt_xdisplay(), w, qt_xrootwin(), NET::WMKDESystemTrayWinFor ); +// WId trayWinFor = ni.kdeSystemTrayWinFor(); +// if ( !trayWinFor ) // not a KDE tray window return; // kdDebug() << "New tray window:" << w << endl; - if( !tray_windows.contains( w )) +/* if( !tray_windows.contains( w )) tray_windows.append( w ); withdrawWindow( w ); // window will be removed from pending_windows when after docked @@ -71,18 +71,18 @@ return; } dockWindow( w, owner ); - } +*/ } -void KDETrayProxy::newOwner( Window owner ) +void KDETrayProxy::newOwner( WId owner ) { // kdDebug() << "New owner:" << owner << endl; - for( QValueList< Window >::ConstIterator it = pending_windows.begin(); + for( QValueList< WId >::ConstIterator it = pending_windows.begin(); it != pending_windows.end(); ++it ) dockWindow( *it, owner ); // remove from pending_windows only in windowRemoved(), after it's really docked } - +/* bool KDETrayProxy::x11Event( XEvent* e ) { if( tray_windows.isEmpty()) @@ -122,16 +122,16 @@ } return false; } - -void KDETrayProxy::dockWindow( Window w, Window owner ) +*/ +void KDETrayProxy::dockWindow( WId w, WId owner ) { // kdDebug() << "Docking " << w << " into " << owner << endl; - docked_windows[ w ] = XNextRequest( qt_xdisplay()); - static Atom prop = XInternAtom( qt_xdisplay(), "_XEMBED_INFO", False ); +// docked_windows[ w ] = XNextRequest( qt_xdisplay()); +// static Atom prop = XInternAtom( qt_xdisplay(), "_XEMBED_INFO", False ); long data[ 2 ] = { 0, 1 }; - XChangeProperty( qt_xdisplay(), w, prop, prop, 32, PropModeReplace, (unsigned char*)data, 2 ); - XSizeHints hints; - hints.flags = PMinSize | PMaxSize; +// XChangeProperty( qt_xdisplay(), w, prop, prop, 32, PropModeReplace, (unsigned char*)data, 2 ); +// XSizeHints hints; +/* hints.flags = PMinSize | PMaxSize; hints.min_width = 24; hints.max_width = 24; hints.min_height = 24; @@ -151,34 +151,34 @@ ev.xclient.data.l[ 3 ] = 0; // unused ev.xclient.data.l[ 4 ] = 0; // unused XSendEvent( qt_xdisplay(), owner, False, NoEventMask, &ev ); - } + */ } -void KDETrayProxy::withdrawWindow( Window w ) +void KDETrayProxy::withdrawWindow( WId w ) { - XWithdrawWindow( qt_xdisplay(), w, qt_xscreen()); - static Atom wm_state = XInternAtom( qt_xdisplay(), "WM_STATE", False ); +// XWithdrawWindow( qt_xdisplay(), w, qt_xscreen()); +// static Atom wm_state = XInternAtom( qt_xdisplay(), "WM_STATE", False ); for(;;) { Atom type; int format; unsigned long length, after; unsigned char *data; - int r = XGetWindowProperty( qt_xdisplay(), w, wm_state, 0, 2, +/* int r = XGetWindowProperty( qt_xdisplay(), w, wm_state, 0, 2, False, AnyPropertyType, &type, &format, &length, &after, &data ); - bool withdrawn = true; - if ( r == Success && data && format == 32 ) - { - withdrawn = ( *( long* )data == WithdrawnState ); - XFree( (char *)data ); - } - if( withdrawn ) +*/ bool withdrawn = true; +// if ( r == Success && data && format == 32 ) + // { + // withdrawn = ( *( long* )data == WithdrawnState ); +// XFree( (char *)data ); + // } + // if( withdrawn ) return; // ---> - struct timeval tm; + /* struct timeval tm; tm.tv_sec = 0; tm.tv_usec = 10 * 1000; // 10ms select(0, NULL, NULL, NULL, &tm); - } + */ } } #include "kdetrayproxy.moc" diff -urEb kdelibs-3.5.0_/kdeui/kdetrayproxy/kdetrayproxy.h kdelibs-3.5.0/kdeui/kdetrayproxy/kdetrayproxy.h --- kdelibs-3.5.0_/kdeui/kdetrayproxy/kdetrayproxy.h 2005-10-10 17:06:37.000000000 +0200 +++ kdelibs-3.5.0/kdeui/kdetrayproxy/kdetrayproxy.h 2005-12-08 18:42:49.000000000 +0100 @@ -25,6 +25,8 @@ #include #include + + class KDETrayProxy : public QWidget { @@ -33,18 +35,24 @@ KDETrayProxy(); public slots: void windowAdded( WId ); - void newOwner( Window ); + // void newOwner( Window ); +void newOwner(WId); protected: - virtual bool x11Event( XEvent* ); +// virtual bool x11Event( XEvent* ); private: - void dockWindow( Window w, Window owner ); - void withdrawWindow( Window w ); - static Atom makeSelectionAtom(); - KSelectionWatcher selection; +// void dockWindow( Window w, Window owner ); +void dockWindow (WId w, WId owner); +// void withdrawWindow( Window w ); +void withdrawWindow (WId w); +// static Atom makeSelectionAtom(); +// KSelectionWatcher selection; KWinModule module; - QValueList< Window > pending_windows; - QValueList< Window > tray_windows; - QMap< Window, unsigned long > docked_windows; +// QValueList< Window > pending_windows; +QValueList< WId > pending_windows; +// QValueList< Window > tray_windows; +QValueList< WId > tray_windows; +// QMap< Window, unsigned long > docked_windows; +QMap< WId, unsigned long > docked_windows; }; #endif diff -urEb kdelibs-3.5.0_/khtml/java/kjavaapplet.cpp kdelibs-3.5.0/khtml/java/kjavaapplet.cpp --- kdelibs-3.5.0_/khtml/java/kjavaapplet.cpp 2005-10-10 17:06:12.000000000 +0200 +++ kdelibs-3.5.0/khtml/java/kjavaapplet.cpp 2005-12-08 22:49:33.000000000 +0100 @@ -26,8 +26,9 @@ #include #include +// THIS IS A LITTLE RUBBISH BECAUSE ITS BEEN WRITTEN SO AS TO BE INCOMPATIBLE WITH QT/MAC but i cant be bothered to fix it - +/* class KJavaAppletPrivate { public: @@ -39,10 +40,10 @@ QString archives; QSize size; QString windowName; - KJavaApplet::AppletState state; +// KJavaApplet::AppletState state; bool failed; - KJavaAppletWidget* UIwidget; +// KJavaAppletWidget* UIwidget; }; @@ -284,5 +285,5 @@ bool KJavaApplet::failed() const { return d->failed; } - +*/ #include "kjavaapplet.moc" diff -urEb kdelibs-3.5.0_/khtml/java/kjavaappletviewer.cpp kdelibs-3.5.0/khtml/java/kjavaappletviewer.cpp --- kdelibs-3.5.0_/khtml/java/kjavaappletviewer.cpp 2005-10-10 17:06:12.000000000 +0200 +++ kdelibs-3.5.0/khtml/java/kjavaappletviewer.cpp 2005-12-08 23:26:00.000000000 +0100 @@ -88,7 +88,7 @@ delete server; } -KJavaAppletContext * KJavaServerMaintainer::getContext (QObject * w, const QString & doc) { +/*KJavaAppletContext * KJavaServerMaintainer::getContext (QObject * w, const QString & doc) { ContextMap::key_type key = qMakePair (w, doc); ContextMap::iterator it = m_contextmap.find (key); if (it != m_contextmap.end ()) { @@ -98,13 +98,13 @@ KJavaAppletContext* const context = new KJavaAppletContext (); m_contextmap.insert (key, qMakePair(context, 1)); return context; -} +}*/ void KJavaServerMaintainer::releaseContext (QObject * w, const QString & doc) { ContextMap::iterator it = m_contextmap.find (qMakePair (w, doc)); if (it != m_contextmap.end () && --(*it).second <= 0) { - kdDebug(6100) << "KJavaServerMaintainer::releaseContext" << endl; - (*it).first->deleteLater (); +// kdDebug(6100) << "KJavaServerMaintainer::releaseContext" << endl; +// (*it).first->deleteLater (); m_contextmap.remove (it); } } @@ -118,11 +118,11 @@ //----------------------------------------------------------------------------- -AppletParameterDialog::AppletParameterDialog (KJavaAppletWidget * parent) +/*AppletParameterDialog::AppletParameterDialog () : KDialogBase (parent, "paramdialog", true, i18n ("Applet Parameters"), KDialogBase::Close, KDialogBase::Close, true), m_appletWidget (parent) { - KJavaApplet* const applet = parent->applet (); +// KJavaApplet* const applet = parent->applet (); table = new QTable (30, 2, this); table->setMinimumSize (QSize (600, 400)); table->setColumnWidth (0, 200); @@ -132,7 +132,7 @@ header->setLabel (1, i18n ("Value")); QTableItem * tit = new QTableItem (table, QTableItem::Never, i18n("Class")); table->setItem (0, 0, tit); - tit = new QTableItem(table, QTableItem::Always, applet->appletClass()); +// tit = new QTableItem(table, QTableItem::Always, applet->appletClass()); table->setItem (0, 1, tit); tit = new QTableItem (table, QTableItem::Never, i18n ("Base URL")); table->setItem (1, 0, tit); @@ -142,8 +142,8 @@ table->setItem (2, 0, tit); tit = new QTableItem(table, QTableItem::Always, applet->archives()); table->setItem (2, 1, tit); - QMap::const_iterator it = applet->getParams().begin(); - const QMap::const_iterator itEnd = applet->getParams().end(); +// QMap::const_iterator it = applet->getParams().begin(); +// const QMap::const_iterator itEnd = applet->getParams().end(); for (int count = 2; it != itEnd; ++it) { tit = new QTableItem (table, QTableItem::Always, it.key ()); table->setItem (++count, 0, tit); @@ -151,30 +151,30 @@ table->setItem (count, 1, tit); } setMainWidget (table); -} +}*/ void AppletParameterDialog::slotClose () { table->selectCells (0, 0, 0, 0); - KJavaApplet* const applet = m_appletWidget->applet (); - applet->setAppletClass (table->item (0, 1)->text ()); - applet->setBaseURL (table->item (1, 1)->text ()); - applet->setArchives (table->item (2, 1)->text ()); +// KJavaApplet* const applet = m_appletWidget->applet (); +// applet->setAppletClass (table->item (0, 1)->text ()); +// applet->setBaseURL (table->item (1, 1)->text ()); +// applet->setArchives (table->item (2, 1)->text ()); const int lim = table->numRows(); - for (int i = 3; i < lim; ++i) { +/* for (int i = 3; i < lim; ++i) { if (table->item (i, 0) && table->item (i, 1) && !table->item (i, 0)->text ().isEmpty ()) applet->setParameter (table->item (i, 0)->text (), table->item (i, 1)->text ()); } - hide (); +*/ hide (); } //----------------------------------------------------------------------------- class CoverWidget : public QWidget { - KJavaAppletWidget * m_appletwidget; +// KJavaAppletWidget * m_appletwidget; public: CoverWidget (QWidget *); ~CoverWidget () {} - KJavaAppletWidget * appletWidget () const; +// KJavaAppletWidget * appletWidget () const; protected: void resizeEvent (QResizeEvent * e); }; @@ -182,16 +182,16 @@ inline CoverWidget::CoverWidget (QWidget * parent) : QWidget (parent, "KJavaAppletViewer Widget") { - m_appletwidget = new KJavaAppletWidget (this); - setFocusProxy (m_appletwidget); +// m_appletwidget = new KJavaAppletWidget (this); +// setFocusProxy (m_appletwidget); } -inline KJavaAppletWidget * CoverWidget::appletWidget () const { +/*inline KJavaAppletWidget * CoverWidget::appletWidget () const { return m_appletwidget; -} +}*/ void CoverWidget::resizeEvent (QResizeEvent * e) { - m_appletwidget->resize (e->size().width(), e->size().height()); +// m_appletwidget->resize (e->size().width(), e->size().height()); } //----------------------------------------------------------------------------- @@ -226,7 +226,7 @@ QString classname, classid, codebase, khtml_codebase, src_param; int width = -1; int height = -1; - KJavaApplet* const applet = m_view->appletWidget()->applet (); +// KJavaApplet* const applet = m_view->appletWidget()->applet (); QStringList::const_iterator it = args.begin(); const QStringList::const_iterator itEnd = args.end(); for ( ; it != itEnd; ++it) { @@ -257,24 +257,24 @@ classname = value; else if (name_lower == QString::fromLatin1("src")) src_param = value; - else if (name_lower == QString::fromLatin1("archive") || +/* else if (name_lower == QString::fromLatin1("archive") || name_lower == QString::fromLatin1("java_archive") || name_lower.startsWith ("cache_archive")) applet->setArchives (value); - else if (name_lower == QString::fromLatin1("name")) +*//* else if (name_lower == QString::fromLatin1("name")) applet->setAppletName (value); - else if (name_lower == QString::fromLatin1("width")) + */ else if (name_lower == QString::fromLatin1("width")) width = value.toInt(); else if (name_lower == QString::fromLatin1("height")) height = value.toInt(); - if (!name.startsWith ("__KHTML__")) { +/* if (!name.startsWith ("__KHTML__")) { applet->setParameter (name, value); } - } +*/ } } } if (!classid.isEmpty ()) { - applet->setParameter ("CLSID", classid); +// applet->setParameter ("CLSID", classid); kdDebug(6100) << "classid=" << classid << classid.startsWith("clsid:")<< endl; if (classid.startsWith ("clsid:")) // codeBase contains the URL to the plugin page @@ -284,9 +284,9 @@ } if (classname.isEmpty ()) classname = src_param; - else if (!src_param.isEmpty ()) +/* else if (!src_param.isEmpty ()) applet->setParameter (QString ("SRC"), src_param); - if (codebase.isEmpty ()) +*/ if (codebase.isEmpty ()) codebase = khtml_codebase; if (baseurl.isEmpty ()) { // not embeded in khtml @@ -297,25 +297,25 @@ } if (width > 0 && height > 0) { m_view->resize (width, height); - applet->setSize( QSize( width, height ) ); +// applet->setSize( QSize( width, height ) ); } - applet->setBaseURL (baseurl); + // applet->setBaseURL (baseurl); // check codebase first const KURL kbaseURL( baseurl ); const KURL newURL(kbaseURL, codebase); - if (kapp->authorizeURLAction("redirect", KURL(baseurl), newURL)) - applet->setCodeBase (newURL.url()); - applet->setAppletClass (classname); - KJavaAppletContext* const cxt = serverMaintainer->getContext (parent, baseurl); - applet->setAppletContext (cxt); +// if (kapp->authorizeURLAction("redirect", KURL(baseurl), newURL)) +// applet->setCodeBase (newURL.url()); +// applet->setAppletClass (classname); +// KJavaAppletContext* const cxt = serverMaintainer->getContext (parent, baseurl); +// applet->setAppletContext (cxt); - KJavaAppletServer* const server = cxt->getServer (); +// KJavaAppletServer* const server = cxt->getServer (); - serverMaintainer->setServer (server); +// serverMaintainer->setServer (server); - if (!server->usingKIO ()) { +// if (!server->usingKIO ()) { /* if this page needs authentication */ - KIO::AuthInfo info; +/* KIO::AuthInfo info; QString errorMsg; QCString replyType; QByteArray params; @@ -339,7 +339,7 @@ applet->setAuthName (authResult.realmValue); } } - +*/ /* install event filter for close events */ if (wparent) wparent->topLevelWidget ()->installEventFilter (this); @@ -347,10 +347,10 @@ setInstance (KJavaAppletViewerFactory::instance ()); KParts::Part::setWidget (m_view); - connect (applet->getContext(), SIGNAL(appletLoaded()), this, SLOT(appletLoaded())); - connect (applet->getContext(), SIGNAL(showDocument(const QString&, const QString&)), m_browserextension, SLOT(showDocument(const QString&, const QString&))); - connect (applet->getContext(), SIGNAL(showStatus(const QString &)), this, SLOT(infoMessage(const QString &))); - connect (applet, SIGNAL(jsEvent (const QStringList &)), m_liveconnect, SLOT(jsEvent (const QStringList &))); +// connect (applet->getContext(), SIGNAL(appletLoaded()), this, SLOT(appletLoaded())); +// connect (applet->getContext(), SIGNAL(showDocument(const QString&, const QString&)), m_browserextension, SLOT(showDocument(const QString&, const QString&))); +// connect (applet->getContext(), SIGNAL(showStatus(const QString &)), this, SLOT(infoMessage(const QString &))); + // connect (applet, SIGNAL(jsEvent (const QStringList &)), m_liveconnect, SLOT(jsEvent (const QStringList &))); } bool KJavaAppletViewer::eventFilter (QObject *o, QEvent *e) { @@ -379,9 +379,9 @@ bool KJavaAppletViewer::openURL (const KURL & url) { if (!m_view) return false; m_closed = false; - KJavaAppletWidget* const w = m_view->appletWidget (); - KJavaApplet* const applet = w->applet (); - if (applet->isCreated ()) +// KJavaAppletWidget* const w = m_view->appletWidget (); +// KJavaApplet* const applet = w->applet (); +/* if (applet->isCreated ()) applet->stop (); if (applet->appletClass ().isEmpty ()) { // preview without setting a class? @@ -393,7 +393,7 @@ AppletParameterDialog (w).exec (); applet->setSize (w->sizeHint()); } - if (!m_statusbar_icon) { +*/ if (!m_statusbar_icon) { KStatusBar *sb = m_statusbar->statusBar(); if (sb) { m_statusbar_icon = new StatusBarIcon (sb); @@ -401,11 +401,11 @@ } } // delay showApplet if size is unknown and m_view not shown - if (applet->size().width() > 0 || m_view->isVisible()) - w->showApplet (); - else - QTimer::singleShot (10, this, SLOT (delayedCreateTimeOut ())); - if (!applet->failed ()) +// if (applet->size().width() > 0 || m_view->isVisible()) +// w->showApplet (); +// else +// QTimer::singleShot (10, this, SLOT (delayedCreateTimeOut ())); +// if (!applet->failed ()) emit started (0L); return url.isValid (); } @@ -413,17 +413,18 @@ bool KJavaAppletViewer::closeURL () { kdDebug(6100) << "closeURL" << endl; m_closed = true; - KJavaApplet* const applet = m_view->appletWidget ()->applet (); - if (applet->isCreated ()) - applet->stop (); - applet->getContext()->getServer()->endWaitForReturnData(); +// KJavaApplet* const applet = m_view->appletWidget ()->applet (); +// if (applet->isCreated ()) +// applet->stop (); +// applet->getContext()->getServer()->endWaitForReturnData(); return true; } bool KJavaAppletViewer::appletAlive () const { - return !m_closed && m_view && - m_view->appletWidget ()->applet () && - m_view->appletWidget ()->applet ()->isAlive (); +// return !m_closed && m_view && +// m_view->appletWidget ()->applet () && +// m_view->appletWidget ()->applet ()->isAlive (); +return false; } bool KJavaAppletViewer::openFile () { @@ -431,15 +432,15 @@ } void KJavaAppletViewer::delayedCreateTimeOut () { - KJavaAppletWidget* const w = m_view->appletWidget (); - if (!w->applet ()->isCreated () && !m_closed) - w->showApplet (); +// KJavaAppletWidget* const w = m_view->appletWidget (); +// if (!w->applet ()->isCreated () && !m_closed) +// w->showApplet (); } void KJavaAppletViewer::appletLoaded () { if (!m_view) return; - KJavaApplet* const applet = m_view->appletWidget ()->applet (); - if (applet->isAlive() || applet->failed()) +// KJavaApplet* const applet = m_view->appletWidget ()->applet (); +// if (applet->isAlive() || applet->failed()) emit completed(); } @@ -469,8 +470,8 @@ } void KJavaAppletViewerBrowserExtension::saveState (QDataStream & stream) { - KJavaApplet* const applet = static_cast(parent())->view()->appletWidget ()->applet (); - stream << applet->appletClass(); +// KJavaApplet* const applet = static_cast(parent())->view()->appletWidget ()->applet (); +/* stream << applet->appletClass(); stream << applet->baseURL(); stream << applet->archives(); stream << applet->getParams().size (); @@ -480,15 +481,15 @@ stream << it.key (); stream << it.data (); } -} +*/} void KJavaAppletViewerBrowserExtension::restoreState (QDataStream & stream) { - KJavaAppletWidget* const w = static_cast(parent())->view()->appletWidget(); - KJavaApplet* const applet = w->applet (); +// KJavaAppletWidget* const w = static_cast(parent())->view()->appletWidget(); +// KJavaApplet* const applet = w->applet (); QString key, val; int paramcount; stream >> val; - applet->setAppletClass (val); +/* applet->setAppletClass (val); stream >> val; applet->setBaseURL (val); stream >> val; @@ -503,7 +504,7 @@ applet->setSize (w->sizeHint ()); if (w->isVisible()) w->showApplet (); -} +*/} void KJavaAppletViewerBrowserExtension::showDocument (const QString & doc, const QString & frame) { @@ -527,8 +528,8 @@ if (!m_viewer->appletAlive ()) return false; QStringList args, ret_args; - KJavaApplet* const applet = m_viewer->view ()->appletWidget ()->applet (); - args.append (QString::number (applet->appletId ())); +// KJavaApplet* const applet = m_viewer->view ()->appletWidget ()->applet (); +/* args.append (QString::number (applet->appletId ())); args.append (QString::number ((int) objid)); args.append (name); m_jssessions++; @@ -542,7 +543,7 @@ rid = ret_args[1].toInt (&ok); if (!ok) return false; value = ret_args[2]; - return true; +*/ return true; } bool KJavaAppletViewerLiveConnectExtension::put(const unsigned long objid, const QString & name, const QString & value) @@ -550,24 +551,25 @@ if (!m_viewer->appletAlive ()) return false; QStringList args; - KJavaApplet* const applet = m_viewer->view ()->appletWidget ()->applet (); - args.append (QString::number (applet->appletId ())); +// KJavaApplet* const applet = m_viewer->view ()->appletWidget ()->applet (); +// args.append (QString::number (applet->appletId ())); args.append (QString::number ((int) objid)); args.append (name); args.append (value); ++m_jssessions; - const bool ret = applet->getContext()->putMember (args); +// const bool ret = applet->getContext()->putMember (args); --m_jssessions; - return ret; +// return ret; +return false; } bool KJavaAppletViewerLiveConnectExtension::call( const unsigned long objid, const QString & func, const QStringList & fargs, KParts::LiveConnectExtension::Type & type, unsigned long & retobjid, QString & value ) { if (!m_viewer->appletAlive ()) return false; - KJavaApplet* const applet = m_viewer->view ()->appletWidget ()->applet (); +// KJavaApplet* const applet = m_viewer->view ()->appletWidget ()->applet (); QStringList args, ret_args; - args.append (QString::number (applet->appletId ())); +// args.append (QString::number (applet->appletId ())); args.append (QString::number ((int) objid)); args.append (func); { @@ -578,33 +580,33 @@ } ++m_jssessions; - const bool ret = applet->getContext()->callMember (args, ret_args); + // const bool ret = applet->getContext()->callMember (args, ret_args); --m_jssessions; - if (!ret || ret_args.count () != 3) return false; + // if (!ret || ret_args.count () != 3) return false; bool ok; - const int itype = ret_args[0].toInt (&ok); - if (!ok || itype < 0) return false; - type = (KParts::LiveConnectExtension::Type) itype; - retobjid = ret_args[1].toInt (&ok); - if (!ok) return false; - value = ret_args[2]; - return true; + // const int itype = ret_args[0].toInt (&ok); + // if (!ok || itype < 0) return false; + // type = (KParts::LiveConnectExtension::Type) itype; +// retobjid = ret_args[1].toInt (&ok); +/* if (!ok)*/ return false; + // value = ret_args[2]; + // return true; } void KJavaAppletViewerLiveConnectExtension::unregister(const unsigned long objid) { if (!m_viewer->view () || !m_viewer->view ()) return; - KJavaApplet* const applet = m_viewer->view ()->appletWidget ()->applet (); - if (!applet || objid == 0) { +// KJavaApplet* const applet = m_viewer->view ()->appletWidget ()->applet (); +// if (!applet || objid == 0) { // typically a gc after a function call on the applet, // no need to send to the jvm return; - } +// } QStringList args; - args.append (QString::number (applet->appletId ())); +// args.append (QString::number (applet->appletId ())); args.append (QString::number ((int) objid)); - applet->getContext()->derefObject (args); +// applet->getContext()->derefObject (args); } void KJavaAppletViewerLiveConnectExtension::jsEvent (const QStringList & args) { diff -urEb kdelibs-3.5.0_/khtml/java/kjavaappletviewer.h kdelibs-3.5.0/khtml/java/kjavaappletviewer.h --- kdelibs-3.5.0_/khtml/java/kjavaappletviewer.h 2005-10-10 17:06:12.000000000 +0200 +++ kdelibs-3.5.0/khtml/java/kjavaappletviewer.h 2005-12-08 22:52:27.000000000 +0100 @@ -134,11 +134,11 @@ class AppletParameterDialog : public KDialogBase { Q_OBJECT public: - AppletParameterDialog (KJavaAppletWidget * parent); +// AppletParameterDialog (KJavaAppletWidget * parent); protected slots: void slotClose (); private: - KJavaAppletWidget * m_appletWidget; +// KJavaAppletWidget * m_appletWidget; QTable * table; }; diff -urEb kdelibs-3.5.0_/khtml/java/kjavaappletwidget.cpp kdelibs-3.5.0/khtml/java/kjavaappletwidget.cpp --- kdelibs-3.5.0_/khtml/java/kjavaappletwidget.cpp 2005-10-10 17:06:12.000000000 +0200 +++ kdelibs-3.5.0/khtml/java/kjavaappletwidget.cpp 2005-12-08 22:51:03.000000000 +0100 @@ -28,7 +28,8 @@ #include - +// AGAIN, THIS IS USELESS +/* // For future expansion class KJavaAppletWidgetPrivate { @@ -136,5 +137,6 @@ showApplet(); } } +*/ +//#include "kjavaappletwidget.moc" -#include "kjavaappletwidget.moc" diff -urEb kdelibs-3.5.0_/khtml/java/kjavaappletwidget.h kdelibs-3.5.0/khtml/java/kjavaappletwidget.h --- kdelibs-3.5.0_/khtml/java/kjavaappletwidget.h 2005-10-10 17:06:12.000000000 +0200 +++ kdelibs-3.5.0/khtml/java/kjavaappletwidget.h 2005-12-08 22:47:09.000000000 +0100 @@ -25,7 +25,8 @@ #define KJAVAAPPLETWIDGET_H #include -#ifndef Q_WS_QWS //FIXME(?) I don't think this is possible with Qt Embedded +//#ifndef Q_WS_QWS //FIXME(?) I don't think this is possible with Qt Embedded +#ifdef Q_WS_QWS // dont want to compile this for mac #include "java/kjavaappletcontext.h" #include "java/kjavaapplet.h" #include diff -urEb kdelibs-3.5.0_/khtml/khtmlview.cpp kdelibs-3.5.0/khtml/khtmlview.cpp --- kdelibs-3.5.0_/khtml/khtmlview.cpp 2005-11-19 10:07:49.000000000 +0100 +++ kdelibs-3.5.0/khtml/khtmlview.cpp 2005-12-08 23:35:42.000000000 +0100 @@ -93,8 +93,8 @@ //#define DEBUG_PIXEL -#include -#include +//#include +//#include #define PAINT_BUFFER_HEIGHT 128 @@ -1183,9 +1183,9 @@ if( !d->cursor_icon_widget ) { QPixmap icon_pixmap = KGlobal::iconLoader()->loadIcon( "mail_generic", KIcon::Small, 0, KIcon::DefaultState, 0, true ); d->cursor_icon_widget = new QWidget( NULL, NULL, WX11BypassWM ); - XSetWindowAttributes attr; - attr.save_under = True; - XChangeWindowAttributes( qt_xdisplay(), d->cursor_icon_widget->winId(), CWSaveUnder, &attr ); +// XSetWindowAttributes attr; +// attr.save_under = True; +// XChangeWindowAttributes( qt_xdisplay(), d->cursor_icon_widget->winId(), CWSaveUnder, &attr ); d->cursor_icon_widget->resize( icon_pixmap.width(), icon_pixmap.height()); if( icon_pixmap.mask() ) d->cursor_icon_widget->setMask( *icon_pixmap.mask()); @@ -1196,7 +1196,7 @@ } QPoint c_pos = QCursor::pos(); d->cursor_icon_widget->move( c_pos.x() + 15, c_pos.y() + 15 ); - XRaiseWindow( qt_xdisplay(), d->cursor_icon_widget->winId()); +// XRaiseWindow( qt_xdisplay(), d->cursor_icon_widget->winId()); QApplication::flushX(); d->cursor_icon_widget->show(); } diff -urEb kdelibs-3.5.0_/kioslave/file/file.cc kdelibs-3.5.0/kioslave/file/file.cc --- kdelibs-3.5.0_/kioslave/file/file.cc 2005-10-10 17:05:36.000000000 +0200 +++ kdelibs-3.5.0/kioslave/file/file.cc 2005-12-08 19:37:24.000000000 +0100 @@ -277,7 +277,7 @@ error( KIO::ERR_CANNOT_OPEN_FOR_READING, url.path() ); return; } - +#undef HAVE_FADVISE #ifdef HAVE_FADVISE posix_fadvise( fd, 0, 0, POSIX_FADV_SEQUENTIAL); #endif diff -urEb kdelibs-3.5.0_/kutils/kcmoduleproxy.cpp kdelibs-3.5.0/kutils/kcmoduleproxy.cpp --- kdelibs-3.5.0_/kutils/kcmoduleproxy.cpp 2005-10-10 17:05:54.000000000 +0200 +++ kdelibs-3.5.0/kutils/kcmoduleproxy.cpp 2005-12-08 20:05:54.000000000 +0100 @@ -48,7 +48,7 @@ #include #include -#include +//#include #include "kcmoduleproxy.h" #include "kcmoduleproxyIface.h" @@ -62,7 +62,7 @@ : args( 0 ) , kcm( 0 ) //, view( 0 ) - , embedWidget( 0 ) +// , embedWidget( 0 ) , rootProcess ( 0 ) , embedFrame ( 0 ) , dcopObject( 0 ) @@ -81,7 +81,7 @@ ~KCModuleProxyPrivate() { delete rootInfo; // Delete before embedWidget! - delete embedWidget; // Delete before embedFrame! +// delete embedWidget; // Delete before embedFrame! delete embedFrame; delete dcopClient; delete dcopObject; @@ -92,7 +92,7 @@ QStringList args; KCModule *kcm; - QXEmbed *embedWidget; +// QXEmbed *embedWidget; KProcess *rootProcess; QVBox *embedFrame; KCModuleProxyIfaceImpl *dcopObject; @@ -303,7 +303,7 @@ QApplication::setOverrideCursor( Qt::WaitCursor ); delete d->rootProcess; - delete d->embedWidget; +// delete d->embedWidget; delete d->embedFrame; d->embedFrame = new QVBox( this, "embedFrame" ); @@ -317,16 +317,16 @@ d->embedFrame->setMidLineWidth( 2 ); d->topLayout->addWidget(d->embedFrame,1); - d->embedWidget = new QXEmbed( d->embedFrame, "embedWidget" ); +// d->embedWidget = new QXEmbed( d->embedFrame, "embedWidget" ); d->embedFrame->show(); - QLabel *lblBusy = new QLabel(i18n("Loading..."), d->embedWidget, "lblBusy" ); +/* QLabel *lblBusy = new QLabel(i18n("Loading..."), d->embedWidget, "lblBusy" ); lblBusy->setTextFormat(RichText); lblBusy->setAlignment(AlignCenter); lblBusy->setGeometry(0,0, d->kcm->width(), d->kcm->height()); lblBusy->show(); - +*/ deleteClient(); /* The DCOP registration is now gone, and it will occur again when kcmshell soon * registers. Here's a race condition in other words, but how likely is that? @@ -363,9 +363,9 @@ *d->rootProcess << kdesu; *d->rootProcess << "--nonewdcop" << "-n" << "-d" << QString( "-i%1" ).arg(moduleInfo().icon()); - *d->rootProcess << QString("kcmshell %1 --embed-proxy %2 --lang %3").arg(cmd).arg +/* *d->rootProcess << QString("kcmshell %1 --embed-proxy %2 --lang %3").arg(cmd).arg (d->embedWidget->winId()).arg(KGlobal::locale()->language()); - +*/ connect(d->rootProcess, SIGNAL(processExited(KProcess*)), SLOT(rootExited())); if ( !d->rootProcess->start( KProcess::NotifyOnExit )) @@ -380,14 +380,14 @@ d->rootCommunicator = new KCModuleProxyRootCommunicatorImpl( d->dcopName + "-RootCommunicator", this ); } - delete lblBusy; +// delete lblBusy; QApplication::restoreOverrideCursor(); return; } /* Clean up in case of failure */ - delete d->embedWidget; - d->embedWidget = 0; +// delete d->embedWidget; +// d->embedWidget = 0; delete d->embedFrame; d->embedFrame = 0; @@ -398,11 +398,11 @@ { kdDebug(711) << k_funcinfo << endl; - if ( d->embedWidget->embeddedWinId() ) +/* if ( d->embedWidget->embeddedWinId() ) XDestroyWindow(qt_xdisplay(), d->embedWidget->embeddedWinId()); - - delete d->embedWidget; - d->embedWidget = 0; +*/ +// delete d->embedWidget; +// d->embedWidget = 0; delete d->rootProcess; d->rootProcess = 0; @@ -435,9 +435,9 @@ void KCModuleProxy::deleteClient() { - if( d->embedWidget ) +/* if( d->embedWidget ) XKillClient(qt_xdisplay(), d->embedWidget->embeddedWinId()); - +*/ delete d->kcm; d->kcm = 0; diff -urEb kdelibs-3.5.0_/libltdl/ltdl.c kdelibs-3.5.0/libltdl/ltdl.c --- kdelibs-3.5.0_/libltdl/ltdl.c 2005-11-09 10:30:00.000000000 +0100 +++ kdelibs-3.5.0/libltdl/ltdl.c 2005-12-08 13:05:15.000000000 +0100 @@ -670,6 +670,8 @@ /* --- SHL_LOAD() INTERFACE LOADER --- */ +#undef HAVE_SHL_LOAD + #if HAVE_SHL_LOAD /* dynamic linking with shl_load (HP-UX) (comments from gmodule) */ @@ -716,6 +718,16 @@ # define BIND_RESTRICTED 0 #endif +//** NOT SURE WHETHER I SHOULD DECLARE THESE, BUT IT COMPILES... +#ifndef BIND_IMMEDIATE +#define BIND_IMMEDIATE 0 +#endif +#ifndef BIND_NONFATAL +#define BIND_NONFATAL 0 +#endif + +//** end shit shit shit + #define LT_BIND_FLAGS (BIND_IMMEDIATE | BIND_NONFATAL | DYNAMIC_PATH) static lt_module @@ -729,7 +741,7 @@ if (filename) { - module = shl_load (filename, LT_BIND_FLAGS, 0L); +#pragma module = shl_load (filename, LT_BIND_FLAGS, 0L); if (!module) {