From 8a879a6148c36374fbdf5a275ffa8b3f14cec502 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Mon, 27 Aug 2012 08:44:39 +0200
Subject: de-duplicate code

Change-Id: Ic3f2bfeb5a16da86b1cd471b55dfc79f12dfadee
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 bin/syncqt | 44 ++++++++++++++++++--------------------------
 1 file changed, 18 insertions(+), 26 deletions(-)

(limited to 'bin')

diff --git a/bin/syncqt b/bin/syncqt
index 5106d30f57..878d0a5c08 100755
--- a/bin/syncqt
+++ b/bin/syncqt
@@ -533,6 +533,22 @@ sub findFiles {
     return @files;
 }
 
+sub listSubdirs {
+    my @subdirs = @_;
+    foreach my $subdir (@subdirs) {
+        opendir DIR, $subdir or die "Huh, directory ".$subdir." cannot be opened.";
+        foreach my $t (sort readdir(DIR)) {
+            push @subdirs, "$subdir/$t" if(-d "$subdir/$t" && !($t eq ".") &&
+                                           !($t eq "..") && !($t eq ".obj") &&
+                                           !($t eq ".moc") && !($t eq ".rcc") &&
+                                           !($t eq ".uic") && !($t eq "build") &&
+                                           !($t eq "doc"));
+        }
+        closedir DIR;
+    }
+    return @subdirs;
+}
+
 ######################################################################
 # Syntax:  loadSyncProfile()
 #
@@ -866,20 +882,7 @@ foreach my $lib (@modules_to_sync) {
 
         foreach my $headers_dir (@headers_paths) {
             #calc subdirs
-            my @subdirs = ($headers_dir);
-            foreach my $subdir (@subdirs) {
-                if ($subdir =~ /\/doc$/) {
-                    next;
-                }
-                opendir DIR, $subdir or next;
-                foreach my $t (sort readdir(DIR)) {
-                    push @subdirs, "$subdir/$t" if(-d "$subdir/$t" && !($t eq ".") &&
-                                                   !($t eq "..") && !($t eq ".obj") &&
-                                                   !($t eq ".moc") && !($t eq ".rcc") &&
-                                                   !($t eq ".uic") && !($t eq "build"));
-                }
-                closedir DIR;
-            }
+            my @subdirs = listSubdirs($headers_dir);
 
             #calc files and "copy" them
             foreach my $subdir (@subdirs) {
@@ -1144,18 +1147,7 @@ unless($showonly || !$create_uic_class_map) {
 if($check_includes) {
     for my $lib (keys(%modules)) {
             #calc subdirs
-            my @subdirs = ($modules{$lib});
-            foreach my $subdir (@subdirs) {
-                opendir DIR, $subdir or die "Huh, directory ".$subdir." cannot be opened.";
-                foreach my $t (sort readdir(DIR)) {
-                    push @subdirs, "$subdir/$t" if(-d "$subdir/$t" && !($t eq ".") &&
-                                                   !($t eq "..") && !($t eq ".obj") &&
-                                                   !($t eq ".moc") && !($t eq ".rcc") &&
-                                                   !($t eq ".uic") && !($t eq "build") &&
-                                                   !($t eq "doc"));
-                }
-                closedir DIR;
-            }
+            my @subdirs = listSubdirs($modules{$lib});
 
             foreach my $subdir (@subdirs) {
                 my $header_skip_qt_module_test = 0;
-- 
cgit v1.2.3