129 files changed, 269 insertions, 224 deletions

diff --git a/.cvsignore b/.cvsignore
index 53857ca..0f76db1 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,11 +1,11 @@
-moc_*
-include
 *.ipk
-Packages
 ..config.cmd
 .config
 .config.old
 .depends
 .depends.cfgs
 .tmpconfig.h
+Packages
 config.in
+include
+moc_*
diff --git a/apps/.cvsignore b/apps/.cvsignore
index a67f651..1f56099 100644
--- a/apps/.cvsignore
+++ b/apps/.cvsignore
@@ -1 +1 @@
-Applications
\ No newline at end of file
+Applications
diff --git a/apps/Applications/.cvsignore b/apps/Applications/.cvsignore
index 0fa7076..af66d7d 100644
--- a/apps/Applications/.cvsignore
+++ b/apps/Applications/.cvsignore
@@ -2,15 +2,15 @@ addressbook
 calculator
 citytime
 clock
 datebook
 embeddedkonsole
 helpbrowser
+keypebble
 konqueror
 mpegplayer
 showimg
 spreadsheet
 sysinfo
 tableviewer
 textedit
 todo
-keypebble
diff --git a/apps/Settings/.cvsignore b/apps/Settings/.cvsignore
index 5adacd6..587a732 100644
--- a/apps/Settings/.cvsignore
+++ b/apps/Settings/.cvsignore
@@ -5,7 +5,7 @@ Light
 Rotation
 Security
 Sound
 datetime
 netsetup
 qipkg
-quit
\ No newline at end of file
+quit
diff --git a/bin/.cvsignore b/bin/.cvsignore
index b8cbd0c..b52de5a 100644
--- a/bin/.cvsignore
+++ b/bin/.cvsignore
@@ -1,2 +1,2 @@
-[a-z]*
 .bookmarks
+[a-z]*
diff --git a/core/.cvsignore b/core/.cvsignore
index 0a3293a..bebc752 100644
--- a/core/.cvsignore
+++ b/core/.cvsignore
@@ -1,15 +1,16 @@
-moc_*
 *.moc
-bin
-plugins
 Makefile
+appearancesettingsbase.cpp
 appearancesettingsbase.h
-soundsettingsbase.h
-lightsettingsbase.h
+bin
+config.in
 languagesettingsbase.cpp
-rotationsettingsbase.cpp
-appearancesettingsbase.cpp
-lightsettingsbase.cpp
 languagesettingsbase.h
+lightsettingsbase.cpp
+lightsettingsbase.h
+moc_*
+plugins
+rotationsettingsbase.cpp
 rotationsettingsbase.h
 soundsettingsbase.cpp
+soundsettingsbase.h
diff --git a/core/applets/batteryapplet/.cvsignore b/core/applets/batteryapplet/.cvsignore
index 2c33e73..1ee9a27 100644
--- a/core/applets/batteryapplet/.cvsignore
+++ b/core/applets/batteryapplet/.cvsignore
@@ -1,3 +1,3 @@
-moc_*
 *.moc
 Makefile*
+moc_*
diff --git a/core/applets/cardmon/.cvsignore b/core/applets/cardmon/.cvsignore
index 2c33e73..1ee9a27 100644
--- a/core/applets/cardmon/.cvsignore
+++ b/core/applets/cardmon/.cvsignore
@@ -1,3 +1,3 @@
-moc_*
 *.moc
 Makefile*
+moc_*
diff --git a/core/applets/clipboardapplet/.cvsignore b/core/applets/clipboardapplet/.cvsignore
index 2c33e73..1ee9a27 100644
--- a/core/applets/clipboardapplet/.cvsignore
+++ b/core/applets/clipboardapplet/.cvsignore
@@ -1,3 +1,3 @@
-moc_*
 *.moc
 Makefile*
+moc_*
diff --git a/core/applets/clockapplet/.cvsignore b/core/applets/clockapplet/.cvsignore
index 2c33e73..1ee9a27 100644
--- a/core/applets/clockapplet/.cvsignore
+++ b/core/applets/clockapplet/.cvsignore
@@ -1,3 +1,3 @@
-moc_*
 *.moc
 Makefile*
+moc_*
diff --git a/core/applets/irdaapplet/.cvsignore b/core/applets/irdaapplet/.cvsignore
index 2c33e73..1ee9a27 100644
--- a/core/applets/irdaapplet/.cvsignore
+++ b/core/applets/irdaapplet/.cvsignore
@@ -1,3 +1,3 @@
-moc_*
 *.moc
 Makefile*
+moc_*
diff --git a/core/applets/restartapplet/.cvsignore b/core/applets/restartapplet/.cvsignore
index 7c4a217..99a2727 100644
--- a/core/applets/restartapplet/.cvsignore
+++ b/core/applets/restartapplet/.cvsignore
@@ -1,5 +1,5 @@
-moc_*
 *.moc
-Makefile*
 *.~
-opieobj
\ No newline at end of file
+Makefile*
+moc_*
+opieobj
diff --git a/core/applets/restartapplet2/.cvsignore b/core/applets/restartapplet2/.cvsignore
index 7c4a217..4943911 100644
--- a/core/applets/restartapplet2/.cvsignore
+++ b/core/applets/restartapplet2/.cvsignore
@@ -1,5 +1,6 @@
-moc_*
 *.moc
-Makefile*
 *.~
-opieobj
\ No newline at end of file
+Makefile*
+config.in
+moc_*
+opieobjconfig.in
diff --git a/core/applets/screenshotapplet/.cvsignore b/core/applets/screenshotapplet/.cvsignore
index 7c4a217..99a2727 100644
--- a/core/applets/screenshotapplet/.cvsignore
+++ b/core/applets/screenshotapplet/.cvsignore
@@ -1,5 +1,5 @@
-moc_*
 *.moc
-Makefile*
 *.~
-opieobj
\ No newline at end of file
+Makefile*
+moc_*
+opieobj
diff --git a/core/applets/vmemo/.cvsignore b/core/applets/vmemo/.cvsignore
index 2c33e73..1ee9a27 100644
--- a/core/applets/vmemo/.cvsignore
+++ b/core/applets/vmemo/.cvsignore
@@ -1,3 +1,3 @@
-moc_*
 *.moc
 Makefile*
+moc_*
diff --git a/core/applets/volumeapplet/.cvsignore b/core/applets/volumeapplet/.cvsignore
index 2c33e73..1ee9a27 100644
--- a/core/applets/volumeapplet/.cvsignore
+++ b/core/applets/volumeapplet/.cvsignore
@@ -1,3 +1,3 @@
-moc_*
 *.moc
 Makefile*
+moc_*
diff --git a/core/apps/.cvsignore b/core/apps/.cvsignore
index c5e82d7..faa68ae 100644
--- a/core/apps/.cvsignore
+++ b/core/apps/.cvsignore
@@ -1 +1,2 @@
-bin
\ No newline at end of file
+binconfig.in
+config.in
diff --git a/core/apps/calibrate/.cvsignore b/core/apps/calibrate/.cvsignore
index 2c33e73..1ee9a27 100644
--- a/core/apps/calibrate/.cvsignore
+++ b/core/apps/calibrate/.cvsignore
@@ -1,3 +1,3 @@
-moc_*
 *.moc
 Makefile*
+moc_*
diff --git a/core/apps/embeddedkonsole/.cvsignore b/core/apps/embeddedkonsole/.cvsignore
index 13a4c2a..e76ff12 100644
--- a/core/apps/embeddedkonsole/.cvsignore
+++ b/core/apps/embeddedkonsole/.cvsignore
@@ -1,6 +1,6 @@
-moc_*
 Makefile*
 commandeditdialogbase.cpp
 commandeditdialogbase.h
+moc_*
 smallcommandeditdialogbase.cpp
-smallcommandeditdialogbase.h
\ No newline at end of file
+smallcommandeditdialogbase.h
diff --git a/core/apps/helpbrowser/.cvsignore b/core/apps/helpbrowser/.cvsignore
index 9dc4ec8..c13418b 100644
--- a/core/apps/helpbrowser/.cvsignore
+++ b/core/apps/helpbrowser/.cvsignore
@@ -1,2 +1,2 @@
-moc_*
 Makefile*
+moc_*
diff --git a/core/apps/qcop/.cvsignore b/core/apps/qcop/.cvsignore
index 2c33e73..1ee9a27 100644
--- a/core/apps/qcop/.cvsignore
+++ b/core/apps/qcop/.cvsignore
@@ -1,3 +1,3 @@
-moc_*
 *.moc
 Makefile*
+moc_*
diff --git a/core/apps/textedit/.cvsignore b/core/apps/textedit/.cvsignore
index 2c33e73..1ee9a27 100644
--- a/core/apps/textedit/.cvsignore
+++ b/core/apps/textedit/.cvsignore
@@ -1,3 +1,3 @@
-moc_*
 *.moc
 Makefile*
+moc_*
diff --git a/core/launcher/.cvsignore b/core/launcher/.cvsignore
index 091569c..ff06661 100644
--- a/core/launcher/.cvsignore
+++ b/core/launcher/.cvsignore
@@ -1,9 +1,9 @@
-moc_*
 *.moc
 Makefile*
 lnkpropertiesbase.cpp
 lnkpropertiesbase.h
+moc_*
 shutdown.cpp
 shutdown.h
 syncdialog.cpp
-syncdialog.h
\ No newline at end of file
+syncdialog.h
diff --git a/core/multimedia/opieplayer/.cvsignore b/core/multimedia/opieplayer/.cvsignore
index 9dc4ec8..c13418b 100644
--- a/core/multimedia/opieplayer/.cvsignore
+++ b/core/multimedia/opieplayer/.cvsignore
@@ -1,2 +1,2 @@
-moc_*
 Makefile*
+moc_*
diff --git a/core/multimedia/opieplayer/libmad/.cvsignore b/core/multimedia/opieplayer/libmad/.cvsignore
index 9dc4ec8..c13418b 100644
--- a/core/multimedia/opieplayer/libmad/.cvsignore
+++ b/core/multimedia/opieplayer/libmad/.cvsignore
@@ -1,2 +1,2 @@
-moc_*
 Makefile*
+moc_*
diff --git a/core/multimedia/opieplayer/libmpeg3/.cvsignore b/core/multimedia/opieplayer/libmpeg3/.cvsignore
index b1d7a41..32eaba6 100644
--- a/core/multimedia/opieplayer/libmpeg3/.cvsignore
+++ b/core/multimedia/opieplayer/libmpeg3/.cvsignore
@@ -1,5 +1,5 @@
-global_config
+Makefile*
 dump
-mpeg3toc
+global_config
 mpeg3cat
-Makefile*
+mpeg3toc
diff --git a/core/multimedia/opieplayer/modplug/.cvsignore b/core/multimedia/opieplayer/modplug/.cvsignore
index 9dc4ec8..c13418b 100644
--- a/core/multimedia/opieplayer/modplug/.cvsignore
+++ b/core/multimedia/opieplayer/modplug/.cvsignore
@@ -1,2 +1,2 @@
-moc_*
 Makefile*
+moc_*
diff --git a/core/multimedia/opieplayer/wavplugin/.cvsignore b/core/multimedia/opieplayer/wavplugin/.cvsignore
index 9dc4ec8..c13418b 100644
--- a/core/multimedia/opieplayer/wavplugin/.cvsignore
+++ b/core/multimedia/opieplayer/wavplugin/.cvsignore
@@ -1,2 +1,2 @@
-moc_*
 Makefile*
+moc_*
diff --git a/core/opie-login/.cvsignore b/core/opie-login/.cvsignore
index 32c3a23..398133f 100644
--- a/core/opie-login/.cvsignore
+++ b/core/opie-login/.cvsignore
@@ -1,5 +1,5 @@
-moc_*
 *.moc
 Makefile*
 loginwindow.cpp
 loginwindow.h
+moc_*
diff --git a/core/pim/addressbook/.cvsignore b/core/pim/addressbook/.cvsignore
index f54ca61..574f0e8 100644
--- a/core/pim/addressbook/.cvsignore
+++ b/core/pim/addressbook/.cvsignore
@@ -1,16 +1,18 @@
-moc_*
+
 Makefile*
-abeditorbase.h
+abaddress.cpp
 abaddress.h
+abcompanybase.cpp
 abcompanybase.h
-abnamebase.h
 abeditorbase.cpp
-abaddress.cpp
-abcompanybase.cpp
-abnamebase.cpp
-abeditorpage2base.ui
-abeditorpage2base.h
+abeditorbase.h
 abeditorpage2base.cpp
-addresssettingsbase.h
+abeditorpage2base.h
+abeditorpage2base.ui
+abnamebase.cpp
+abnamebase.h
 addresssettingsbase.cpp
-
+addresssettingsbase.h
+configdlg_base.cpp
+configdlg_base.h
+moc_*
diff --git a/core/pim/datebook/.cvsignore b/core/pim/datebook/.cvsignore
index 74ec374..fdde933 100644
--- a/core/pim/datebook/.cvsignore
+++ b/core/pim/datebook/.cvsignore
@@ -1,18 +1,18 @@
-moc_*
 Makefile*
-dateentry.h
-datebookdayheader.h
-dateentry.cpp
 datebookdayheader.cpp
+datebookdayheader.h
+datebooksettingsbase.cpp
+datebooksettingsbase.h
 datebookweekheader.cpp
 datebookweekheader.h
-datebooksettingsbase.h
-datebooksettingsbase.cpp
-repeatentrybase.cpp
-repeatentrybase.h
 datebookweeklstdayhdr.cpp
 datebookweeklstdayhdr.h
 datebookweeklstheader.cpp
 datebookweeklstheader.h
+dateentry.cpp
+dateentry.h
+moc_*
 noteentry.cpp
 noteentry.h
+repeatentrybase.cpp
+repeatentrybase.h
diff --git a/core/pim/today/.cvsignore b/core/pim/today/.cvsignore
index c9bb88e..1ee9a27 100644
--- a/core/pim/today/.cvsignore
+++ b/core/pim/today/.cvsignore
@@ -1,3 +1,3 @@
+*.moc
 Makefile*
 moc_*
-*.moc
\ No newline at end of file
diff --git a/core/pim/todo/.cvsignore b/core/pim/todo/.cvsignore
index 5264205..dd22a2a 100644
--- a/core/pim/todo/.cvsignore
+++ b/core/pim/todo/.cvsignore
@@ -1,4 +1,10 @@
-moc_*
 Makefile*
-todoentry.h
+moc_*
+taskeditoradvanced.cpp
+taskeditoradvanced.h
+taskeditoralarms.cpp
+taskeditoralarms.h
+taskeditoroverview.cpp
+taskeditoroverview.h
 todoentry.cpp
+todoentry.h
diff --git a/core/settings/citytime/.cvsignore b/core/settings/citytime/.cvsignore
index 2c33e73..1ee9a27 100644
--- a/core/settings/citytime/.cvsignore
+++ b/core/settings/citytime/.cvsignore
@@ -1,3 +1,3 @@
-moc_*
 *.moc
 Makefile*
+moc_*
diff --git a/core/settings/launcher/.cvsignore b/core/settings/launcher/.cvsignore
index 034a627..c13418b 100644
--- a/core/settings/launcher/.cvsignore
+++ b/core/settings/launcher/.cvsignore
@@ -1,2 +1,2 @@
 Makefile*
-moc_*
\ No newline at end of file
+moc_*
diff --git a/core/settings/light-and-power/.cvsignore b/core/settings/light-and-power/.cvsignore
index 2f487b2..22ad5db 100644
--- a/core/settings/light-and-power/.cvsignore
+++ b/core/settings/light-and-power/.cvsignore
@@ -1,4 +1,6 @@
-moc_*
 Makefile*
-lightsettingsbase.h
 lightsettingsbase.cpp
+lightsettingsbase.h
+moc_*
+sensorbase.cpp
+sensorbase.h
diff --git a/core/settings/security/.cvsignore b/core/settings/security/.cvsignore
index 7fd2c96..f16cc5c 100644
--- a/core/settings/security/.cvsignore
+++ b/core/settings/security/.cvsignore
@@ -1,5 +1,5 @@
+*.moc
 Makefile*
 moc_*
-*.moc
 securitybase.cpp
 securitybase.h
diff --git a/freetype/.cvsignore b/freetype/.cvsignore
index fccc477..0d3b928 100644
--- a/freetype/.cvsignore
+++ b/freetype/.cvsignore
@@ -1,5 +1,5 @@
-moc_*
 *.moc
 Makefile*
-qimpenprefbase.h
+moc_*
 qimpenprefbase.cpp
+qimpenprefbase.h
diff --git a/inputmethods/.cvsignore b/inputmethods/.cvsignore
index c55c0bc..2b77497 100644
--- a/inputmethods/.cvsignore
+++ b/inputmethods/.cvsignore
@@ -1 +1,2 @@
 Makefile*
+config.in
diff --git a/inputmethods/dvorak/.cvsignore b/inputmethods/dvorak/.cvsignore
index 936ecce..c13418b 100644
--- a/inputmethods/dvorak/.cvsignore
+++ b/inputmethods/dvorak/.cvsignore
@@ -1,2 +1,2 @@
+Makefile*
 moc_*
-Makefile*
\ No newline at end of file
diff --git a/inputmethods/handwriting/.cvsignore b/inputmethods/handwriting/.cvsignore
index fccc477..0d3b928 100644
--- a/inputmethods/handwriting/.cvsignore
+++ b/inputmethods/handwriting/.cvsignore
@@ -1,5 +1,5 @@
-moc_*
 *.moc
 Makefile*
-qimpenprefbase.h
+moc_*
 qimpenprefbase.cpp
+qimpenprefbase.h
diff --git a/inputmethods/jumpx/.cvsignore b/inputmethods/jumpx/.cvsignore
index 471270b..40300d8 100644
--- a/inputmethods/jumpx/.cvsignore
+++ b/inputmethods/jumpx/.cvsignore
@@ -1,4 +1,4 @@
-moc_*
-*.o
 *.moc
+*.o
 Makefile*
+moc_*
diff --git a/inputmethods/keyboard/.cvsignore b/inputmethods/keyboard/.cvsignore
index 2c33e73..1ee9a27 100644
--- a/inputmethods/keyboard/.cvsignore
+++ b/inputmethods/keyboard/.cvsignore
@@ -1,3 +1,3 @@
-moc_*
 *.moc
 Makefile*
+moc_*
diff --git a/inputmethods/kjumpx/.cvsignore b/inputmethods/kjumpx/.cvsignore
index 2c33e73..1ee9a27 100644
--- a/inputmethods/kjumpx/.cvsignore
+++ b/inputmethods/kjumpx/.cvsignore
@@ -1,3 +1,3 @@
-moc_*
 *.moc
 Makefile*
+moc_*
diff --git a/inputmethods/pickboard/.cvsignore b/inputmethods/pickboard/.cvsignore
index 2c33e73..1ee9a27 100644
--- a/inputmethods/pickboard/.cvsignore
+++ b/inputmethods/pickboard/.cvsignore
@@ -1,3 +1,3 @@
-moc_*
 *.moc
 Makefile*
+moc_*
diff --git a/inputmethods/unikeyboard/.cvsignore b/inputmethods/unikeyboard/.cvsignore
index 2c33e73..1ee9a27 100644
--- a/inputmethods/unikeyboard/.cvsignore
+++ b/inputmethods/unikeyboard/.cvsignore
@@ -1,3 +1,3 @@
-moc_*
 *.moc
 Makefile*
+moc_*
diff --git a/libopie/.cvsignore b/libopie/.cvsignore
index bb6b3da..f76e42e 100644
--- a/libopie/.cvsignore
+++ b/libopie/.cvsignore
@@ -1,5 +1,7 @@
-moc_*
 *.moc
 Makefile*
+moc_*
+orecurrancebase.cpp
+orecurrancebase.h
 otimepickerbase.cpp
 otimepickerbase.h
diff --git a/libopie/pim/.cvsignore b/libopie/pim/.cvsignore
index 06ddd28..0b05045 100644
--- a/libopie/pim/.cvsignore
+++ b/libopie/pim/.cvsignore
@@ -1 +1,4 @@
-moc*
\ No newline at end of file
+config.in
+moc*config.in
+moc_ocontactaccess.cpp
+moc_otodoaccess.cpp
diff --git a/library/.cvsignore b/library/.cvsignore
index a1ee829..9c7d2be 100644
--- a/library/.cvsignore
+++ b/library/.cvsignore
@@ -1,13 +1,14 @@
-moc_*
 *.moc
+.qmake.internal.cache
 Makefile*
-proxiesbase_p.h
-proxiesbase_p.cpp
-passwordbase_p.h
-passwordbase_p.cpp
 categoryeditbase_p.cpp
 categoryeditbase_p.h
 findwidgetbase_p.cpp
 findwidgetbase_p.h
 lnkpropertiesbase_p.cpp
 lnkpropertiesbase_p.h
+moc_*
+passwordbase_p.cpp
+passwordbase_p.h
+proxiesbase_p.cpp
+proxiesbase_p.h
diff --git a/library/backend/.cvsignore b/library/backend/.cvsignore
index e047b1f..4976896 100644
--- a/library/backend/.cvsignore
+++ b/library/backend/.cvsignore
@@ -1,2 +1,2 @@
-moc_*
 *.moc
+moc_*
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
@@ -1,4 +1,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*
 *.~
-opieobj
\ No newline at end of file
+Makefile*
+moc_*
+opieobj
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
@@ -1,4 +1,4 @@
 Makefile*
 advancedconfigbase.cpp
 advancedconfigbase.h
-moc_*
\ No newline at end of file
+moc_*
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
@@ -1,3 +1,3 @@
 Makefile
 Makefile.in
-moc*
\ No newline at end of file
+moc*
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,16 +1,16 @@
-moc_*
+
 *.moc
 Makefile*
+moc_*
 qcheckdetailsbase.cpp
 qcheckdetailsbase.h
 qcheckentrybase.cpp
 qcheckentrybase.h
 qcheckgraphbase.cpp
 qcheckgraphbase.h
 qcheckmmbase.cpp
 qcheckmmbase.h
 qchecknamebase.cpp
 qchecknamebase.h
 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,7 +1,7 @@
+Makefile
+Makefile.in
 configurebase.cpp
 configurebase.h
 editbase.cpp
 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
@@ -1,3 +1,3 @@
 Makefile
 Makefile.in
-moc*
\ No newline at end of file
+moc*
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
@@ -1,3 +1,3 @@
 Makefile
 Makefile.in
-moc*
\ No newline at end of file
+moc*
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,5 +1,5 @@
-moc_*
 Makefile*
+moc_*
 tvbrowseview_gen.h
 tvfilterview_gen.h
 tvkeyedit_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,9 +1,9 @@
-moc_*
 *.moc
 Makefile*
-vncoptionsbase.cpp
-vncoptionsbase.h
 kvncbookmarkdlgbase.cpp
 kvncbookmarkdlgbase.h
 kvncconndlgbase.cpp
-kvncconndlgbase.h
\ No newline at end of file
+kvncconndlgbase.h
+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,5 +1,5 @@
-moc_*
 *.moc
 Makefile*
 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
+helpdialog.h
+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,23 +1,23 @@
-.moc.cpp
 *.moc
 *.moc.o
 *.o
-moc_*.cpp
-.libs
 .deps
+.libs
+.moc.cpp
 .moc.o
 .o
 Makefile*
-networksetup
 addconnection.cpp
 addconnection.h
 interfaceadvanced.cpp
 interfaceadvanced.h
 interfaceinformation.cpp
 interfaceinformation.h
 interfacesetup.cpp
 interfacesetup.h
 mainwindow.cpp
 mainwindow.h
+moc_*.cpp
+networksetup
 systemadvanced.cpp
 systemadvanced.h
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,23 +1,23 @@
-.moc.cpp
 *.moc
 *.moc.o
 *.o
-moc_*.cpp
-.libs
 .deps
+.libs
+.moc.cpp
 .moc.o
 .o
 Makefile*
-networksetup
 addconnection.cpp
 addconnection.h
 interfaceadvanced.cpp
 interfaceadvanced.h
 interfaceinformation.cpp
 interfaceinformation.h
 interfacesetup.cpp
 interfacesetup.h
 mainwindow.cpp
 mainwindow.h
+moc_*.cpp
+networksetup
 systemadvanced.cpp
 systemadvanced.h
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.cpp
 instoptions.h
-instoptions.cpp
\ No newline at end of file
+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.cpp
 backuprestorebase.h
-backuprestorebase.cpp
\ No newline at end of file
+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,7 +1,7 @@
-moc_*
 *.moc
 Makefile*
-netbase.h
+moc_*
 netbase.cpp
+netbase.h
 ntpbase.cpp
 ntpbase.h
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,23 +1,23 @@
-.moc.cpp
 *.moc
 *.moc.o
 *.o
-moc_*.cpp
-.libs
 .deps
+.libs
+.moc.cpp
 .moc.o
 .o
 Makefile*
-networksetup
 addconnection.cpp
 addconnection.h
 interfaceadvanced.cpp
 interfaceadvanced.h
 interfaceinformation.cpp
 interfaceinformation.h
 interfacesetup.cpp
 interfacesetup.h
 mainwindow.cpp
 mainwindow.h
+moc_*.cpp
+networksetup
 systemadvanced.cpp
 systemadvanced.h
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,23 +1,23 @@
-.moc.cpp
 *.moc
 *.moc.o
 *.o
-moc_*.cpp
-.libs
 .deps
+.libs
+.moc.cpp
 .moc.o
 .o
 Makefile*
-networksetup
 addconnection.cpp
 addconnection.h
 interfaceadvanced.cpp
 interfaceadvanced.h
 interfaceinformation.cpp
 interfaceinformation.h
 interfacesetup.cpp
 interfacesetup.h
 mainwindow.cpp
 mainwindow.h
+moc_*.cpp
+networksetup
 systemadvanced.cpp
 systemadvanced.h
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,5 +1,5 @@
+*.moc
 Makefile*
 moc_*
-*.moc
 soundsettingsbase.cpp
 soundsettingsbase.h
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
@@ -1,4 +1,4 @@
 Makefile*
 moc_*
 sshkeysbase.cpp
-sshkeysbase.h
\ No newline at end of file
+sshkeysbase.h
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,7 +1,7 @@
-moc_*
 *.moc
 Makefile*
 app.cpp
 app.h
+moc_*
 wait.cpp
 wait.h
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
@@ -1,2 +1,2 @@
 Makefile*
-moc*
\ No newline at end of file
+moc*
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
@@ -1,4 +1,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,5 +1,5 @@
-moc_*
+
 Makefile*
 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,15 +1,15 @@
-moc_*
 *.moc
 Makefile*
 accounteditorbase.cpp
 accounteditorbase.h
 addresspickerbase.cpp
 addresspickerbase.h
 configdiagbase.cpp
 configdiagbase.h
+moc_*
 opendiagbase.cpp
 opendiagbase.h
 passdiagbase.cpp
 passdiagbase.h
 renamebase.cpp
 renamebase.h
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,9 +1,9 @@
+*.kdev*
+*~
 .cvsignore
 Makefile*
 moc_*
-*~
-*.kdev*
 pksettingsbase.cpp
 pksettingsbase.h
 runwindow.cpp
-runwindow.h
\ No newline at end of file
+runwindow.h
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_*
diff --git a/plugins/decorations/.cvsignore b/plugins/decorations/.cvsignore
index 1066771..5d3970d 100644
--- a/plugins/decorations/.cvsignore
+++ b/plugins/decorations/.cvsignore
@@ -1,9 +1,3 @@
 libflat.so.1.0.0
 libliquid.so.1.0.0
 libpolished.so.1.0.0
-libflat.so.1.0.0
-libliquid.so.1.0.0
-libpolished.so.1.0.0
-libflat.so.1.0.0
-libliquid.so.1.0.0
-libpolished.so.1.0.0
diff --git a/plugins/today/.cvsignore b/plugins/today/.cvsignore
index dc169ed..bf72eec 100644
--- a/plugins/today/.cvsignore
+++ b/plugins/today/.cvsignore
@@ -1 +1 @@
-*so*
\ No newline at end of file
+*so*
diff --git a/qmake/.cvsignore b/qmake/.cvsignore
new file mode 100644
index 0000000..51aff07
--- a/dev/null
+++ b/qmake/.cvsignore
@@ -0,0 +1,3 @@
+*.o
+.cvsignore
+qmake
diff --git a/scripts/kconfig/.cvsignore b/scripts/kconfig/.cvsignore
new file mode 100644
index 0000000..bfb1a54
--- a/dev/null
+++ b/scripts/kconfig/.cvsignore
@@ -0,0 +1,12 @@
+
+.cvsignore
+conf
+depends.c
+lex.backup
+lex.zconf.c
+lkc_defs.h
+mconf
+qconf.moc
+zconf.output
+zconf.tab.c
+zconf.tab.h