fix includes

4 files changed, 0 insertions, 31 deletions

diff --git a/core/qws/main.cpp b/core/qws/main.cpp
index bfed283..1c3c621 100644
--- a/core/qws/main.cpp
+++ b/core/qws/main.cpp
@@ -1,71 +1,69 @@
-#include <qwindowsystem_qws.h>
-#include <qapplication.h>
 
 #include "oqwsserver.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h> 
 
 #include <syslog.h>
 #include <stdio.h>
 
 #define APPNAME "op-qws"
 
 void toSyslog(QtMsgType type, const char *msg)
 {
     int level = LOG_INFO;
     switch (type) {
         case QtDebugMsg:
             level = LOG_DEBUG;
             break;
         case QtWarningMsg:
             level = LOG_WARNING;
             break;
         case QtFatalMsg:
             level = LOG_ERR;
             break;
     }
     syslog (LOG_DAEMON | level, msg);
 }
 
 int daemon_init(void)
 {
     pid_t pid;
 
     if ((pid = fork()) < 0)
         return(-1);
     else if (pid != 0)
         exit(0);
 
     setsid();
 
     chdir("/");	
 
     umask(0);
 
     fclose(stdout);
     fclose(stderr);
     fclose(stdin);
 
     return(0);
 }
 
 int main( int argc, char ** argv )
 {
     while (argc > 1) {
         if (strcmp(argv[--argc], "-d") == 0) {
             // daemonize
             openlog(APPNAME, 0, LOG_DAEMON);
             qInstallMsgHandler(toSyslog);
             if (daemon_init() != 0) {
                 fprintf(stderr, "%s: Error: Unable to daemonize\n", APPNAME);
                 return 1;
 	    }
 	}
     }
 
     OQWSServer a(argc, argv, QApplication::GuiServer);
     return a.exec();
 }
diff --git a/core/qws/oqwsserver.cpp b/core/qws/oqwsserver.cpp
index 1c61d19..907686a 100644
--- a/core/qws/oqwsserver.cpp
+++ b/core/qws/oqwsserver.cpp
@@ -1,196 +1,181 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #include <syslog.h>
 
 #include "oqwsserver.h"
 #include "qcopbridge.h"
 #include "transferserver.h"
 
-#include <qpe/applnk.h>
-#include <qpe/mimetype.h>
-#include <qpe/password.h>
-#include <qpe/config.h>
-#include <qpe/power.h>
-#include <qpe/timeconversion.h>
-#include <qpe/qcopenvelope_qws.h>
-#include <qpe/network.h>
-#include <qpe/global.h>
 
 #if defined( QT_QWS_SL5XXX ) || defined( QT_QWS_IPAQ )
 #include <qpe/custom.h>
 #endif
 
 #include <opie/odevice.h>
 
-#include <qgfx_qws.h>
-#include <qmainwindow.h>
-#include <qmessagebox.h>
-#include <qtimer.h>
-#include <qwindowsystem_qws.h>
 
-#include <qvaluelist.h>
 
 #include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
 
 using namespace Opie;
 
 OQWSServer::OQWSServer( int& argc, char **argv, Type appType )
 	: QPEApplication( argc, argv, appType )
 {
 	startServers();
 }
 
 OQWSServer::~OQWSServer()
 {
 	terminateServers();
 }
 
 bool OQWSServer::eventFilter ( QObject *o, QEvent *e )
 {
 #if 0
 	if ( e-> type ( ) == QEvent::KeyPress || e-> type ( ) == QEvent::KeyRelease ) {
 		QKeyEvent *ke = (QKeyEvent *) e;
 	
 		const ODeviceButton *db = ODevice::inst ( )-> buttonForKeycode ( ke-> key ( ));
         
 		if ( db ) {
 			if (checkButtonAction ( db, ke-> key ( ), e-> type ( ) == QEvent::KeyPress, ke-> isAutoRepeat ( )))
 				return true;		//checkButtonAction retrune false if events should be routed through
 		}
 	}
 #endif
 	return QPEApplication::eventFilter ( o, e );
 }
 
 #ifdef Q_WS_QWS
 
 bool OQWSServer::qwsEventFilter( QWSEvent *e )
 {
 #if 0
 	qpedesktop->checkMemory();
 
 	if ( e->type == QWSEvent::Key ) {
 		QWSKeyEvent * ke = (QWSKeyEvent *) e;
 		ushort keycode = ke-> simpleData. keycode;
 
 		if ( !loggedin && keycode != Key_F34 )
 			return true;
 			
 		bool press = ke-> simpleData. is_press;
 		bool autoRepeat = ke-> simpleData. is_auto_repeat;
 
 		if ( !keyboardGrabbed ( )) {
 			// app that registers key/message to be sent back to the app, when it doesn't have focus,
 			// when user presses key, unless keyboard has been requested from app.
 			// will not send multiple repeats if user holds key
 			// i.e. one shot
 		 
 			if ( keycode != 0 && press && !autoRepeat ) {
 				for ( KeyRegisterList::Iterator it = keyRegisterList.begin(); it != keyRegisterList.end(); ++it ) {
 					if (( *it ). getKeyCode ( ) == keycode ) {
 						QCopEnvelope (( *it ). getChannel ( ), ( *it ). getMessage ( ));
 						return true;
 					}
 				}
 			}
 		}
 
 		if ( keycode == HardKey_Suspend ) {
 			if ( press )
 				emit power ( );
 			return true;
 		}
 		else if ( keycode == HardKey_Backlight ) {
 			if ( press )
 				emit backlight ( );
 			return true;
 		}
 		else if ( keycode == Key_F32 ) {
 			if ( press )
 				QCopEnvelope e( "QPE/Desktop", "startSync()" );
 			return true;
 		}
 		else if ( keycode == Key_F31 && !ke-> simpleData. modifiers ) { // Symbol Key -> show Unicode IM
 			if ( press )
 				emit symbol ( );
 			return true;
 		}
 		else if ( keycode == Key_NumLock ) {
 			if ( press )
 				emit numLockStateToggle ( );
 		}
 		else if ( keycode == Key_CapsLock ) {
 			if ( press )
 				emit capsLockStateToggle();
 		}
 		if (( press && !autoRepeat ) || ( !press && autoRepeat )) {
 			if ( m_keyclick_sound )
 				ODevice::inst ( )-> keySound ( );
 		}
 	}
 	else if ( e-> type == QWSEvent::Mouse ) {
 		QWSMouseEvent * me = ( QWSMouseEvent * ) e;
 		static bool up = true;
 
 		if ( me-> simpleData. state & LeftButton ) {
 			if ( up ) {
 				up = false;
 				if ( m_screentap_sound )
 					ODevice::inst ( ) -> touchSound ( );
 			}
 		}
 		else {
 			up = true;
 		}
 	}
 #endif
 	return QPEApplication::qwsEventFilter ( e );
 }
 
 #endif
 
 void OQWSServer::startServers()
 {
 	// start qcop bridge server
 	m_qcopBridge = new QCopBridge( 4243 );
 	if ( !m_qcopBridge->ok() ) {
 		delete m_qcopBridge;
 		m_qcopBridge = 0;
 	}
 	// start transfer server
 	m_transferServer = new TransferServer( 4242 );
 	if ( !m_transferServer->ok() ) {
 		delete m_transferServer;
 		m_transferServer = 0;
 	}
 //	if ( !transferServer || !qcopBridge )
 //		startTimer( 2000 );
 }
 
 void OQWSServer::terminateServers()
 {
 	delete m_transferServer;
 	delete m_qcopBridge;
 	m_transferServer = 0;
 	m_qcopBridge = 0;
 }
diff --git a/core/qws/qcopbridge.cpp b/core/qws/qcopbridge.cpp
index 6177a7c..c0c52e8 100644
--- a/core/qws/qcopbridge.cpp
+++ b/core/qws/qcopbridge.cpp
@@ -1,226 +1,220 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #include "qcopbridge.h"
 #include "transferserver.h"
 
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/version.h>
 
-#include <qdir.h>
-#include <qfile.h>
 #include <qtextstream.h>
-#include <qdatastream.h>
-#include <qstringlist.h>
-#include <qfileinfo.h>
-#include <qregexp.h>
 #ifdef QWS
 #include <qcopchannel_qws.h>
 #endif
 
 #define _XOPEN_SOURCE
 #include <pwd.h>
 #include <sys/types.h>
 #include <unistd.h>
 
 #if defined(_OS_LINUX_)
 #include <shadow.h>
 #endif
 
 //#define INSECURE
 
 const int block_size = 51200;
 
 QCopBridge::QCopBridge( Q_UINT16 port, QObject *parent ,
         const char* name )
     : QServerSocket( port, 1, parent, name ),
       desktopChannel( 0 ),
       cardChannel( 0 )
 {
     if ( !ok() )
 	qWarning( "Failed to bind to port %d", port );
     else {
 #ifndef QT_NO_COP
 	desktopChannel = new QCopChannel( "QPE/Desktop", this );
 	connect( desktopChannel, SIGNAL(received(const QCString &, const QByteArray &)),
 		 this, SLOT(desktopMessage( const QCString &, const QByteArray &)) );
 	cardChannel = new QCopChannel( "QPE/Card", this );
 	connect( cardChannel, SIGNAL(received(const QCString &, const QByteArray &)),
 		 this, SLOT(desktopMessage( const QCString &, const QByteArray &)) );
 #endif
     }
     sendSync = FALSE;
 }
 
 QCopBridge::~QCopBridge()
 {
 #ifndef QT_NO_COP
     delete desktopChannel;
 #endif
 }
 
 void QCopBridge::newConnection( int socket )
 {
     QCopBridgePI *pi = new QCopBridgePI( socket, this );
     openConnections.append( pi );
     connect ( pi, SIGNAL( connectionClosed( QCopBridgePI *) ), this, SLOT( connectionClosed( QCopBridgePI *) ) );
 #ifndef QT_NO_COP
     QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::DisableSuspend;
 #endif
 
     if ( sendSync ) {
 	pi ->startSync();
 	sendSync = FALSE;
     }
 }
 
 void QCopBridge::connectionClosed( QCopBridgePI *pi )
 {
     openConnections.remove( pi );
     if ( openConnections.count() == 0 ) {
 #ifndef QT_NO_COP
 	QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable;
 #endif
     }
 }
 
 void QCopBridge::closeOpenConnections()
 {
     QCopBridgePI *pi;
     for ( pi = openConnections.first(); pi != 0; pi = openConnections.next() )
 	pi->close();
 }
 
 
 void QCopBridge::desktopMessage( const QCString &command, const QByteArray &args )
 {
     command.stripWhiteSpace();
 
     int paren = command.find( "(" );
     if ( paren <= 0 ) {
 	qDebug("DesktopMessage: bad qcop syntax");
 	return;
     }
 
     QString params = command.mid( paren + 1 );
     if ( params[params.length()-1] != ')' ) {
 	qDebug("DesktopMessage: bad qcop syntax");
 	return;
     }
 
     params.truncate( params.length()-1 );
 
     QStringList paramList = QStringList::split( ",", params );
     QString data;
     if ( paramList.count() ) {
 	QDataStream stream( args, IO_ReadOnly );
 	for ( QStringList::Iterator it = paramList.begin(); it != paramList.end(); ++it ) {
 	    QString str;
 	    if ( *it == "QString" ) {
 		stream >> str;
 	    } else if ( *it == "QCString" ) {
 		QCString cstr;
 		stream >> cstr;
 		str = QString::fromLocal8Bit( cstr );
 	    } else if ( *it == "int" ) {
 		int i;
 		stream >> i;
 		str = QString::number( i );
 	    } else if ( *it == "bool" ) {
 		int i;
 		stream >> i;
 		str = QString::number( i );
 	    } else {
 		qDebug(" cannot route the argument type %s throught the qcop bridge", (*it).latin1() );
 		return;
 	    }
 	    QString estr;
 	    for (int i=0; i<(int)str.length(); i++) {
 		QChar ch = str[i];
 		if ( ch.row() )
 		    goto quick;
 		switch (ch.cell()) {
 		    case '&':
 			estr.append( "&amp;" );
 			break;
 		    case ' ':
 			estr.append( "&0x20;" );
 			break;
 		    case '\n':
 			estr.append( "&0x0d;" );
 			break;
 		    case '\r':
 			estr.append( "&0x0a;" );
 			break;
 		    default: quick:
 			estr.append(ch);
 		}
 	    }
 	    data += " " + estr;
 	}
     }
     QString sendCommand = QString(command.data()) + data;
     // send the command to all open connections
     if ( command == "startSync()" ) {
 	// we need to buffer it a bit
 	sendSync = TRUE;
 	startTimer( 20000 );
     }
 
     QCopBridgePI *pi;
     for ( pi = openConnections.first(); pi != 0; pi = openConnections.next() ) {
 	pi->sendDesktopMessage( sendCommand );
     }
 }
 
 void QCopBridge::timerEvent( QTimerEvent * )
 {
     sendSync = FALSE;
     killTimers();
 }
 
 
 QCopBridgePI::QCopBridgePI( int socket, QObject *parent , const char* name )
     : QSocket( parent, name )
 {
     setSocket( socket );
 
     peerport = peerPort();
     peeraddress = peerAddress();
 
 #ifndef INSECURE
     if ( !SyncAuthentication::isAuthorized(peeraddress) ) {
 	state = Forbidden;
 	startTimer( 0 );
     } else
 #endif	
     {
 	state = Connected;
 	sendSync = FALSE;
 	connect( this, SIGNAL( readyRead() ), SLOT( read() ) );
 	connect( this, SIGNAL( connectionClosed() ), SLOT( connectionClosed() ) );
 
 	QString intro="220 Qtopia ";
 	intro += QPE_VERSION; intro += ";";
 	intro += "challenge="; intro += SyncAuthentication::serverId(); intro += ";";
 	intro += "loginname="; intro += SyncAuthentication::loginName(); intro += ";";
 	intro += "displayname="; intro += SyncAuthentication::ownerName(); intro += ";";
 	send( intro );
diff --git a/core/qws/transferserver.cpp b/core/qws/transferserver.cpp
index 239c824..30bf438 100644
--- a/core/qws/transferserver.cpp
+++ b/core/qws/transferserver.cpp
@@ -1,262 +1,254 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #define _XOPEN_SOURCE
 #include <pwd.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <time.h>
 
 #ifndef Q_OS_MACX
 #include <shadow.h>
 #endif /* Q_OS_MACX */
 
 /* we need the _OS_LINUX stuff first ! */
-#include <qglobal.h>
 
 #ifndef  _OS_LINUX_
 // Is anybody able to review this ? The include "uuid/uuid.h" couldn't be found
 // anywhere ? Therfore I removed it completely..
 // I think it should be made permanentyl !? (eilers)
 #warning "Where should uuid/uuid.h be found ? Removed this part .. (eilers)"
 #if 0
 
 extern "C"
 {
 #include <uuid/uuid.h>
 #define UUID_H_INCLUDED
 }
 
 #endif
 
 #endif // not defined linux
 
 #if defined(_OS_LINUX_)
 #include <shadow.h>
 #elif defined(Q_OS_MACX)
 #include <stdlib.h>
 #endif
 
-#include <qdir.h>
-#include <qfile.h>
 #include <qtextstream.h>
-#include <qdatastream.h>
 #include <qmessagebox.h>
-#include <qstringlist.h>
-#include <qfileinfo.h>
-#include <qregexp.h> 
 //#include <qpe/qcopchannel_qws.h>
 #include <qpe/process.h>
 #include <qpe/global.h>
 #include <qpe/config.h>
 #include <qpe/contact.h>
-#include <qpe/quuid.h>
 #include <qpe/version.h>
 #include <qpe/qcopenvelope_qws.h>
 
 #include "transferserver.h"
 #include <opie/oprocess.h>
 
 const int block_size = 51200;
 
 TransferServer::TransferServer( Q_UINT16 port, QObject *parent ,
                                 const char* name )
 		: QServerSocket( port, 1, parent, name )
 {
 	if ( !ok() )
 		qWarning( "Failed to bind to port %d", port );
 }
 
 TransferServer::~TransferServer()
 {
 }
 
 void TransferServer::newConnection( int socket )
 {
 	(void) new ServerPI( socket, this );
 }
 
 /*
  * small class in anonymous namespace
  * to generate a QUUid for us
  */
 namespace
 {
 struct UidGen
 {
 	QString uuid();
 };
 #if defined(Q_OS_MACX)
 QString UidGen::uuid()
 {
 	srandom( random() );
 	QString numStr = QString::number( random() );
 
 	return "{" + numStr + "}";
 }
 #elif defined(_OS_LINUX_)
 /*
 * linux got a /proc/sys/kernel/random/uuid file
 * it'll generate the uuids for us
 */
 QString UidGen::uuid()
 {
 	QFile file( "/proc/sys/kernel/random/uuid" );
 	if (!file.open(IO_ReadOnly ) )
 		return QString::null;
 
 	QTextStream stream(&file);
 
 	return "{" + stream.read().stripWhiteSpace() + "}";
 }
 #else
 QString UidGen::uuid()
 {
 	uuid_t uuid;
 	::uuid_generate( uuid );
 	return QUUid( uuid ).toString();
 }
 #endif
 }
 
 QString SyncAuthentication::serverId()
 {
 	Config cfg("Security");
 	cfg.setGroup("Sync");
 	QString r = cfg.readEntry("serverid");
 	if ( r.isEmpty() ) {
 		UidGen gen;
 		r = gen.uuid();
 		cfg.writeEntry("serverid", r );
 	}
 	return r;
 }
 
 QString SyncAuthentication::ownerName()
 {
 	QString vfilename = Global::applicationFileName("addressbook",
 	                    "businesscard.vcf");
 	if (QFile::exists(vfilename)) {
 		Contact c;
 		c = Contact::readVCard( vfilename )[0];
 		return c.fullName();
 	}
 
 	return "";
 }
 
 QString SyncAuthentication::loginName()
 {
 	struct passwd *pw;
 	pw = getpwuid( geteuid() );
 	return QString::fromLocal8Bit( pw->pw_name );
 }
 
 int SyncAuthentication::isAuthorized(QHostAddress peeraddress)
 {
 	Config cfg("Security");
 	cfg.setGroup("Sync");
 	//    QString allowedstr = cfg.readEntry("auth_peer","192.168.1.0");
 	uint auth_peer = cfg.readNumEntry("auth_peer", 0xc0a80100);
 
 	//    QHostAddress allowed;
 	//    allowed.setAddress(allowedstr);
 	//    uint auth_peer = allowed.ip4Addr();
 	uint auth_peer_bits = cfg.readNumEntry("auth_peer_bits", 24);
 	uint mask = auth_peer_bits >= 32 // shifting by 32 is not defined
 	            ? 0xffffffff : (((1 << auth_peer_bits) - 1) << (32 - auth_peer_bits));
 	return (peeraddress.ip4Addr() & mask) == auth_peer;
 }
 
 bool SyncAuthentication::checkUser( const QString& user )
 {
 	if ( user.isEmpty() )
 		return FALSE;
 	QString euser = loginName();
 	return user == euser;
 }
 
 bool SyncAuthentication::checkPassword( const QString& password )
 {
 #ifdef ALLOW_UNIX_USER_FTP
 	// First, check system password...
 
 	struct passwd *pw = 0;
 	struct spwd *spw = 0;
 
 	pw = getpwuid( geteuid() );
 	spw = getspnam( pw->pw_name );
 
 	QString cpwd = QString::fromLocal8Bit( pw->pw_passwd );
 	if ( cpwd == "x" && spw )
 		cpwd = QString::fromLocal8Bit( spw->sp_pwdp );
 
 	// Note: some systems use more than crypt for passwords.
 	QString cpassword = QString::fromLocal8Bit( crypt( password.local8Bit(), cpwd.local8Bit() ) );
 	if ( cpwd == cpassword )
 		return TRUE;
 #endif
 
 	static int lastdenial = 0;
 	static int denials = 0;
 	int now = time(0);
 
 	// Detect old Qtopia Desktop (no password)
 	if ( password.isEmpty() ) {
 		if ( denials < 1 || now > lastdenial + 600 ) {
 			QMessageBox::warning( 0, tr("Sync Connection"),
 			                      tr("<p>An unauthorized system is requesting access to this device."
 			                         "<p>If you are using a version of Qtopia Desktop older than 1.5.1, "
 			                         "please upgrade."),
 			                      tr("Deny") );
 			denials++;
 			lastdenial = now;
 		}
 		return FALSE;
 	}
 
 	// Second, check sync password...
 	QString pass = password.left(6);
 	/* old QtopiaDesktops are sending
 	 * rootme newer versions got a Qtopia
 	 * prefixed. Qtopia prefix will suceed
 	 * until the sync software syncs up
 	 * FIXME
 	 */
 	if ( pass == "rootme" || pass == "Qtopia") {
 
 		QString cpassword = QString::fromLocal8Bit( crypt( password.mid(8).local8Bit(), "qp" ) );
 		Config cfg("Security");
 		cfg.setGroup("Sync");
 		QString pwds = cfg.readEntry("Passwords");
 		if ( QStringList::split(QChar(' '), pwds).contains(cpassword) )
 			return TRUE;
 
 		// Unrecognized system. Be careful...
 
 		if ( (denials > 2 && now < lastdenial + 600)
 		        || QMessageBox::warning(0, tr("Sync Connection"),
 		                                tr("<p>An unrecognized system is requesting access to this device."
 		                                   "<p>If you have just initiated a Sync for the first time, this is normal."),
 		                                tr("Allow"), tr("Deny"), 0, 1, 1 ) == 1 ) {
 			denials++;
 			lastdenial = now;
 			return FALSE;
 		}