--- a/trunk/.gitignore
+++ b/trunk/.gitignore
@@ -1,3 +1,8 @@
+*.o
+*.moc
+*.bak
+*.swp
+*.log
 
 # /rosegarden/
 /rosegarden/Makefile
@@ -35,6 +40,8 @@
 /rosegarden/progress.make
 /rosegarden/rosegarden.spec
 /rosegarden/DartTestfile.txt
+/rosegarden/dependencies
+/rosegarden/rosegarden
 
 # /rosegarden/data/
 /rosegarden/data/
@@ -42,9 +49,6 @@
 /rosegarden/data/Makefile
 /rosegarden/data/progress.make
 /rosegarden/data/CMakeFiles
-
-# /rosegarden/data/rc/
-/rosegarden/data/rc/*.moc
 
 # /rosegarden/docs/
 /rosegarden/docs/Makefile
@@ -79,56 +83,8 @@
 /rosegarden/src/base/*.lo
 /rosegarden/src/base/libbase.la
 
-# /rosegarden/src/commands/edit/
-/rosegarden/src/commands/edit/*.moc
-
-# /rosegarden/src/document/
-/rosegarden/src/document/*.moc
-
-# /rosegarden/src/gui/application/
-/rosegarden/src/gui/application/*.moc
-
-# /rosegarden/src/gui/configuration/
-/rosegarden/src/gui/configuration/*.moc
-
-# /rosegarden/src/gui/dialogs/
-/rosegarden/src/gui/dialogs/*.moc
-
-# /rosegarden/src/gui/editors/eventlist/
-/rosegarden/src/gui/editors/eventlist/*.moc
-
-# /rosegarden/src/gui/editors/guitar/
-/rosegarden/src/gui/editors/guitar/*.moc
-
-# /rosegarden/src/gui/editors/matrix/
-/rosegarden/src/gui/editors/matrix/*.moc
-
-# /rosegarden/src/gui/editors/notation/
-/rosegarden/src/gui/editors/notation/*.moc
-
-# /rosegarden/src/gui/editors/parameters/
-/rosegarden/src/gui/editors/parameters/*.moc
-
-# /rosegarden/src/gui/editors/segment/
-/rosegarden/src/gui/editors/segment/*.moc
-
-# /rosegarden/src/gui/editors/tempo/
-/rosegarden/src/gui/editors/tempo/*.moc
-
-# /rosegarden/src/gui/general/
-/rosegarden/src/gui/general/*.moc
-
-# /rosegarden/src/gui/rulers/
-/rosegarden/src/gui/rulers/*.moc
-
-# /rosegarden/src/gui/seqmanager/
-/rosegarden/src/gui/seqmanager/*.moc
-
-# /rosegarden/src/gui/studio/
-/rosegarden/src/gui/studio/*.moc
-
-# /rosegarden/src/gui/widgets/
-/rosegarden/src/gui/widgets/*.moc
+# /rosegarden/src/gui/
+/rosegarden/src/gui/dialogs/RosegardenTransportUi.h
 
 # /rosegarden/src/sequencer/
 /rosegarden/src/sequencer/.deps
@@ -137,11 +93,9 @@
 /rosegarden/src/sequencer/Makefile.in
 /rosegarden/src/sequencer/rosegardensequencer
 /rosegarden/src/sequencer/*.moc.cpp
-/rosegarden/src/sequencer/*.moc
 /rosegarden/src/sequencer/*_skel.cpp
 /rosegarden/src/sequencer/*_meta_unload.cpp
 /rosegarden/src/sequencer/*.kidl
-/rosegarden/src/sequencer/*.moc
 /rosegarden/src/sequencer/core*
 
 # /rosegarden/src/sound/
@@ -166,7 +120,9 @@
 /rosegarden/src/sound/MidiArts.mcopclass
 /rosegarden/src/sound/MidiArts.mcoptype
 /rosegarden/src/sound/*.loT
-/rosegarden/src/sound/*.moc
+
+# /rosegarden/src/gui/studio/
+/rosegarden/src/gui/studio/DeviceManagerDialogUi.h
 
 # /rosegarden/test/base/
 /rosegarden/test/base/utf8