# 
# 
# patch "guitone.pro"
#  from [d78a6c873a82435a4c41bc9d88bc28896f2df585]
#    to [8450891c44eaad5bc6f0e621416d520b32c062e1]
# 
# patch "src/main.cpp"
#  from [eee44529b4f7743d19632cae782900c6d0732aa0]
#    to [ebaf75f5f6031ae804e552eb67502bfff78dd0f5]
# 
# patch "src/model/Monotone.cpp"
#  from [20087d8807f3611228c42a8056a8fae891ff0ab0]
#    to [7c91e5b0a642709420e995dff3e77a0b21aee287]
# 
# patch "src/model/Monotone.h"
#  from [4436df110a3cbfb19a8fe6fe17c26ea3c8427322]
#    to [4ae3921266ba3a21106d05ecc88ce24a924038c0]
# 
# patch "src/model/Sandbox.h"
#  from [2fa4560f46a1b5c53b98d6b692c30e21d6b57038]
#    to [b8ececa02b3e00d4e9eb1217eff66c81a25cbb53]
# 
# patch "src/view/Guitone.cpp"
#  from [e49de344f86a9c3659cfe95c500ff56de25bb963]
#    to [97a77009492a70cc9f8aa34a609c6c57bcdc27ac]
# 
# patch "src/view/Guitone.h"
#  from [f62cbb2e21c3b240b5be48d82a46857b1b0a7d46]
#    to [bd85de58c8af019af8ecaf17fd5f0907e6d2d084]
# 
# patch "src/view/SandboxView.cpp"
#  from [0647821445e080eef89ea30b32af0c1bb002a5cb]
#    to [dd2c7d408281f9f2bcf483be481e2a9b6af6cdbd]
# 
# patch "src/view/SandboxView.h"
#  from [8a8e472c2cb938549555ef491d2a2fba4dffa0b0]
#    to [9cf3876a756851478a788b11495a43558305cf83]
# 
============================================================
--- guitone.pro	d78a6c873a82435a4c41bc9d88bc28896f2df585
+++ guitone.pro	8450891c44eaad5bc6f0e621416d520b32c062e1
@@ -14,3 +14,5 @@
 TEMPLATE = app
 DEPENDPATH += src
 INCLUDEPATH += . src
+#The following line was inserted by qt3to4
+QT +=  qt3support 
============================================================
--- src/main.cpp	eee44529b4f7743d19632cae782900c6d0732aa0
+++ src/main.cpp	ebaf75f5f6031ae804e552eb67502bfff78dd0f5
@@ -23,10 +23,10 @@
 #include "view/Guitone.h"
 
 int main( int argc, char ** argv ) {
-    QApplication qApp(argc,argv);
+    QApplication app(argc,argv);
     Guitone *mainWnd = new Guitone();
     mainWnd->setCaption( "guitone" );
     mainWnd->show();
-    qApp.connect(&qApp, SIGNAL(lastWindowClosed()), &qApp, SLOT(quit()));
-    return qApp.exec();
+    app.connect(&app, SIGNAL(lastWindowClosed()), &app, SLOT(quit()));
+    return app.exec();
 }
============================================================
--- src/model/Monotone.cpp	20087d8807f3611228c42a8056a8fae891ff0ab0
+++ src/model/Monotone.cpp	7c91e5b0a642709420e995dff3e77a0b21aee287
@@ -1,9 +1,9 @@
 
 #include "Monotone.h"
 
 Monotone* Monotone::instance = 0;
 
-Monotone::Monotone() : QProcess() 
+Monotone::Monotone() : Q3Process() 
 {
 	isRunning = false;
 	output = new QStringList();	
============================================================
--- src/model/Monotone.h	4436df110a3cbfb19a8fe6fe17c26ea3c8427322
+++ src/model/Monotone.h	4ae3921266ba3a21106d05ecc88ce24a924038c0
@@ -1,12 +1,12 @@
 
 #ifndef MONOTONE_H
 #define MONOTONE_H
 
-#include <qprocess.h>
+#include <q3process.h>
 #include <qregexp.h>
-#include <qcstring.h>
+#include <q3cstring.h>
 
-class Monotone : public QProcess
+class Monotone : public Q3Process
 {
 	Q_OBJECT
 	public:
============================================================
--- src/model/Sandbox.h	2fa4560f46a1b5c53b98d6b692c30e21d6b57038
+++ src/model/Sandbox.h	b8ececa02b3e00d4e9eb1217eff66c81a25cbb53
@@ -24,7 +24,7 @@
 #include <qdir.h>
 #include <qfile.h>
 #include <qobject.h>
-#include <qprocess.h>
+#include <q3process.h>
 #include <qregexp.h>
 #include <list>
 #include <map>
============================================================
--- src/view/Guitone.cpp	e49de344f86a9c3659cfe95c500ff56de25bb963
+++ src/view/Guitone.cpp	97a77009492a70cc9f8aa34a609c6c57bcdc27ac
@@ -20,9 +20,10 @@
 
 
 #include "Guitone.h"
+#include <Q3PopupMenu>
 
 Guitone::Guitone()
-    : QMainWindow( 0, "Guitone", WDestructiveClose )
+    : QMainWindow( 0, "Guitone" )
 {
     // create sandbox object
     mySandbox = new Sandbox();
@@ -30,7 +31,7 @@
     //
     // Menubar
     //
-    QPopupMenu *fileMenu = new QPopupMenu(this);
+    Q3PopupMenu *fileMenu = new Q3PopupMenu(this);
     menuBar()->insertItem( tr("&File"), fileMenu );
 
     int id;
@@ -38,7 +39,7 @@
         tr("&Import Sandbox..."),
 		this,
 		SLOT(chooseSandbox()),
-		CTRL+Key_I
+		Qt::CTRL+Qt::Key_I
     );
 	QString fileImportText = tr("Import a local sandbox into Guitone.");
     fileMenu->setWhatsThis( id, fileImportText );
@@ -89,7 +90,7 @@
 
 void Guitone::chooseSandbox()
 {
-    QString fn = QFileDialog::getExistingDirectory(
+    QString fn = Q3FileDialog::getExistingDirectory(
         QString::null,
 		this,
 		"select workspace dialog",
============================================================
--- src/view/Guitone.h	f62cbb2e21c3b240b5be48d82a46857b1b0a7d46
+++ src/view/Guitone.h	bd85de58c8af019af8ecaf17fd5f0907e6d2d084
@@ -25,17 +25,17 @@
 #include "../model/Sandbox.h"
 #include "../view/SandboxView.h"
 
-#include <qmainwindow.h>
-#include <qpopupmenu.h>
+#include <QMainWindow.h>
+#include <q3popupmenu.h>
 #include <qmenubar.h>
 #include <qmessagebox.h>
 #include <qsplitter.h>
-#include <qtextedit.h>
-#include <qfiledialog.h>
+#include <q3textedit.h>
+#include <q3filedialog.h>
 #include <qstatusbar.h>
 #include <map>
 
-class QTextEdit;
+class Q3TextEdit;
 
 class Guitone: public QMainWindow
 {
@@ -53,7 +53,7 @@
     Sandbox *mySandbox;
     SandboxView *treeView;
     SandboxView *listView;
-    QTextEdit *logWindow;    
+    Q3TextEdit *logWindow;    
 };
 
 
============================================================
--- src/view/SandboxView.cpp	0647821445e080eef89ea30b32af0c1bb002a5cb
+++ src/view/SandboxView.cpp	dd2c7d408281f9f2bcf483be481e2a9b6af6cdbd
@@ -1,13 +1,16 @@
 
 #include "SandboxView.h"
+//Added by qt3to4:
+#include <QPixmap>
+#include <Q3PopupMenu>
 
 SandboxView::SandboxView(QWidget* parent, int type)
-	: QListView(parent)
+	: Q3ListView(parent)
 {
 	rootItem  = 0;
 	
-	itemPopup = new QPopupMenu(this);
-	viewPopup = new QPopupMenu(this);
+	itemPopup = new Q3PopupMenu(this);
+	viewPopup = new Q3PopupMenu(this);
 	viewPopup->setCheckable(true);
 	hideIgnoredItems_id = viewPopup->insertItem("Hide i&gnored items", this, SLOT(toggleHideIgnoredItems()));
 		
@@ -26,8 +29,8 @@
 	// common for both views
     addColumn("Status");
 	
-	connect(this, SIGNAL(contextMenuRequested(QListViewItem*, const QPoint&,int)),
-			this, SLOT(openContextMenu(QListViewItem*, const QPoint&,int)));
+	connect(this, SIGNAL(contextMenuRequested(Q3ListViewItem*, const QPoint&,int)),
+			this, SLOT(openContextMenu(Q3ListViewItem*, const QPoint&,int)));
 }
 
 SandboxView::~SandboxView() {}
@@ -58,13 +61,13 @@
 void SandboxView::displayFileList(std::list<SandboxItem*>* items)
 {
     std::list<SandboxItem*>::iterator iter;
-	QListViewItem *viewItem;
+	Q3ListViewItem *viewItem;
 	
     for (iter= items->begin(); iter != items->end(); iter++)
     {
 		if (!(*iter)->isDirectory())
         {
-            viewItem = new QListViewItem(this, (*iter)->getFilename(), determineItemStatus(*iter));
+            viewItem = new Q3ListViewItem(this, (*iter)->getFilename(), determineItemStatus(*iter));
 			lookupTable[viewItem] = *iter;
 			reverseLookupTable[*iter] = viewItem;
         }
@@ -73,8 +76,8 @@
 
 void SandboxView::displayFolderTree(std::list<SandboxItem*>* items)
 {
-	connect(this, SIGNAL(selectionChanged(QListViewItem*)),
-            this, SLOT(doUpdateFolderTree(QListViewItem*)));
+	connect(this, SIGNAL(selectionChanged(Q3ListViewItem*)),
+            this, SLOT(doUpdateFolderTree(Q3ListViewItem*)));
 	
     // clear lookup map
     lookupTable.clear();
@@ -85,7 +88,7 @@
     rootItem = new SandboxItem("ROOT", 0 , true);
 	rootItem->setChildren(items);
 	
-	QListViewItem *listViewRoot = new QListViewItem(this, "ROOT");
+	Q3ListViewItem *listViewRoot = new Q3ListViewItem(this, "ROOT");
     listViewRoot->setPixmap(0, QPixmap(XPM::FolderOpened));
 	
     lookupTable[listViewRoot] = rootItem;
@@ -98,10 +101,10 @@
     emit updateDisplay(items);
 }
 
-void SandboxView::displayFolderTreeRecursive(std::list<SandboxItem*>* items, QListViewItem* parent)
+void SandboxView::displayFolderTreeRecursive(std::list<SandboxItem*>* items, Q3ListViewItem* parent)
 {
 
-    QListViewItem *listItem;
+    Q3ListViewItem *listItem;
     std::list<SandboxItem*>::iterator iter;
     
     for (iter= items->begin(); iter != items->end(); iter++)
@@ -109,7 +112,7 @@
 		// only add directories
         if ((*iter)->isDirectory())
         {
-            listItem = new QListViewItem(parent, (*iter)->getFilename(),determineItemStatus(*iter));
+            listItem = new Q3ListViewItem(parent, (*iter)->getFilename(),determineItemStatus(*iter));
             listItem->setPixmap(0, QPixmap(XPM::FolderClosed));
 
             lookupTable[listItem] = *iter;
@@ -120,9 +123,9 @@
 }
 
 
-void SandboxView::doUpdateFolderTree(QListViewItem* treeItem)
+void SandboxView::doUpdateFolderTree(Q3ListViewItem* treeItem)
 {
-    std::map<QListViewItem*, SandboxItem*>::iterator iter;
+    std::map<Q3ListViewItem*, SandboxItem*>::iterator iter;
 
     for (iter = lookupTable.begin(); iter != lookupTable.end(); iter++)
     {
@@ -182,9 +185,9 @@
     return list.join(", ");
 }
 
-void SandboxView::openContextMenu(QListViewItem *item, const QPoint& pos, int col)
+void SandboxView::openContextMenu(Q3ListViewItem *item, const QPoint& pos, int col)
 {
-	std::map<QListViewItem*, SandboxItem*>::iterator iter = lookupTable.find(item);
+	std::map<Q3ListViewItem*, SandboxItem*>::iterator iter = lookupTable.find(item);
 	
 	// general, non-item-specific context menu?
 	if (iter == lookupTable.end())
@@ -246,7 +249,7 @@
 
 void SandboxView::showHideIgnoredItems(bool show)
 {
-	std::map<QListViewItem*, SandboxItem*>::iterator iter;	
+	std::map<Q3ListViewItem*, SandboxItem*>::iterator iter;	
 	for (iter = lookupTable.begin(); iter != lookupTable.end(); iter++)
     {
         if (iter->second->hasStatus(SandboxItem::Ignored))
@@ -297,7 +300,7 @@
 
 bool SandboxView::selectItem(SandboxItem* sbItem)
 {
-	std::map<SandboxItem*, QListViewItem*>::iterator iter;
+	std::map<SandboxItem*, Q3ListViewItem*>::iterator iter;
 	iter = reverseLookupTable.find(sbItem);
 	
 	if (iter == reverseLookupTable.end())
============================================================
--- src/view/SandboxView.h	8a8e472c2cb938549555ef491d2a2fba4dffa0b0
+++ src/view/SandboxView.h	9cf3876a756851478a788b11495a43558305cf83
@@ -1,16 +1,16 @@
 #ifndef SANDBOX_VIEW_H
 #define SANDBOX_VIEW_H
 
 #include "XPM.h"
 #include "../model/SandboxItem.h"
 
-#include <qlistview.h>
+#include <q3listview.h>
 #include <qpixmap.h>
-#include <qpopupmenu.h>
+#include <q3popupmenu.h>
 #include <qmessagebox.h>
 #include <map>
 
-class SandboxView : public QListView
+class SandboxView : public Q3ListView
 {
 	Q_OBJECT
 	
@@ -30,8 +30,8 @@
 	private:
 		int viewType;
 		std::list<SandboxItem*>* sandboxItems;
-		QPopupMenu *viewPopup;
-		QPopupMenu *itemPopup;
+		Q3PopupMenu *viewPopup;
+		Q3PopupMenu *itemPopup;
 		SandboxItem *rootItem;
 		int hideIgnoredItems_id;
 		QString determineItemStatus(SandboxItem*);
@@ -39,12 +39,12 @@
 	
 		void displayFileList(std::list<SandboxItem*>*);
 		void displayFolderTree(std::list<SandboxItem*>*);
-		void displayFolderTreeRecursive(std::list<SandboxItem*>*, QListViewItem*);
-		std::map<QListViewItem*,SandboxItem*> lookupTable;
-		std::map<SandboxItem*,QListViewItem*> reverseLookupTable;
+		void displayFolderTreeRecursive(std::list<SandboxItem*>*, Q3ListViewItem*);
+		std::map<Q3ListViewItem*,SandboxItem*> lookupTable;
+		std::map<SandboxItem*,Q3ListViewItem*> reverseLookupTable;
 	private slots:
-		void doUpdateFolderTree(QListViewItem*);
-		void openContextMenu(QListViewItem*, const QPoint&, int);
+		void doUpdateFolderTree(Q3ListViewItem*);
+		void openContextMenu(Q3ListViewItem*, const QPoint&, int);
 		void toggleHideIgnoredItems();
 		void addItem(int);
 		void dropItem(int);