75 files changed, 130 insertions, 114 deletions

diff --git a/noncore/.cvsignore b/noncore/.cvsignore
index 83ee49f..871b783 100644
--- a/noncore/.cvsignore
+++ b/noncore/.cvsignore
@@ -1,4 +1,5 @@
+*.moc
 Makefile*
+binconfig.in
+config.in
 moc_*
-*.moc
-bin
\ No newline at end of file
diff --git a/noncore/applets/.cvsignore b/noncore/applets/.cvsignore
index b7706b7..c06ce43 100644
--- a/noncore/applets/.cvsignore
+++ b/noncore/applets/.cvsignore
@@ -2,3 +2 @@ config.in
 config.in.in
-config.in
-config.in.in
diff --git a/noncore/applets/notesapplet/.cvsignore b/noncore/applets/notesapplet/.cvsignore
index 7c4a217..99a2727 100644
--- a/noncore/applets/notesapplet/.cvsignore
+++ b/noncore/applets/notesapplet/.cvsignore
@@ -1,5 +1,5 @@
-moc_*
 *.moc
-Makefile*
 *.~
+Makefile*
+moc_*
 opieobj
\ No newline at end of file
diff --git a/noncore/applets/wirelessapplet/.cvsignore b/noncore/applets/wirelessapplet/.cvsignore
index 6937b26..51d12e8 100644
--- a/noncore/applets/wirelessapplet/.cvsignore
+++ b/noncore/applets/wirelessapplet/.cvsignore
diff --git a/noncore/apps/advancedfm/.cvsignore b/noncore/apps/advancedfm/.cvsignore
index 5344d1b..2f8556e 100644
--- a/noncore/apps/advancedfm/.cvsignore
+++ b/noncore/apps/advancedfm/.cvsignore
diff --git a/noncore/apps/checkbook/.cvsignore b/noncore/apps/checkbook/.cvsignore
index 8830bf2..0636f23 100644
--- a/noncore/apps/checkbook/.cvsignore
+++ b/noncore/apps/checkbook/.cvsignore
@@ -1,4 +1,5 @@
-moc_*
+
 *.moc
 Makefile*
+moc_*
 qcheckdetailsbase.cpp
@@ -15,2 +16 @@ qcheckviewbase.cpp
 qcheckviewbase.h
-
diff --git a/noncore/apps/confedit/.cvsignore b/noncore/apps/confedit/.cvsignore
index 2c33e73..1ee9a27 100644
--- a/noncore/apps/confedit/.cvsignore
+++ b/noncore/apps/confedit/.cvsignore
@@ -1,3 +1,3 @@
-moc_*
 *.moc
 Makefile*
+moc_*
diff --git a/noncore/apps/opie-console/.cvsignore b/noncore/apps/opie-console/.cvsignore
index 41d9740..84e7f84 100644
--- a/noncore/apps/opie-console/.cvsignore
+++ b/noncore/apps/opie-console/.cvsignore
@@ -1 +1,3 @@
+Makefile
+Makefile.in
 configurebase.cpp
@@ -5,3 +7 @@ editbase.h
 moc*.cpp
-Makefile
-Makefile.in
diff --git a/noncore/apps/opie-reader/.cvsignore b/noncore/apps/opie-reader/.cvsignore
index 5344d1b..2f8556e 100644
--- a/noncore/apps/opie-reader/.cvsignore
+++ b/noncore/apps/opie-reader/.cvsignore
diff --git a/noncore/apps/opie-sheet/.cvsignore b/noncore/apps/opie-sheet/.cvsignore
index 5344d1b..2f8556e 100644
--- a/noncore/apps/opie-sheet/.cvsignore
+++ b/noncore/apps/opie-sheet/.cvsignore
diff --git a/noncore/apps/oxygen/.cvsignore b/noncore/apps/oxygen/.cvsignore
index af13397..0639a7b 100644
--- a/noncore/apps/oxygen/.cvsignore
+++ b/noncore/apps/oxygen/.cvsignore
@@ -1,5 +1,5 @@
-calcdlg.h
-calcdlg.cpp
-moc_*
 *.moc
 Makefile*
+calcdlg.cpp
+calcdlg.h
+moc_*
diff --git a/noncore/apps/tableviewer/.cvsignore b/noncore/apps/tableviewer/.cvsignore
index c9b2d45..2efb31c 100644
--- a/noncore/apps/tableviewer/.cvsignore
+++ b/noncore/apps/tableviewer/.cvsignore
@@ -1,3 +1,3 @@
-moc_*
 Makefile*
+moc_*
 tvbrowseview_gen.h
diff --git a/noncore/apps/tableviewer/db/.cvsignore b/noncore/apps/tableviewer/db/.cvsignore
index e85fc5f..8c18ed8 100644
--- a/noncore/apps/tableviewer/db/.cvsignore
+++ b/noncore/apps/tableviewer/db/.cvsignore
@@ -1,3 +1,3 @@
-moc_*
-Makefile*
 
+Makefile*
+moc_*
diff --git a/noncore/apps/tableviewer/ui/.cvsignore b/noncore/apps/tableviewer/ui/.cvsignore
index 8b58142..a214dbf 100644
--- a/noncore/apps/tableviewer/ui/.cvsignore
+++ b/noncore/apps/tableviewer/ui/.cvsignore
@@ -1,8 +1,8 @@
-moc_*
 Makefile*
-tvbrowseview_gen.h
-tvfilterview_gen.h
-tvkeyedit_gen.h
+moc_*
 tvbrowseview_gen.cpp
+tvbrowseview_gen.h
 tvfilterview_gen.cpp
+tvfilterview_gen.h
 tvkeyedit_gen.cpp
+tvkeyedit_gen.h
diff --git a/noncore/comm/keypebble/.cvsignore b/noncore/comm/keypebble/.cvsignore
index 9cb660e..a5dbc3a 100644
--- a/noncore/comm/keypebble/.cvsignore
+++ b/noncore/comm/keypebble/.cvsignore
@@ -1,6 +1,3 @@
-moc_*
 *.moc
 Makefile*
-vncoptionsbase.cpp
-vncoptionsbase.h
 kvncbookmarkdlgbase.cpp
@@ -9 +6,4 @@ kvncconndlgbase.cpp
 kvncconndlgbase.h
\ No newline at end of file
+moc_*
+vncoptionsbase.cpp
+vncoptionsbase.h
diff --git a/noncore/comm/mobilemsg/.cvsignore b/noncore/comm/mobilemsg/.cvsignore
index 8fda2dd..c34cef3 100644
--- a/noncore/comm/mobilemsg/.cvsignore
+++ b/noncore/comm/mobilemsg/.cvsignore
@@ -1,2 +1 @@
-moc_*
 *.moc
@@ -5 +4,2 @@ mobilemsgbase.cpp
 mobilemsgbase.h
+moc_*
diff --git a/noncore/games/buzzword/.cvsignore b/noncore/games/buzzword/.cvsignore
index 2c33e73..1ee9a27 100644
--- a/noncore/games/buzzword/.cvsignore
+++ b/noncore/games/buzzword/.cvsignore
@@ -1,3 +1,3 @@
-moc_*
 *.moc
 Makefile*
+moc_*
diff --git a/noncore/games/fifteen/.cvsignore b/noncore/games/fifteen/.cvsignore
index 9dc4ec8..c13418b 100644
--- a/noncore/games/fifteen/.cvsignore
+++ b/noncore/games/fifteen/.cvsignore
@@ -1,2 +1,2 @@
-moc_*
 Makefile*
+moc_*
diff --git a/noncore/games/go/.cvsignore b/noncore/games/go/.cvsignore
index 9dc4ec8..c13418b 100644
--- a/noncore/games/go/.cvsignore
+++ b/noncore/games/go/.cvsignore
@@ -1,2 +1,2 @@
-moc_*
 Makefile*
+moc_*
diff --git a/noncore/games/kbill/.cvsignore b/noncore/games/kbill/.cvsignore
index 28d14dd..7f0c1b8 100644
--- a/noncore/games/kbill/.cvsignore
+++ b/noncore/games/kbill/.cvsignore
@@ -1,7 +1,7 @@
-Makefile*
+*.o
 .deps
 .libs
-*.o
-moc_*
+Makefile*
 helpdialog.cpp
 helpdialog.h
\ No newline at end of file
+moc_*
diff --git a/noncore/games/kcheckers/.cvsignore b/noncore/games/kcheckers/.cvsignore
index 2c33e73..1ee9a27 100644
--- a/noncore/games/kcheckers/.cvsignore
+++ b/noncore/games/kcheckers/.cvsignore
@@ -1,3 +1,3 @@
-moc_*
 *.moc
 Makefile*
+moc_*
diff --git a/noncore/games/kpacman/.cvsignore b/noncore/games/kpacman/.cvsignore
index 2c33e73..1ee9a27 100644
--- a/noncore/games/kpacman/.cvsignore
+++ b/noncore/games/kpacman/.cvsignore
@@ -1,3 +1,3 @@
-moc_*
 *.moc
 Makefile*
+moc_*
diff --git a/noncore/games/mindbreaker/.cvsignore b/noncore/games/mindbreaker/.cvsignore
index a5f470b..0e4d9eb 100644
--- a/noncore/games/mindbreaker/.cvsignore
+++ b/noncore/games/mindbreaker/.cvsignore
@@ -1,4 +1,4 @@
 Makefile*
-moc_*
 helpdialog.cpp
 helpdialog.h
+moc_*
diff --git a/noncore/games/minesweep/.cvsignore b/noncore/games/minesweep/.cvsignore
index 9dc4ec8..c13418b 100644
--- a/noncore/games/minesweep/.cvsignore
+++ b/noncore/games/minesweep/.cvsignore
@@ -1,2 +1,2 @@
-moc_*
 Makefile*
+moc_*
diff --git a/noncore/games/parashoot/.cvsignore b/noncore/games/parashoot/.cvsignore
index 2c33e73..1ee9a27 100644
--- a/noncore/games/parashoot/.cvsignore
+++ b/noncore/games/parashoot/.cvsignore
@@ -1,3 +1,3 @@
-moc_*
 *.moc
 Makefile*
+moc_*
diff --git a/noncore/games/qasteroids/.cvsignore b/noncore/games/qasteroids/.cvsignore
index ade54d0..3ddb981 100644
--- a/noncore/games/qasteroids/.cvsignore
+++ b/noncore/games/qasteroids/.cvsignore
@@ -1,2 +1,2 @@
-moc_*.cpp
 Makefile*
+moc_*.cpp
diff --git a/noncore/games/snake/.cvsignore b/noncore/games/snake/.cvsignore
index 2c33e73..1ee9a27 100644
--- a/noncore/games/snake/.cvsignore
+++ b/noncore/games/snake/.cvsignore
@@ -1,3 +1,3 @@
-moc_*
 *.moc
 Makefile*
+moc_*
diff --git a/noncore/games/solitaire/.cvsignore b/noncore/games/solitaire/.cvsignore
index 2c33e73..1ee9a27 100644
--- a/noncore/games/solitaire/.cvsignore
+++ b/noncore/games/solitaire/.cvsignore
@@ -1,3 +1,3 @@
-moc_*
 *.moc
 Makefile*
+moc_*
diff --git a/noncore/games/tetrix/.cvsignore b/noncore/games/tetrix/.cvsignore
index 2c33e73..1ee9a27 100644
--- a/noncore/games/tetrix/.cvsignore
+++ b/noncore/games/tetrix/.cvsignore
@@ -1,3 +1,3 @@
-moc_*
 *.moc
 Makefile*
+moc_*
diff --git a/noncore/games/tictac/.cvsignore b/noncore/games/tictac/.cvsignore
index c9bb88e..1ee9a27 100644
--- a/noncore/games/tictac/.cvsignore
+++ b/noncore/games/tictac/.cvsignore
@@ -1,3 +1,3 @@
+*.moc
 Makefile*
 moc_*
-*.moc
\ No newline at end of file
diff --git a/noncore/games/wordgame/.cvsignore b/noncore/games/wordgame/.cvsignore
index c3374a5..7e4b231 100644
--- a/noncore/games/wordgame/.cvsignore
+++ b/noncore/games/wordgame/.cvsignore
@@ -1,6 +1,6 @@
-moc_*
 Makefile*
-newgamebase.h
-rulesbase.h
+moc_*
 newgamebase.cpp
+newgamebase.h
 rulesbase.cpp
+rulesbase.h
diff --git a/noncore/graphics/drawpad/.cvsignore b/noncore/graphics/drawpad/.cvsignore
index 2c33e73..1ee9a27 100644
--- a/noncore/graphics/drawpad/.cvsignore
+++ b/noncore/graphics/drawpad/.cvsignore
@@ -1,3 +1,3 @@
-moc_*
 *.moc
 Makefile*
+moc_*
diff --git a/noncore/multimedia/opieplayer2/.cvsignore b/noncore/multimedia/opieplayer2/.cvsignore
index 9dc4ec8..c13418b 100644
--- a/noncore/multimedia/opieplayer2/.cvsignore
+++ b/noncore/multimedia/opieplayer2/.cvsignore
@@ -1,2 +1,2 @@
-moc_*
 Makefile*
+moc_*
diff --git a/noncore/net/.cvsignore b/noncore/net/.cvsignore
index 21bc64c..8517730 100644
--- a/noncore/net/.cvsignore
+++ b/noncore/net/.cvsignore
@@ -1,2 +1,3 @@
 bin
-plugins
\ No newline at end of file
+config.in
+pluginsconfig.in
diff --git a/noncore/net/networksetup/.cvsignore b/noncore/net/networksetup/.cvsignore
index d753773..1ba7ac7 100644
--- a/noncore/net/networksetup/.cvsignore
+++ b/noncore/net/networksetup/.cvsignore
@@ -1,2 +1 @@
-.moc.cpp
 *.moc
@@ -4,5 +3,5 @@
 *.o
-moc_*.cpp
-.libs
 .deps
+.libs
+.moc.cpp
 .moc.o
@@ -10,3 +9,2 @@ moc_*.cpp
 Makefile*
-networksetup
 addconnection.cpp
@@ -21,2 +19,4 @@ mainwindow.cpp
 mainwindow.h
+moc_*.cpp
+networksetup
 systemadvanced.cpp
diff --git a/noncore/net/networksetup/interfaces/.cvsignore b/noncore/net/networksetup/interfaces/.cvsignore
index b579188..1655b12 100644
--- a/noncore/net/networksetup/interfaces/.cvsignore
+++ b/noncore/net/networksetup/interfaces/.cvsignore
@@ -1,4 +1,11 @@
+
 Makefile
-moc*
+Makefile.in
+interfaceadvanced.cpp
+interfaceadvanced.h
+interfaceinformation.cpp
+interfaceinformation.h
+interfacesetup.cpp
+interfacesetup.h
 lib*.so*
-
+moc*
diff --git a/noncore/net/networksetup/ppp/.cvsignore b/noncore/net/networksetup/ppp/.cvsignore
index d753773..1ba7ac7 100644
--- a/noncore/net/networksetup/ppp/.cvsignore
+++ b/noncore/net/networksetup/ppp/.cvsignore
@@ -1,2 +1 @@
-.moc.cpp
 *.moc
@@ -4,5 +3,5 @@
 *.o
-moc_*.cpp
-.libs
 .deps
+.libs
+.moc.cpp
 .moc.o
@@ -10,3 +9,2 @@ moc_*.cpp
 Makefile*
-networksetup
 addconnection.cpp
@@ -21,2 +19,4 @@ mainwindow.cpp
 mainwindow.h
+moc_*.cpp
+networksetup
 systemadvanced.cpp
diff --git a/noncore/net/networksetup/wlan/.cvsignore b/noncore/net/networksetup/wlan/.cvsignore
index 303d994..7073cac 100644
--- a/noncore/net/networksetup/wlan/.cvsignore
+++ b/noncore/net/networksetup/wlan/.cvsignore
@@ -1,7 +1,7 @@
-moc_*
 Makefile
 Makefile.in
-wlan.cpp
-wlan.h
 info.cpp
 info.h
+moc_*
+wlan.cpp
+wlan.h
diff --git a/noncore/net/opieftp/.cvsignore b/noncore/net/opieftp/.cvsignore
index c9bb88e..1ee9a27 100644
--- a/noncore/net/opieftp/.cvsignore
+++ b/noncore/net/opieftp/.cvsignore
@@ -1,3 +1,3 @@
+*.moc
 Makefile*
 moc_*
-*.moc
\ No newline at end of file
diff --git a/noncore/net/ubrowser/.cvsignore b/noncore/net/ubrowser/.cvsignore
index 9dc4ec8..c13418b 100644
--- a/noncore/net/ubrowser/.cvsignore
+++ b/noncore/net/ubrowser/.cvsignore
@@ -1,2 +1,2 @@
-moc_*
 Makefile*
+moc_*
diff --git a/noncore/net/wellenreiter/.cvsignore b/noncore/net/wellenreiter/.cvsignore
index 7bf83fd..6a208ca 100644
--- a/noncore/net/wellenreiter/.cvsignore
+++ b/noncore/net/wellenreiter/.cvsignore
@@ -1,5 +1,5 @@
-Makefile*
 *.o
 *~
-wellenreiterbase.h
+Makefile*
 moc_*
+wellenreiterbase.h
diff --git a/noncore/net/wellenreiter/gui/.cvsignore b/noncore/net/wellenreiter/gui/.cvsignore
index b98f182..b126f44 100644
--- a/noncore/net/wellenreiter/gui/.cvsignore
+++ b/noncore/net/wellenreiter/gui/.cvsignore
@@ -1,6 +1,6 @@
-Makefile*
 *.o
 *~
+Makefile*
+moc_*
 wellenreiterbase.cpp
 wellenreiterbase.h
-moc_*
diff --git a/noncore/settings/appearance2/.cvsignore b/noncore/settings/appearance2/.cvsignore
index c55c0bc..978339f 100644
--- a/noncore/settings/appearance2/.cvsignore
+++ b/noncore/settings/appearance2/.cvsignore
@@ -1 +1,4 @@
 Makefile*
+moc_appearance.cpp
+moc_editScheme.cpp
+moc_sample.cpp
diff --git a/noncore/settings/aqpkg/.cvsignore b/noncore/settings/aqpkg/.cvsignore
index 1bfb5f6..f09f1a0 100644
--- a/noncore/settings/aqpkg/.cvsignore
+++ b/noncore/settings/aqpkg/.cvsignore
@@ -1,8 +1,8 @@
 Makefile*
-moc*
 install.cpp
 install.h
-settings.h
-settings.cpp
-instoptions.h
 instoptions.cpp
\ No newline at end of file
+instoptions.h
+moc*
+settings.cpp
+settings.h
diff --git a/noncore/settings/backup/.cvsignore b/noncore/settings/backup/.cvsignore
index 42f3789..a44f46d 100644
--- a/noncore/settings/backup/.cvsignore
+++ b/noncore/settings/backup/.cvsignore
@@ -1,4 +1,4 @@
-moc_*
 Makefile*
-backuprestorebase.h
 backuprestorebase.cpp
\ No newline at end of file
+backuprestorebase.h
+moc_*
diff --git a/noncore/settings/language/.cvsignore b/noncore/settings/language/.cvsignore
index e3553f3..50a4b1c 100644
--- a/noncore/settings/language/.cvsignore
+++ b/noncore/settings/language/.cvsignore
@@ -1,4 +1,4 @@
-moc_*
 Makefile*
-languagesettingsbase.h
 languagesettingsbase.cpp
+languagesettingsbase.h
+moc_*
diff --git a/noncore/settings/mediummount/.cvsignore b/noncore/settings/mediummount/.cvsignore
index 2c33e73..1ee9a27 100644
--- a/noncore/settings/mediummount/.cvsignore
+++ b/noncore/settings/mediummount/.cvsignore
@@ -1,3 +1,3 @@
-moc_*
 *.moc
 Makefile*
+moc_*
diff --git a/noncore/settings/netsystemtime/.cvsignore b/noncore/settings/netsystemtime/.cvsignore
index fcb40b9..3612e1d 100644
--- a/noncore/settings/netsystemtime/.cvsignore
+++ b/noncore/settings/netsystemtime/.cvsignore
@@ -1,6 +1,6 @@
-moc_*
 *.moc
 Makefile*
-netbase.h
+moc_*
 netbase.cpp
+netbase.h
 ntpbase.cpp
diff --git a/noncore/settings/networksettings/.cvsignore b/noncore/settings/networksettings/.cvsignore
index d753773..1ba7ac7 100644
--- a/noncore/settings/networksettings/.cvsignore
+++ b/noncore/settings/networksettings/.cvsignore
@@ -1,2 +1 @@
-.moc.cpp
 *.moc
@@ -4,5 +3,5 @@
 *.o
-moc_*.cpp
-.libs
 .deps
+.libs
+.moc.cpp
 .moc.o
@@ -10,3 +9,2 @@ moc_*.cpp
 Makefile*
-networksetup
 addconnection.cpp
@@ -21,2 +19,4 @@ mainwindow.cpp
 mainwindow.h
+moc_*.cpp
+networksetup
 systemadvanced.cpp
diff --git a/noncore/settings/networksettings/interfaces/.cvsignore b/noncore/settings/networksettings/interfaces/.cvsignore
index b579188..1655b12 100644
--- a/noncore/settings/networksettings/interfaces/.cvsignore
+++ b/noncore/settings/networksettings/interfaces/.cvsignore
@@ -1,4 +1,11 @@
+
 Makefile
-moc*
+Makefile.in
+interfaceadvanced.cpp
+interfaceadvanced.h
+interfaceinformation.cpp
+interfaceinformation.h
+interfacesetup.cpp
+interfacesetup.h
 lib*.so*
-
+moc*
diff --git a/noncore/settings/networksettings/ppp/.cvsignore b/noncore/settings/networksettings/ppp/.cvsignore
index d753773..1ba7ac7 100644
--- a/noncore/settings/networksettings/ppp/.cvsignore
+++ b/noncore/settings/networksettings/ppp/.cvsignore
@@ -1,2 +1 @@
-.moc.cpp
 *.moc
@@ -4,5 +3,5 @@
 *.o
-moc_*.cpp
-.libs
 .deps
+.libs
+.moc.cpp
 .moc.o
@@ -10,3 +9,2 @@ moc_*.cpp
 Makefile*
-networksetup
 addconnection.cpp
@@ -21,2 +19,4 @@ mainwindow.cpp
 mainwindow.h
+moc_*.cpp
+networksetup
 systemadvanced.cpp
diff --git a/noncore/settings/networksettings/wlan/.cvsignore b/noncore/settings/networksettings/wlan/.cvsignore
index 303d994..7073cac 100644
--- a/noncore/settings/networksettings/wlan/.cvsignore
+++ b/noncore/settings/networksettings/wlan/.cvsignore
@@ -1,7 +1,7 @@
-moc_*
 Makefile
 Makefile.in
-wlan.cpp
-wlan.h
 info.cpp
 info.h
+moc_*
+wlan.cpp
+wlan.h
diff --git a/noncore/settings/sound/.cvsignore b/noncore/settings/sound/.cvsignore
index be1999c..d17b35d 100644
--- a/noncore/settings/sound/.cvsignore
+++ b/noncore/settings/sound/.cvsignore
@@ -1,4 +1,4 @@
+*.moc
 Makefile*
 moc_*
-*.moc
 soundsettingsbase.cpp
diff --git a/noncore/settings/sshkeys/.cvsignore b/noncore/settings/sshkeys/.cvsignore
index 19bace6..3535039 100644
--- a/noncore/settings/sshkeys/.cvsignore
+++ b/noncore/settings/sshkeys/.cvsignore
diff --git a/noncore/settings/sysinfo/.cvsignore b/noncore/settings/sysinfo/.cvsignore
index 2c33e73..1ee9a27 100644
--- a/noncore/settings/sysinfo/.cvsignore
+++ b/noncore/settings/sysinfo/.cvsignore
@@ -1,3 +1,3 @@
-moc_*
 *.moc
 Makefile*
+moc_*
diff --git a/noncore/settings/tabmanager/.cvsignore b/noncore/settings/tabmanager/.cvsignore
index 7681a0d..7195096 100644
--- a/noncore/settings/tabmanager/.cvsignore
+++ b/noncore/settings/tabmanager/.cvsignore
@@ -1,2 +1 @@
-moc_*
 *.moc
@@ -5,2 +4,3 @@ app.cpp
 app.h
+moc_*
 wait.cpp
diff --git a/noncore/settings/usermanager/.cvsignore b/noncore/settings/usermanager/.cvsignore
index 9338e43..2888d4a 100644
--- a/noncore/settings/usermanager/.cvsignore
+++ b/noncore/settings/usermanager/.cvsignore
diff --git a/noncore/styles/flat/.cvsignore b/noncore/styles/flat/.cvsignore
index c55c0bc..b5dab84 100644
--- a/noncore/styles/flat/.cvsignore
+++ b/noncore/styles/flat/.cvsignore
@@ -1 +1,2 @@
 Makefile*
+flat.moc
diff --git a/noncore/styles/metal/.cvsignore b/noncore/styles/metal/.cvsignore
index 2c33e73..1ee9a27 100644
--- a/noncore/styles/metal/.cvsignore
+++ b/noncore/styles/metal/.cvsignore
@@ -1,3 +1,3 @@
-moc_*
 *.moc
 Makefile*
+moc_*
diff --git a/noncore/styles/theme/.cvsignore b/noncore/styles/theme/.cvsignore
index 2c33e73..1ee9a27 100644
--- a/noncore/styles/theme/.cvsignore
+++ b/noncore/styles/theme/.cvsignore
@@ -1,3 +1,3 @@
-moc_*
 *.moc
 Makefile*
+moc_*
diff --git a/noncore/todayplugins/stockticker/.cvsignore b/noncore/todayplugins/stockticker/.cvsignore
index 2ae3270..282522d 100644
--- a/noncore/todayplugins/stockticker/.cvsignore
+++ b/noncore/todayplugins/stockticker/.cvsignore
@@ -2,3 +2 @@ Makefile
 Makefile.in
-Makefile
-Makefile.in
diff --git a/noncore/todayplugins/stockticker/libstocks/.cvsignore b/noncore/todayplugins/stockticker/libstocks/.cvsignore
index c9bb88e..1ee9a27 100644
--- a/noncore/todayplugins/stockticker/libstocks/.cvsignore
+++ b/noncore/todayplugins/stockticker/libstocks/.cvsignore
@@ -1,3 +1,3 @@
+*.moc
 Makefile*
 moc_*
-*.moc
\ No newline at end of file
diff --git a/noncore/todayplugins/stockticker/stockticker/.cvsignore b/noncore/todayplugins/stockticker/stockticker/.cvsignore
index c9bb88e..1ee9a27 100644
--- a/noncore/todayplugins/stockticker/stockticker/.cvsignore
+++ b/noncore/todayplugins/stockticker/stockticker/.cvsignore
@@ -1,3 +1,3 @@
+*.moc
 Makefile*
 moc_*
-*.moc
\ No newline at end of file
diff --git a/noncore/todayplugins/stockticker/stocktickerlib/.cvsignore b/noncore/todayplugins/stockticker/stocktickerlib/.cvsignore
index c9bb88e..1ee9a27 100644
--- a/noncore/todayplugins/stockticker/stocktickerlib/.cvsignore
+++ b/noncore/todayplugins/stockticker/stocktickerlib/.cvsignore
@@ -1,3 +1,3 @@
+*.moc
 Makefile*
 moc_*
-*.moc
\ No newline at end of file
diff --git a/noncore/tools/calculator/.cvsignore b/noncore/tools/calculator/.cvsignore
index c0a6a70..0944a46 100644
--- a/noncore/tools/calculator/.cvsignore
+++ b/noncore/tools/calculator/.cvsignore
@@ -1,4 +1,4 @@
-moc_*
 Makefile*
-calculator.h
 calculator.cpp
+calculator.h
+moc_*
diff --git a/noncore/tools/clock/.cvsignore b/noncore/tools/clock/.cvsignore
index 9dc4ec8..c13418b 100644
--- a/noncore/tools/clock/.cvsignore
+++ b/noncore/tools/clock/.cvsignore
@@ -1,2 +1,2 @@
-moc_*
 Makefile*
+moc_*
diff --git a/noncore/tools/formatter/.cvsignore b/noncore/tools/formatter/.cvsignore
index c9bb88e..1ee9a27 100644
--- a/noncore/tools/formatter/.cvsignore
+++ b/noncore/tools/formatter/.cvsignore
@@ -1,3 +1,3 @@
+*.moc
 Makefile*
 moc_*
-*.moc
\ No newline at end of file
diff --git a/noncore/tools/opie-sh/.cvsignore b/noncore/tools/opie-sh/.cvsignore
index 2c33e73..1ee9a27 100644
--- a/noncore/tools/opie-sh/.cvsignore
+++ b/noncore/tools/opie-sh/.cvsignore
@@ -1,3 +1,3 @@
-moc_*
 *.moc
 Makefile*
+moc_*
diff --git a/noncore/unsupported/filebrowser/.cvsignore b/noncore/unsupported/filebrowser/.cvsignore
index 9dc4ec8..c13418b 100644
--- a/noncore/unsupported/filebrowser/.cvsignore
+++ b/noncore/unsupported/filebrowser/.cvsignore
@@ -1,2 +1,2 @@
-moc_*
 Makefile*
+moc_*
diff --git a/noncore/unsupported/gsmtool/.cvsignore b/noncore/unsupported/gsmtool/.cvsignore
index cb1f387..efeaa08 100644
--- a/noncore/unsupported/gsmtool/.cvsignore
+++ b/noncore/unsupported/gsmtool/.cvsignore
@@ -1,2 +1,2 @@
-moc_*
+
 Makefile*
@@ -4,2 +4,2 @@ gsmtoolbase.cpp
 gsmtoolbase.h
-
+moc_*
diff --git a/noncore/unsupported/mail2/.cvsignore b/noncore/unsupported/mail2/.cvsignore
index a22036b..0f61d21 100644
--- a/noncore/unsupported/mail2/.cvsignore
+++ b/noncore/unsupported/mail2/.cvsignore
@@ -1,2 +1 @@
-moc_*
 *.moc
@@ -9,2 +8,3 @@ configdiagbase.cpp
 configdiagbase.h
+moc_*
 opendiagbase.cpp
diff --git a/noncore/unsupported/mail2/bend/.cvsignore b/noncore/unsupported/mail2/bend/.cvsignore
index 2c33e73..1ee9a27 100644
--- a/noncore/unsupported/mail2/bend/.cvsignore
+++ b/noncore/unsupported/mail2/bend/.cvsignore
@@ -1,3 +1,3 @@
-moc_*
 *.moc
 Makefile*
+moc_*
diff --git a/noncore/unsupported/mail2/libmail/.cvsignore b/noncore/unsupported/mail2/libmail/.cvsignore
index 2c33e73..1ee9a27 100644
--- a/noncore/unsupported/mail2/libmail/.cvsignore
+++ b/noncore/unsupported/mail2/libmail/.cvsignore
@@ -1,3 +1,3 @@
-moc_*
 *.moc
 Makefile*
+moc_*
diff --git a/noncore/unsupported/oipkg/.cvsignore b/noncore/unsupported/oipkg/.cvsignore
index aa6b905..f44a997 100644
--- a/noncore/unsupported/oipkg/.cvsignore
+++ b/noncore/unsupported/oipkg/.cvsignore
@@ -1 +1,3 @@
+*.kdev*
+*~
 .cvsignore
@@ -3,4 +5,2 @@ Makefile*
 moc_*
-*~
-*.kdev*
 pksettingsbase.cpp
diff --git a/noncore/unsupported/qpdf/.cvsignore b/noncore/unsupported/qpdf/.cvsignore
index 2c33e73..1ee9a27 100644
--- a/noncore/unsupported/qpdf/.cvsignore
+++ b/noncore/unsupported/qpdf/.cvsignore
@@ -1,3 +1,3 @@
-moc_*
 *.moc
 Makefile*
+moc_*