diff -up ./aboutdialog.cpp ../../qterm-0.4.0.new/qterm/aboutdialog.cpp
--- ./aboutdialog.cpp	2006-07-10 15:36:12.000000000 +0800
+++ ../../qterm-0.4.0.new/qterm/aboutdialog.cpp	2006-08-06 00:56:35.000000000 +0800
@@ -51,4 +51,3 @@ aboutDialog::~aboutDialog()
     // no need to delete child widgets, Qt does it all for us
 }
 
-#include <aboutdialog.moc>
diff -up ./aboutdialogui.cpp ../../qterm-0.4.0.new/qterm/aboutdialogui.cpp
--- ./aboutdialogui.cpp	2006-07-10 15:36:13.000000000 +0800
+++ ../../qterm-0.4.0.new/qterm/aboutdialogui.cpp	2006-08-06 00:56:47.000000000 +0800
@@ -116,4 +116,3 @@ void aboutDialogUI::languageChange()
     closeButton->setText( tr( "Close" ) );
 }
 
-#include <aboutdialogui.moc>
diff -up ./addrdialog.cpp ../../qterm-0.4.0.new/qterm/addrdialog.cpp
--- ./addrdialog.cpp	2006-07-10 15:36:13.000000000 +0800
+++ ../../qterm-0.4.0.new/qterm/addrdialog.cpp	2006-08-06 00:56:57.000000000 +0800
@@ -593,4 +593,3 @@ void addrDialog::updateData(bool save)
 		onMenuType(param.m_nMenuType);
 	}
 }
-#include <addrdialog.moc>
diff -up ./addrdialogui.cpp ../../qterm-0.4.0.new/qterm/addrdialogui.cpp
--- ./addrdialogui.cpp	2006-07-10 15:36:12.000000000 +0800
+++ ../../qterm-0.4.0.new/qterm/addrdialogui.cpp	2006-08-06 00:57:05.000000000 +0800
@@ -536,4 +536,3 @@ void addrDialogUI::languageChange()
     tabWidget->changeTab( tab_4, tr( "Mouse" ) );
 }
 
-#include <addrdialogui.moc>
diff -up ./articledialog.cpp ../../qterm-0.4.0.new/qterm/articledialog.cpp
--- ./articledialog.cpp	2006-07-10 15:36:12.000000000 +0800
+++ ../../qterm-0.4.0.new/qterm/articledialog.cpp	2006-08-06 00:57:14.000000000 +0800
@@ -108,4 +108,3 @@ void articleDialog::onClose()
 }
 
 
-#include <articledialog.moc>
diff -up ./articledialogui.cpp ../../qterm-0.4.0.new/qterm/articledialogui.cpp
--- ./articledialogui.cpp	2006-07-10 15:36:12.000000000 +0800
+++ ../../qterm-0.4.0.new/qterm/articledialogui.cpp	2006-08-06 00:57:22.000000000 +0800
@@ -86,4 +86,3 @@ void articleDialogUI::languageChange()
     textBrowser2->setText( QString::null );
 }
 
-#include <articledialogui.moc>
diff -up ./imageviewer.cpp ../../qterm-0.4.0.new/qterm/imageviewer.cpp
--- ./imageviewer.cpp	2006-07-10 15:36:12.000000000 +0800
+++ ../../qterm-0.4.0.new/qterm/imageviewer.cpp	2006-08-06 00:57:31.000000000 +0800
@@ -181,4 +181,3 @@ void ImageViewer::buildList()
 	}
 
 }
-#include <imageviewer.moc>
diff -up ./imageviewerui.cpp ../../qterm-0.4.0.new/qterm/imageviewerui.cpp
--- ./imageviewerui.cpp	2006-07-10 15:36:12.000000000 +0800
+++ ../../qterm-0.4.0.new/qterm/imageviewerui.cpp	2006-08-06 00:57:39.000000000 +0800
@@ -89,4 +89,3 @@ void QTermImageUI::languageChange()
     d_next->setAccel( QKeySequence( tr( "Alt+N" ) ) );
 }
 
-#include <imageviewerui.moc>
diff -up ./keydialog.cpp ../../qterm-0.4.0.new/qterm/keydialog.cpp
--- ./keydialog.cpp	2006-07-10 15:36:12.000000000 +0800
+++ ../../qterm-0.4.0.new/qterm/keydialog.cpp	2006-08-06 00:57:50.000000000 +0800
@@ -281,4 +281,3 @@ void keyDialog::loadKey(int n)
 	}
 }
 
-#include <keydialog.moc>
diff -up ./keydialogui.cpp ../../qterm-0.4.0.new/qterm/keydialogui.cpp
--- ./keydialogui.cpp	2006-07-10 15:36:13.000000000 +0800
+++ ../../qterm-0.4.0.new/qterm/keydialogui.cpp	2006-08-06 00:57:59.000000000 +0800
@@ -160,4 +160,3 @@ void keyDialogUI::languageChange()
     closeButton->setText( tr( "Close" ) );
 }
 
-#include <keydialogui.moc>
diff -up ./msgdialog.cpp ../../qterm-0.4.0.new/qterm/msgdialog.cpp
--- ./msgdialog.cpp	2006-07-10 15:36:13.000000000 +0800
+++ ../../qterm-0.4.0.new/qterm/msgdialog.cpp	2006-08-06 00:58:17.000000000 +0800
@@ -28,4 +28,3 @@ msgDialog::~msgDialog()
     // no need to delete child widgets, Qt does it all for us
 }
 
-#include <msgdialog.moc>
diff -up ./msgdialogui.cpp ../../qterm-0.4.0.new/qterm/msgdialogui.cpp
--- ./msgdialogui.cpp	2006-07-10 15:36:12.000000000 +0800
+++ ../../qterm-0.4.0.new/qterm/msgdialogui.cpp	2006-08-06 00:58:25.000000000 +0800
@@ -64,4 +64,3 @@ void msgDialogUI::languageChange()
     okButton->setText( tr( "OK" ) );
 }
 
-#include <msgdialogui.moc>
diff -up ./osdmessage.cpp ../../qterm-0.4.0.new/qterm/osdmessage.cpp
--- ./osdmessage.cpp	2006-07-10 15:36:12.000000000 +0800
+++ ../../qterm-0.4.0.new/qterm/osdmessage.cpp	2006-08-06 00:58:32.000000000 +0800
@@ -152,4 +152,3 @@ void PageViewMessage::mousePressEvent( Q
     hide();
 }
 
-#include <osdmessage.moc>
diff -up ./popupMessage.cpp ../../qterm-0.4.0.new/qterm/popupMessage.cpp
--- ./popupMessage.cpp	2006-07-10 15:36:13.000000000 +0800
+++ ../../qterm-0.4.0.new/qterm/popupMessage.cpp	2006-08-06 00:58:50.000000000 +0800
@@ -325,4 +325,3 @@ void PopupMessage::slideMask()
 
 }
 
-#include <popupMessage.moc>
diff -up ./popwidget.cpp ../../qterm-0.4.0.new/qterm/popwidget.cpp
--- ./popwidget.cpp	2006-07-10 15:36:12.000000000 +0800
+++ ../../qterm-0.4.0.new/qterm/popwidget.cpp	2006-08-06 00:59:05.000000000 +0800
@@ -131,4 +131,3 @@ void popWidget::showTimer()
 	move(ptPos);
 }
 
-#include <popwidget.moc>
diff -up ./prefdialog.cpp ../../qterm-0.4.0.new/qterm/prefdialog.cpp
--- ./prefdialog.cpp	2006-07-10 15:36:12.000000000 +0800
+++ ../../qterm-0.4.0.new/qterm/prefdialog.cpp	2006-08-06 00:59:13.000000000 +0800
@@ -264,4 +264,3 @@ void prefDialog::onPool()
 	}
 }
 
-#include <prefdialog.moc>
diff -up ./prefdialogui.cpp ../../qterm-0.4.0.new/qterm/prefdialogui.cpp
--- ./prefdialogui.cpp	2006-07-10 15:36:13.000000000 +0800
+++ ../../qterm-0.4.0.new/qterm/prefdialogui.cpp	2006-08-06 00:59:23.000000000 +0800
@@ -226,4 +226,3 @@ void prefDialogUI::languageChange()
     imagePushButton->setText( tr( "Choose" ) );
     choosehttpPushButton->setText( tr( "Choose" ) );
 }
-#include <prefdialogui.moc>
diff -up ./qterm.h ../../qterm-0.4.0.new/qterm/qterm.h
--- ./qterm.h	2006-07-10 15:36:12.000000000 +0800
+++ ../../qterm-0.4.0.new/qterm/qterm.h	2006-08-07 14:15:30.000000000 +0800
@@ -17,7 +17,7 @@ AUTHOR:		smartfish kafa
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #else 
-#define VERSION	"0.4.0pre3"
+#define VERSION	"0.4.0"
 #define QTERM_DATADIR "/usr/share/qterm"
 #define QTERM_BINDIR  "/usr/bin"
 #endif
diff -up ./qterm.prj ../../qterm-0.4.0.new/qterm/qterm.prj
--- ./qterm.prj	2006-07-10 15:36:12.000000000 +0800
+++ ../../qterm-0.4.0.new/qterm/qterm.prj	2006-08-06 01:56:54.000000000 +0800
@@ -87,6 +87,11 @@ HEADERS		= qtermframe.h \
 		qtermcanvas.h	\
 		trayicon.h	\
 		popwidget.h	\
+                qtermimage.h	\
+		statusBar.h	\
+		progressBar.h	\
+		popupMessage.h	\
+		overlayWidget.h	\
 		ssh/crc32.h	\
 		ssh/types.h	\
 		ssh/getput.h	\
@@ -152,6 +157,11 @@ SOURCES		= qtermframe.cpp \
 		osdmessage.cpp	\	
 		trayicon.cpp	\
 		qtermcanvas.cpp	\
+		qtermimage.cpp	\
+		statusBar.cpp	\
+		progressBar.cpp	\
+		popupMessage.cpp	\
+		overlayWidget.cpp	\
 		main.cpp		\
 		ssh/crc32.cpp	\
 		ssh/qtermsshauth.cpp	\
diff -up ./qtermbuffer.cpp ../../qterm-0.4.0.new/qterm/qtermbuffer.cpp
--- ./qtermbuffer.cpp	2006-07-10 15:36:13.000000000 +0800
+++ ../../qterm-0.4.0.new/qterm/qtermbuffer.cpp	2006-08-06 00:59:54.000000000 +0800
@@ -651,4 +651,3 @@ QRect QTermBuffer::getSelectRect( int in
 				else
 					return QRect( 0, index, m_col, 1);
 }
-#include <qtermbuffer.moc>
diff -up ./qtermcanvas.cpp ../../qterm-0.4.0.new/qterm/qtermcanvas.cpp
--- ./qtermcanvas.cpp	2006-07-10 15:36:12.000000000 +0800
+++ ../../qterm-0.4.0.new/qterm/qtermcanvas.cpp	2006-08-06 01:00:03.000000000 +0800
@@ -323,4 +323,3 @@ void QTermCanvas::adjustSize(const QSize
 
 }
 
-#include <qtermcanvas.moc>
diff -up ./qtermdecode.cpp ../../qterm-0.4.0.new/qterm/qtermdecode.cpp
--- ./qtermdecode.cpp	2006-07-10 15:36:12.000000000 +0800
+++ ../../qterm-0.4.0.new/qterm/qtermdecode.cpp	2006-08-06 01:00:30.000000000 +0800
@@ -576,4 +576,3 @@ void QTermDecode::restoreMode()
 void QTermDecode::test()
 {
 }
-#include <qtermdecode.moc>
diff -up ./qtermframe.cpp ../../qterm-0.4.0.new/qterm/qtermframe.cpp
--- ./qtermframe.cpp	2006-07-10 15:36:13.000000000 +0800
+++ ../../qterm-0.4.0.new/qterm/qtermframe.cpp	2006-08-06 01:00:38.000000000 +0800
@@ -1858,4 +1858,3 @@ QPixmap MTray::makeIcon(const QImage &_i
 }
 
 
-#include <qtermframe.moc>
diff -up ./qtermhttp.cpp ../../qterm-0.4.0.new/qterm/qtermhttp.cpp
--- ./qtermhttp.cpp	2006-07-10 15:36:13.000000000 +0800
+++ ../../qterm-0.4.0.new/qterm/qtermhttp.cpp	2006-08-06 01:00:48.000000000 +0800
@@ -234,4 +234,3 @@ void QTermHttp::previewImage(const QStri
 	}
 }
 
-#include <qtermhttp.moc>
diff -up ./qtermimage.cpp ../../qterm-0.4.0.new/qterm/qtermimage.cpp
--- ./qtermimage.cpp	2006-07-10 15:36:12.000000000 +0800
+++ ../../qterm-0.4.0.new/qterm/qtermimage.cpp	2006-08-06 01:00:56.000000000 +0800
@@ -298,4 +298,3 @@ int main(int argc, char **argv)
 
 }
 */
-#include <qtermimage.moc>
diff -up ./qtermscreen.cpp ../../qterm-0.4.0.new/qterm/qtermscreen.cpp
--- ./qtermscreen.cpp	2006-07-10 15:36:13.000000000 +0800
+++ ../../qterm-0.4.0.new/qterm/qtermscreen.cpp	2006-08-06 01:01:29.000000000 +0800
@@ -1363,4 +1363,3 @@ void QTermInput::paintEvent(QPaintEvent 
 #endif
 	inputPainter.end();
 }
-#include <qtermscreen.moc>
diff -up ./qtermsocket.cpp ../../qterm-0.4.0.new/qterm/qtermsocket.cpp
--- ./qtermsocket.cpp	2006-07-10 15:36:12.000000000 +0800
+++ ../../qterm-0.4.0.new/qterm/qtermsocket.cpp	2006-08-06 01:01:37.000000000 +0800
@@ -579,4 +579,3 @@ Q_ULONG QTermTelnetSocket::bytesAvailabl
 {
 	return d_socket->bytesAvailable();
 }
-#include <qtermsocket.moc>
diff -up ./qtermtelnet.cpp ../../qterm-0.4.0.new/qterm/qtermtelnet.cpp
--- ./qtermtelnet.cpp	2006-07-10 15:36:12.000000000 +0800
+++ ../../qterm-0.4.0.new/qterm/qtermtelnet.cpp	2006-08-06 01:01:54.000000000 +0800
@@ -915,4 +915,3 @@ int QTermTelnet::tnabort(int)
 	return -1;
 }
 
-#include <qtermtelnet.moc>
diff -up ./qtermtimelabel.cpp ../../qterm-0.4.0.new/qterm/qtermtimelabel.cpp
--- ./qtermtimelabel.cpp	2006-07-10 15:36:12.000000000 +0800
+++ ../../qterm-0.4.0.new/qterm/qtermtimelabel.cpp	2006-08-06 01:02:14.000000000 +0800
@@ -33,4 +33,3 @@ void QTermTimeLabel::timerEvent(QTimerEv
 {
 	setText(currentTime->currentTime().toString());	
 }
-#include <qtermtimelabel.moc>
diff -up ./qtermtoolbutton.cpp ../../qterm-0.4.0.new/qterm/qtermtoolbutton.cpp
--- ./qtermtoolbutton.cpp	2006-07-10 15:36:13.000000000 +0800
+++ ../../qterm-0.4.0.new/qterm/qtermtoolbutton.cpp	2006-08-06 01:02:22.000000000 +0800
@@ -27,4 +27,3 @@ void QTermToolButton::slotClicked()
 	emit(buttonClicked(id));
 }
 
-#include <qtermtoolbutton.moc>
diff -up ./qtermwindow.cpp ../../qterm-0.4.0.new/qterm/qtermwindow.cpp
--- ./qtermwindow.cpp	2006-07-10 15:36:13.000000000 +0800
+++ ../../qterm-0.4.0.new/qterm/qtermwindow.cpp	2006-08-06 01:02:30.000000000 +0800
@@ -2217,4 +2217,3 @@ void QTermWindow::httpDone(QObject *pHtt
 {
 	pHttp->deleteLater();
 }
-#include <qtermwindow.moc>
diff -up ./qtermwndmgr.cpp ../../qterm-0.4.0.new/qterm/qtermwndmgr.cpp
--- ./qtermwndmgr.cpp	2006-07-10 15:36:13.000000000 +0800
+++ ../../qterm-0.4.0.new/qterm/qtermwndmgr.cpp	2006-08-06 01:02:39.000000000 +0800
@@ -200,4 +200,3 @@ bool QTermWndMgr::afterRemove()
 	else
 		return false;
 }	
-#include <qtermwndmgr.moc>
diff -up ./qtermzmodem.cpp ../../qterm-0.4.0.new/qterm/qtermzmodem.cpp
--- ./qtermzmodem.cpp	2006-07-10 15:36:13.000000000 +0800
+++ ../../qterm-0.4.0.new/qterm/qtermzmodem.cpp	2006-08-06 01:02:48.000000000 +0800
@@ -2881,4 +2881,3 @@ void QTermZmodem::zmodemCancel()
 {
 	ZmodemAbort(&info);
 }
-#include <qtermzmodem.moc>
diff -up ./quickdialog.cpp ../../qterm-0.4.0.new/qterm/quickdialog.cpp
--- ./quickdialog.cpp	2006-07-10 15:36:13.000000000 +0800
+++ ../../qterm-0.4.0.new/qterm/quickdialog.cpp	2006-08-06 01:02:56.000000000 +0800
@@ -264,4 +264,3 @@ void quickDialog::close()
 }
 
 
-#include <quickdialog.moc>
diff -up ./quickdialogui.cpp ../../qterm-0.4.0.new/qterm/quickdialogui.cpp
--- ./quickdialogui.cpp	2006-07-10 15:36:12.000000000 +0800
+++ ../../qterm-0.4.0.new/qterm/quickdialogui.cpp	2006-08-06 01:03:04.000000000 +0800
@@ -111,4 +111,3 @@ void quickDialogUI::languageChange()
     addPushButton->setText( QString::null );
 }
 
-#include <quickdialogui.moc>
diff -up ./schemadialog.cpp ../../qterm-0.4.0.new/qterm/schemadialog.cpp
--- ./schemadialog.cpp	2006-07-10 15:36:12.000000000 +0800
+++ ../../qterm-0.4.0.new/qterm/schemadialog.cpp	2006-08-06 01:03:13.000000000 +0800
@@ -855,4 +855,3 @@ QImage& schemaDialog::fadeColor( QImage&
     return img;
 }
 
-#include <schemadialog.moc>
diff -up ./schemadialogui.cpp ../../qterm-0.4.0.new/qterm/schemadialogui.cpp
--- ./schemadialogui.cpp	2006-07-10 15:36:13.000000000 +0800
+++ ../../qterm-0.4.0.new/qterm/schemadialogui.cpp	2006-08-06 01:03:22.000000000 +0800
@@ -218,4 +218,3 @@ void schemaDialogUI::Frame4_destroyed(QO
     qWarning( "schemaDialogUI::Frame4_destroyed(QObject*): Not implemented yet" );
 }
 
-#include <schemadialogui.moc>
diff -up ./soundconf.cpp ../../qterm-0.4.0.new/qterm/soundconf.cpp
--- ./soundconf.cpp	2006-07-10 15:36:12.000000000 +0800
+++ ../../qterm-0.4.0.new/qterm/soundconf.cpp	2006-08-06 01:03:30.000000000 +0800
@@ -189,4 +189,3 @@ void fSoundConf::accept()
 	saveSetting();
 	fSoundConfUI::accept();
 }
-#include <soundconf.moc>
diff -up ./soundconfui.cpp ../../qterm-0.4.0.new/qterm/soundconfui.cpp
--- ./soundconfui.cpp	2006-07-10 15:36:12.000000000 +0800
+++ ../../qterm-0.4.0.new/qterm/soundconfui.cpp	2006-08-06 01:03:38.000000000 +0800
@@ -123,4 +123,3 @@ void fSoundConfUI::languageChange()
     bCancel->setText( tr( "Cancel" ) );
 }
 
-#include <soundconfui.moc>
diff -up ./statusBar.cpp ../../qterm-0.4.0.new/qterm/statusBar.cpp
--- ./statusBar.cpp	2006-07-10 15:36:12.000000000 +0800
+++ ../../qterm-0.4.0.new/qterm/statusBar.cpp	2006-08-06 01:03:46.000000000 +0800
@@ -507,4 +507,3 @@ StatusBar::pruneProgressBars()
 } //namespace QTerm
 
 
-#include <statusBar.moc>
diff -up ./trayicon.cpp ../../qterm-0.4.0.new/qterm/trayicon.cpp
--- ./trayicon.cpp	2006-07-10 15:36:13.000000000 +0800
+++ ../../qterm-0.4.0.new/qterm/trayicon.cpp	2006-08-06 01:03:54.000000000 +0800
@@ -257,4 +257,3 @@ void TrayIcon::gotCloseEvent()
 {
 	emit closed();
 }
-#include <trayicon.moc>
diff -up ./zmodemdialog.cpp ../../qterm-0.4.0.new/qterm/zmodemdialog.cpp
--- ./zmodemdialog.cpp	2006-07-10 15:36:12.000000000 +0800
+++ ../../qterm-0.4.0.new/qterm/zmodemdialog.cpp	2006-08-06 01:04:11.000000000 +0800
@@ -57,4 +57,3 @@ void zmodemDialog::slotCancel()
 		hide();
 	}
 }
-#include <zmodemdialog.moc>
diff -up ./zmodemdialogui.cpp ../../qterm-0.4.0.new/qterm/zmodemdialogui.cpp
--- ./zmodemdialogui.cpp	2006-07-10 15:36:12.000000000 +0800
+++ ../../qterm-0.4.0.new/qterm/zmodemdialogui.cpp	2006-08-06 01:04:19.000000000 +0800
@@ -83,4 +83,3 @@ void zmodemDialogUI::languageChange()
     labelFileName->setText( tr( "textLabel1" ) );
 }
 
-#include <zmodemdialogui.moc>
diff -up ./ssh/qtermsshauth.cpp ../../qterm-0.4.0.new/qterm/ssh/qtermsshauth.cpp
--- ./ssh/qtermsshauth.cpp	2006-07-10 15:36:12.000000000 +0800
+++ ../../qterm-0.4.0.new/qterm/ssh/qtermsshauth.cpp	2006-08-06 00:54:21.000000000 +0800
@@ -71,4 +71,3 @@ void QTermSSH1PasswdAuth::handlePacket(i
 		return;
 	}
 }
-#include <qtermsshauth.moc>
diff -up ./ssh/qtermsshkex.cpp ../../qterm-0.4.0.new/qterm/ssh/qtermsshkex.cpp
--- ./ssh/qtermsshkex.cpp	2006-07-10 15:36:12.000000000 +0800
+++ ../../qterm-0.4.0.new/qterm/ssh/qtermsshkex.cpp	2006-08-06 00:54:36.000000000 +0800
@@ -164,4 +164,3 @@ void QTermSSH1Kex::makeSessionId()
 	delete md5;
 	delete [] p;
 }
-#include <qtermsshkex.moc>
diff -up ./ssh/qtermsshlogin.cpp ../../qterm-0.4.0.new/qterm/ssh/qtermsshlogin.cpp
--- ./ssh/qtermsshlogin.cpp	2006-07-10 15:36:12.000000000 +0800
+++ ../../qterm-0.4.0.new/qterm/ssh/qtermsshlogin.cpp	2006-08-06 00:54:51.000000000 +0800
@@ -35,4 +35,3 @@ void fSSHLogin::accept()
 	*strPassword  = lePassword->text();
 	fSSHLoginUI::accept();
 }
-#include <qtermsshlogin.moc>
diff -up ./ssh/qtermsshloginui.cpp ../../qterm-0.4.0.new/qterm/ssh/qtermsshloginui.cpp
--- ./ssh/qtermsshloginui.cpp	2006-07-10 15:36:12.000000000 +0800
+++ ../../qterm-0.4.0.new/qterm/ssh/qtermsshloginui.cpp	2006-08-06 00:55:05.000000000 +0800
@@ -82,4 +82,3 @@ void fSSHLoginUI::languageChange()
     textLabel2_2->setText( tr( "Please enter your username and password" ) );
     textLabel2->setText( tr( "Password:" ) );
 }
-#include <qtermsshloginui.moc>
diff -up ./ssh/qtermsshpacket.cpp ../../qterm-0.4.0.new/qterm/ssh/qtermsshpacket.cpp
--- ./ssh/qtermsshpacket.cpp	2006-07-10 15:36:12.000000000 +0800
+++ ../../qterm-0.4.0.new/qterm/ssh/qtermsshpacket.cpp	2006-08-06 00:55:16.000000000 +0800
@@ -268,4 +268,3 @@ int QTermSSH1PacketReceiver::packetLen()
 {
 	return d_realLen;
 }
-#include <qtermsshpacket.moc>
diff -up ./ssh/qtermsshsession.cpp ../../qterm-0.4.0.new/qterm/ssh/qtermsshsession.cpp
--- ./ssh/qtermsshsession.cpp	2006-07-10 15:36:12.000000000 +0800
+++ ../../qterm-0.4.0.new/qterm/ssh/qtermsshsession.cpp	2006-08-06 00:53:39.000000000 +0800
@@ -92,4 +92,3 @@ void QTermSSH1Session::handlePacket(int 
 	}
 }
 
-#include <qtermsshsession.moc>
diff -up ./ssh/qtermsshsocket.cpp ../../qterm-0.4.0.new/qterm/ssh/qtermsshsocket.cpp
--- ./ssh/qtermsshsocket.cpp	2006-07-10 15:36:12.000000000 +0800
+++ ../../qterm-0.4.0.new/qterm/ssh/qtermsshsocket.cpp	2006-08-06 00:55:34.000000000 +0800
@@ -244,4 +244,3 @@ void QTermSSHSocket::setProxy( int nProx
 			strProxyHost, uProxyPort,
 			strProxyUsr, strProxyPwd);
 }
-#include <qtermsshsocket.moc>