[zypp-commit] r10456 - /trunk/zypper/src/

Author: jkupec Date: Tue Jun 24 21:21:31 2008 New Revision: 10456 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10456&view=rev Log: - source tree reorganized, several file renames ----- #!/bin/bash RENAMES_LIST=../renames-list rm $RENAMES_LIST svn mv zypper.h Zypper.h svn mv zypper.cc Zypper.cc svn mv zypper-command.h Command.h svn mv zypper-command.cc Command.cc svn mv zypper-tabulator.h Table.h svn mv zypper-tabulator.cc Table.cc echo "zypper.h;Zypper.h" >> $RENAMES_LIST echo "zypper.cc;Zypper.cc" >> $RENAMES_LIST echo "zypper-command.h;Command.h" >> $RENAMES_LIST echo "zypper-command.cc;Command.cc" >> $RENAMES_LIST echo "zypper-tabulator.h;Table.h" >> $RENAMES_LIST echo "zypper-tabulator.cc;Table.cc" >> $RENAMES_LIST # move callback headers to separate folder and remove the -callbacks prefix mkdir callbacks svn add callbacks for file in $(ls *-callbacks.h); do newfile=${file%-callbacks\.h}; newfile="callbacks/${newfile:7}.h" echo "$file;$newfile" >> $RENAMES_LIST svn mv $file $newfile; done # remove 'zypper-' prefix from the sources for file in $(ls zypper-*); do echo "$file;${file:7}" >> $RENAMES_LIST svn mv $file ${file:7}; done # adapt include paths sed -i -e 's/zypper\.h/Zypper.h/g' $(grep -Rl 'zypper\.h' *) sed -i -e 's/zypper\.cc/Zypper.cc/g' $(grep -Rl 'zypper\.cc' *) sed -i -e 's/zypper-command\.\(h\|cc\)/Command.\1/g' $(grep -Rl 'zypper-command\.\(h\|cc\)' *) sed -i -e 's/zypper-tabulator\.\(h\|cc\)/Table.\1/g' $(grep -Rl 'zypper-tabulator\.\(h\|cc\)' *) sed -i -e 's/zypper-\(\w*\)-callbacks\.h/callbacks\/\1.h/g' $(grep -Rl 'zypper-\w*-callbacks\.h' *) sed -i -e 's/zypper-\(.*\.\(h\|cc\)\)/\1/g' $(grep -Rl 'zypper-.*\.\(h\|cc\)' *) for file in $(find -name '*.h'); do file1=${file:2} regex=${file1/\.h/\\\.h} regex=${regex/\//\\\/}; sed -i -e "s/\"$regex\"/\"..\\/$regex\"/g" callbacks/* done ----- zypper.h;Zypper.h zypper.cc;Zypper.cc zypper-command.h;Command.h zypper-command.cc;Command.cc zypper-tabulator.h;Table.h zypper-tabulator.cc;Table.cc zypper-keyring-callbacks.h;callbacks/keyring.h zypper-locks-callbacks.h;callbacks/locks.h zypper-media-callbacks.h;callbacks/media.h zypper-repo-callbacks.h;callbacks/repo.h zypper-rpm-callbacks.h;callbacks/rpm.h zypper-getopt.cc;getopt.cc zypper-getopt.h;getopt.h zypper-info.cc;info.cc zypper-info.h;info.h zypper-locks.cc;locks.cc zypper-locks.h;locks.h zypper-main.cc;main.cc zypper-main.h;main.h zypper-misc.cc;misc.cc zypper-misc.h;misc.h zypper-prompt.cc;prompt.cc zypper-prompt.h;prompt.h zypper-repos.cc;repos.cc zypper-repos.h;repos.h zypper-richtext.cc;richtext.cc zypper-richtext.h;richtext.h zypper-search.cc;search.cc zypper-search.h;search.h zypper-utils.cc;utils.cc zypper-utils.h;utils.h Added: trunk/zypper/src/Command.cc (contents, props changed) - copied, changed from r10453, trunk/zypper/src/zypper-command.cc trunk/zypper/src/Command.h (props changed) - copied unchanged from r10453, trunk/zypper/src/zypper-command.h trunk/zypper/src/Table.cc (contents, props changed) - copied, changed from r10453, trunk/zypper/src/zypper-tabulator.cc trunk/zypper/src/Table.h (props changed) - copied unchanged from r10453, trunk/zypper/src/zypper-tabulator.h trunk/zypper/src/Zypper.cc (contents, props changed) - copied, changed from r10453, trunk/zypper/src/zypper.cc trunk/zypper/src/Zypper.h (contents, props changed) - copied, changed from r10453, trunk/zypper/src/zypper.h trunk/zypper/src/getopt.cc (contents, props changed) - copied, changed from r10453, trunk/zypper/src/zypper-getopt.cc trunk/zypper/src/getopt.h (props changed) - copied unchanged from r10453, trunk/zypper/src/zypper-getopt.h trunk/zypper/src/info.cc (contents, props changed) - copied, changed from r10453, trunk/zypper/src/zypper-info.cc trunk/zypper/src/info.h (contents, props changed) - copied, changed from r10453, trunk/zypper/src/zypper-info.h trunk/zypper/src/locks.cc (contents, props changed) - copied, changed from r10453, trunk/zypper/src/zypper-locks.cc trunk/zypper/src/locks.h (contents, props changed) - copied, changed from r10453, trunk/zypper/src/zypper-locks.h trunk/zypper/src/main.cc (contents, props changed) - copied, changed from r10453, trunk/zypper/src/zypper-main.cc trunk/zypper/src/main.h (props changed) - copied unchanged from r10453, trunk/zypper/src/zypper-main.h trunk/zypper/src/misc.cc (contents, props changed) - copied, changed from r10453, trunk/zypper/src/zypper-misc.cc trunk/zypper/src/misc.h (contents, props changed) - copied, changed from r10453, trunk/zypper/src/zypper-misc.h trunk/zypper/src/prompt.cc (contents, props changed) - copied, changed from r10453, trunk/zypper/src/zypper-prompt.cc trunk/zypper/src/prompt.h (contents, props changed) - copied, changed from r10453, trunk/zypper/src/zypper-prompt.h trunk/zypper/src/repos.cc (contents, props changed) - copied, changed from r10453, trunk/zypper/src/zypper-repos.cc trunk/zypper/src/repos.h (contents, props changed) - copied, changed from r10453, trunk/zypper/src/zypper-repos.h trunk/zypper/src/richtext.cc (props changed) - copied unchanged from r10453, trunk/zypper/src/zypper-richtext.cc trunk/zypper/src/richtext.h (props changed) - copied unchanged from r10453, trunk/zypper/src/zypper-richtext.h trunk/zypper/src/search.cc (contents, props changed) - copied, changed from r10453, trunk/zypper/src/zypper-search.cc trunk/zypper/src/search.h (contents, props changed) - copied, changed from r10453, trunk/zypper/src/zypper-search.h trunk/zypper/src/utils.cc (contents, props changed) - copied, changed from r10453, trunk/zypper/src/zypper-utils.cc trunk/zypper/src/utils.h (props changed) - copied unchanged from r10453, trunk/zypper/src/zypper-utils.h Removed: trunk/zypper/src/zypper-command.cc trunk/zypper/src/zypper-command.h trunk/zypper/src/zypper-getopt.cc trunk/zypper/src/zypper-getopt.h trunk/zypper/src/zypper-info.cc trunk/zypper/src/zypper-info.h trunk/zypper/src/zypper-locks.cc trunk/zypper/src/zypper-locks.h trunk/zypper/src/zypper-main.cc trunk/zypper/src/zypper-main.h trunk/zypper/src/zypper-misc.cc trunk/zypper/src/zypper-misc.h trunk/zypper/src/zypper-prompt.cc trunk/zypper/src/zypper-prompt.h trunk/zypper/src/zypper-repos.cc trunk/zypper/src/zypper-repos.h trunk/zypper/src/zypper-richtext.cc trunk/zypper/src/zypper-richtext.h trunk/zypper/src/zypper-search.cc trunk/zypper/src/zypper-search.h trunk/zypper/src/zypper-tabulator.cc trunk/zypper/src/zypper-tabulator.h trunk/zypper/src/zypper-utils.cc trunk/zypper/src/zypper-utils.h trunk/zypper/src/zypper.cc trunk/zypper/src/zypper.h Modified: trunk/zypper/src/CMakeLists.txt Modified: trunk/zypper/src/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/CMakeLists.txt?rev=10456&r1=10455&r2=10456&view=diff ============================================================================== --- trunk/zypper/src/CMakeLists.txt (original) +++ trunk/zypper/src/CMakeLists.txt Tue Jun 24 21:21:31 2008 @@ -6,39 +6,39 @@ MESSAGE ( "** Locale dir is ${INSTALL_PREFIX}/share/locale" ) SET (zypper_HEADERS - zypper.h - zypper-main.h - zypper-command.h - zypper-getopt.h - zypper-repos.h - zypper-misc.h - zypper-utils.h - zypper-search.h - zypper-info.h - zypper-prompt.h - zypper-richtext.h - zypper-tabulator.h - zypper-locks.h - zypper-keyring-callbacks.h - zypper-media-callbacks.h - zypper-rpm-callbacks.h - zypper-repo-callbacks.h + Zypper.h + main.h + Command.h + getopt.h + repos.h + misc.h + utils.h + search.h + info.h + prompt.h + richtext.h + Table.h + locks.h + callbacks/keyring.h + callbacks/media.h + callbacks/rpm.h + callbacks/repo.h ) SET( zypper_SRCS - zypper.cc - zypper-main.cc - zypper-command.cc - zypper-getopt.cc - zypper-repos.cc - zypper-misc.cc - zypper-utils.cc - zypper-search.cc - zypper-info.cc - zypper-tabulator.cc - zypper-prompt.cc - zypper-richtext.cc - zypper-locks.cc + Zypper.cc + main.cc + Command.cc + getopt.cc + repos.cc + misc.cc + utils.cc + search.cc + info.cc + Table.cc + prompt.cc + richtext.cc + locks.cc ${zypper_HEADERS} ) Copied: trunk/zypper/src/Command.cc (from r10453, trunk/zypper/src/zypper-command.cc) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/Command.cc?p2=trunk/zypper/src/Command.cc&p1=trunk/zypper/src/zypper-command.cc&r1=10453&r2=10456&rev=10456&view=diff ============================================================================== --- trunk/zypper/src/zypper-command.cc (original) +++ trunk/zypper/src/Command.cc Tue Jun 24 21:21:31 2008 @@ -3,8 +3,8 @@ #include "zypp/base/Exception.h" #include "zypp/base/String.h" -#include "zypper-main.h" -#include "zypper-command.h" +#include "main.h" +#include "Command.h" // redefine _ gettext macro defined by ZYpp #ifdef _ Copied: trunk/zypper/src/Table.cc (from r10453, trunk/zypper/src/zypper-tabulator.cc) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/Table.cc?p2=trunk/zypper/src/Table.cc&p1=trunk/zypper/src/zypper-tabulator.cc&r1=10453&r2=10456&rev=10456&view=diff ============================================================================== --- trunk/zypper/src/zypper-tabulator.cc (original) +++ trunk/zypper/src/Table.cc Tue Jun 24 21:21:31 2008 @@ -5,7 +5,7 @@ #include "zypp/base/Logger.h" -#include "zypper-tabulator.h" +#include "Table.h" using namespace std; #include Copied: trunk/zypper/src/Zypper.cc (from r10453, trunk/zypper/src/zypper.cc) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/Zypper.cc?p2=trunk/zypper/src/Zypper.cc&p1=trunk/zypper/src/zypper.cc&r1=10453&r2=10456&rev=10456&view=diff ============================================================================== --- trunk/zypper/src/zypper.cc (original) +++ trunk/zypper/src/Zypper.cc Tue Jun 24 21:21:31 2008 @@ -33,18 +33,18 @@ #include "zypp/target/rpm/RpmHeader.h" // for install <.rpmURI> -#include "zypper-main.h" -#include "zypper.h" -#include "zypper-repos.h" -#include "zypper-misc.h" -#include "zypper-locks.h" - -#include "zypper-tabulator.h" -#include "zypper-search.h" -#include "zypper-info.h" -#include "zypper-getopt.h" -#include "zypper-command.h" -#include "zypper-utils.h" +#include "main.h" +#include "Zypper.h" +#include "repos.h" +#include "misc.h" +#include "locks.h" + +#include "Table.h" +#include "search.h" +#include "info.h" +#include "getopt.h" +#include "Command.h" +#include "utils.h" #include "output/OutNormal.h" #include "output/OutXML.h" Copied: trunk/zypper/src/Zypper.h (from r10453, trunk/zypper/src/zypper.h) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/Zypper.h?p2=trunk/zypper/src/Zypper.h&p1=trunk/zypper/src/zypper.h&r1=10453&r2=10456&rev=10456&view=diff ============================================================================== --- trunk/zypper/src/zypper.h (original) +++ trunk/zypper/src/Zypper.h Tue Jun 24 21:21:31 2008 @@ -14,8 +14,8 @@ #include "zypp/SrcPackage.h" #include "output/Out.h" -#include "zypper-command.h" -#include "zypper-getopt.h" +#include "Command.h" +#include "getopt.h" /** directory for storing manually installed (zypper install foo.rpm) RPM files */ Copied: trunk/zypper/src/getopt.cc (from r10453, trunk/zypper/src/zypper-getopt.cc) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/getopt.cc?p2=trunk/zypper/src/getopt.cc&p1=trunk/zypper/src/zypper-getopt.cc&r1=10453&r2=10456&rev=10456&view=diff ============================================================================== --- trunk/zypper/src/zypper-getopt.cc (original) +++ trunk/zypper/src/getopt.cc Tue Jun 24 21:21:31 2008 @@ -1,5 +1,5 @@ -#include "zypper-getopt.h" -#include "zypper-main.h" +#include "getopt.h" +#include "main.h" #include <iostream> #include "zypp/base/String.h" Copied: trunk/zypper/src/info.cc (from r10453, trunk/zypper/src/zypper-info.cc) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/info.cc?p2=trunk/zypper/src/info.cc&p1=trunk/zypper/src/zypper-info.cc&r1=10453&r2=10456&rev=10456&view=diff ============================================================================== --- trunk/zypper/src/zypper-info.cc (original) +++ trunk/zypper/src/info.cc Tue Jun 24 21:21:31 2008 @@ -9,13 +9,13 @@ #include "zypp/Product.h" #include "zypp/PoolQuery.h" -#include "zypper.h" -#include "zypper-main.h" -#include "zypper-misc.h" -#include "zypper-tabulator.h" -#include "zypper-info.h" -#include "zypper-richtext.h" -#include "zypper-search.h" +#include "Zypper.h" +#include "main.h" +#include "misc.h" +#include "Table.h" +#include "info.h" +#include "richtext.h" +#include "search.h" using namespace std; Copied: trunk/zypper/src/info.h (from r10453, trunk/zypper/src/zypper-info.h) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/info.h?p2=trunk/zypper/src/info.h&p1=trunk/zypper/src/zypper-info.h&r1=10453&r2=10456&rev=10456&view=diff ============================================================================== --- trunk/zypper/src/zypper-info.h (original) +++ trunk/zypper/src/info.h Tue Jun 24 21:21:31 2008 @@ -5,7 +5,7 @@ #include "zypp/ResKind.h" #include "zypp/ui/Selectable.h" -#include "zypper.h" +#include "Zypper.h" void printInfo(const Zypper & zypper, const zypp::ResKind & kind); Copied: trunk/zypper/src/locks.cc (from r10453, trunk/zypper/src/zypper-locks.cc) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/locks.cc?p2=trunk/zypper/src/locks.cc&p1=trunk/zypper/src/zypper-locks.cc&r1=10453&r2=10456&rev=10456&view=diff ============================================================================== --- trunk/zypper/src/zypper-locks.cc (original) +++ trunk/zypper/src/locks.cc Tue Jun 24 21:21:31 2008 @@ -6,11 +6,11 @@ #include "zypp/Locks.h" #include "output/Out.h" -#include "zypper-main.h" -#include "zypper-tabulator.h" -#include "zypper-utils.h" -#include "zypper-locks.h" -#include "zypper-repos.h" +#include "main.h" +#include "Table.h" +#include "utils.h" +#include "locks.h" +#include "repos.h" using namespace zypp; using namespace std; Copied: trunk/zypper/src/locks.h (from r10453, trunk/zypper/src/zypper-locks.h) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/locks.h?p2=trunk/zypper/src/locks.h&p1=trunk/zypper/src/zypper-locks.h&r1=10453&r2=10456&rev=10456&view=diff ============================================================================== --- trunk/zypper/src/zypper-locks.h (original) +++ trunk/zypper/src/locks.h Tue Jun 24 21:21:31 2008 @@ -1,7 +1,7 @@ #ifndef ZYPPERLOCKS_H_ #define ZYPPERLOCKS_H_ -#include "zypper.h" +#include "Zypper.h" void list_locks(Zypper & zypper); void add_locks(Zypper & zypper, const Zypper::ArgList & args, const ResKindSet & kinds); Copied: trunk/zypper/src/main.cc (from r10453, trunk/zypper/src/zypper-main.cc) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/main.cc?p2=trunk/zypper/src/main.cc&p1=trunk/zypper/src/zypper-main.cc&r1=10453&r2=10456&rev=10456&view=diff ============================================================================== --- trunk/zypper/src/zypper-main.cc (original) +++ trunk/zypper/src/main.cc Tue Jun 24 21:21:31 2008 @@ -5,14 +5,14 @@ #include "zypp/base/Logger.h" #include "zypp/base/LogControl.h" -#include "zypper-main.h" -#include "zypper.h" +#include "main.h" +#include "Zypper.h" -#include "zypper-rpm-callbacks.h" -#include "zypper-keyring-callbacks.h" -#include "zypper-repo-callbacks.h" -#include "zypper-media-callbacks.h" -#include "zypper-locks-callbacks.h" +#include "callbacks/rpm.h" +#include "callbacks/keyring.h" +#include "callbacks/repo.h" +#include "callbacks/media.h" +#include "callbacks/locks.h" using namespace std; Copied: trunk/zypper/src/misc.cc (from r10453, trunk/zypper/src/zypper-misc.cc) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/misc.cc?p2=trunk/zypper/src/misc.cc&p1=trunk/zypper/src/zypper-misc.cc&r1=10453&r2=10456&rev=10456&view=diff ============================================================================== --- trunk/zypper/src/zypper-misc.cc (original) +++ trunk/zypper/src/misc.cc Tue Jun 24 21:21:31 2008 @@ -23,15 +23,15 @@ #include "zypp/RepoInfo.h" -#include "zypper.h" -#include "zypper-main.h" -#include "zypper-utils.h" -#include "zypper-getopt.h" -#include "zypper-richtext.h" -#include "zypper-prompt.h" +#include "Zypper.h" +#include "main.h" +#include "utils.h" +#include "getopt.h" +#include "richtext.h" +#include "prompt.h" #include "output/prompt.h" -#include "zypper-misc.h" +#include "misc.h" using namespace std; using namespace zypp; Copied: trunk/zypper/src/misc.h (from r10453, trunk/zypper/src/zypper-misc.h) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/misc.h?p2=trunk/zypper/src/misc.h&p1=trunk/zypper/src/zypper-misc.h&r1=10453&r2=10456&rev=10456&view=diff ============================================================================== --- trunk/zypper/src/zypper-misc.h (original) +++ trunk/zypper/src/misc.h Tue Jun 24 21:21:31 2008 @@ -15,9 +15,9 @@ #include "zypp/ResKind.h" #include "zypp/PoolItem.h" -#include "zypper.h" -#include "zypper-tabulator.h" -#include "zypper-utils.h" +#include "Zypper.h" +#include "Table.h" +#include "utils.h" zypp::ResKind string_to_kind (const std::string & skind); Copied: trunk/zypper/src/prompt.cc (from r10453, trunk/zypper/src/zypper-prompt.cc) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/prompt.cc?p2=trunk/zypper/src/prompt.cc&p1=trunk/zypper/src/zypper-prompt.cc&r1=10453&r2=10456&rev=10456&view=diff ============================================================================== --- trunk/zypper/src/zypper-prompt.cc (original) +++ trunk/zypper/src/prompt.cc Tue Jun 24 21:21:31 2008 @@ -8,8 +8,8 @@ #include "zypp/base/Logger.h" #include "zypp/base/String.h" -#include "zypper.h" -#include "zypper-prompt.h" +#include "Zypper.h" +#include "prompt.h" using namespace std; using namespace boost; Copied: trunk/zypper/src/prompt.h (from r10453, trunk/zypper/src/zypper-prompt.h) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/prompt.h?p2=trunk/zypper/src/prompt.h&p1=trunk/zypper/src/zypper-prompt.h&r1=10453&r2=10456&rev=10456&view=diff ============================================================================== --- trunk/zypper/src/zypper-prompt.h (original) +++ trunk/zypper/src/prompt.h Tue Jun 24 21:21:31 2008 @@ -2,7 +2,7 @@ #define ZYPPERPROMPT_H_ #include "output/prompt.h" -#include "zypper-main.h" // for gettext macros +#include "main.h" // for gettext macros class PromptOptions { Copied: trunk/zypper/src/repos.cc (from r10453, trunk/zypper/src/zypper-repos.cc) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/repos.cc?p2=trunk/zypper/src/repos.cc&p1=trunk/zypper/src/zypper-repos.cc&r1=10453&r2=10456&rev=10456&view=diff ============================================================================== --- trunk/zypper/src/zypper-repos.cc (original) +++ trunk/zypper/src/repos.cc Tue Jun 24 21:21:31 2008 @@ -18,13 +18,13 @@ #include "zypp/media/MediaException.h" #include "zypp/media/MediaAccess.h" -#include "zypper.h" +#include "Zypper.h" #include "output/Out.h" -#include "zypper-main.h" -#include "zypper-getopt.h" -#include "zypper-tabulator.h" -#include "zypper-utils.h" -#include "zypper-repos.h" +#include "main.h" +#include "getopt.h" +#include "Table.h" +#include "utils.h" +#include "repos.h" using namespace std; using namespace boost; Copied: trunk/zypper/src/repos.h (from r10453, trunk/zypper/src/zypper-repos.h) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/repos.h?p2=trunk/zypper/src/repos.h&p1=trunk/zypper/src/zypper-repos.h&r1=10453&r2=10456&rev=10456&view=diff ============================================================================== --- trunk/zypper/src/zypper-repos.h (original) +++ trunk/zypper/src/repos.h Tue Jun 24 21:21:31 2008 @@ -6,7 +6,7 @@ #include "zypp/Url.h" #include "zypp/RepoInfo.h" -#include "zypper.h" +#include "Zypper.h" #define TMP_RPM_REPO_ALIAS "_tmpRPMcache_" Copied: trunk/zypper/src/search.cc (from r10453, trunk/zypper/src/zypper-search.cc) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/search.cc?p2=trunk/zypper/src/search.cc&p1=trunk/zypper/src/zypper-search.cc&r1=10453&r2=10456&rev=10456&view=diff ============================================================================== --- trunk/zypper/src/zypper-search.cc (original) +++ trunk/zypper/src/search.cc Tue Jun 24 21:21:31 2008 @@ -8,12 +8,12 @@ #include "zypp/ResPoolProxy.h" -#include "zypper.h" -#include "zypper-main.h" -#include "zypper-tabulator.h" +#include "Zypper.h" +#include "main.h" +#include "Table.h" -#include "zypper-search.h" +#include "search.h" using namespace zypp; using namespace std; Copied: trunk/zypper/src/search.h (from r10453, trunk/zypper/src/zypper-search.h) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/search.h?p2=trunk/zypper/src/search.h&p1=trunk/zypper/src/zypper-search.h&r1=10453&r2=10456&rev=10456&view=diff ============================================================================== --- trunk/zypper/src/zypper-search.h (original) +++ trunk/zypper/src/search.h Tue Jun 24 21:21:31 2008 @@ -15,9 +15,9 @@ #include "zypp/PoolItem.h" #include "zypp/Patch.h" -#include "zypper.h" -#include "zypper-utils.h" // for kind_to_string_localized -#include "zypper-tabulator.h" +#include "Zypper.h" +#include "utils.h" // for kind_to_string_localized +#include "Table.h" std::string selectable_search_repo_str(const zypp::ui::Selectable & s); std::string string_ppp_status(const zypp::PoolItem & pi); Copied: trunk/zypper/src/utils.cc (from r10453, trunk/zypper/src/zypper-utils.cc) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/utils.cc?p2=trunk/zypper/src/utils.cc&p1=trunk/zypper/src/zypper-utils.cc&r1=10453&r2=10456&rev=10456&view=diff ============================================================================== --- trunk/zypper/src/zypper-utils.cc (original) +++ trunk/zypper/src/utils.cc Tue Jun 24 21:21:31 2008 @@ -11,9 +11,9 @@ #include "zypp/parser/xml_escape_parser.hpp" #include "zypp/Capability.h" -#include "zypper.h" -#include "zypper-main.h" -#include "zypper-utils.h" +#include "Zypper.h" +#include "main.h" +#include "utils.h" using namespace std; -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org