Author: schubi2 Date: Fri Jul 6 10:02:26 2007 New Revision: 5902 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5902&view=rev Log: baseclass renamed Added: branches/tmp/schubi/solvertree/QZyppSolverDialog.cpp - copied, changed from r5875, branches/tmp/schubi/solvertree/dialog.cpp branches/tmp/schubi/solvertree/QZyppSolverDialog.h - copied, changed from r5875, branches/tmp/schubi/solvertree/dialog.h Removed: branches/tmp/schubi/solvertree/dialog.cpp branches/tmp/schubi/solvertree/dialog.h Modified: branches/tmp/schubi/solvertree/Makefile branches/tmp/schubi/solvertree/main.cpp Modified: branches/tmp/schubi/solvertree/Makefile URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/schubi/solvertree/Makefile?rev=5902&r1=5901&r2=5902&view=diff ============================================================================== --- branches/tmp/schubi/solvertree/Makefile (original) +++ branches/tmp/schubi/solvertree/Makefile Fri Jul 6 10:02:26 2007 @@ -45,7 +45,7 @@ ####### Files -SOURCES = dialog.cpp \ +SOURCES = QZyppSolverDialog.cpp \ drawparams.cpp \ graphtreelabel.cpp \ main.cpp \ @@ -53,7 +53,7 @@ resgraphview.cpp \ restreewidget.cpp \ solvertree.cpp -OBJECTS = dialog.o \ +OBJECTS = QZyppSolverDialog.o \ drawparams.o \ graphtreelabel.o \ main.o \ @@ -111,7 +111,7 @@ dist: @$(CHK_DIR_EXISTS) .tmp/solvertree1.0.0 || $(MKDIR) .tmp/solvertree1.0.0 - $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/solvertree1.0.0/ && $(COPY_FILE) --parents dialog.h drawparams.h graphtree_defines.h graphtreelabel.h pannerview.h resgraphview.h restreewidget.h solvertree.h .tmp/solvertree1.0.0/ && $(COPY_FILE) --parents dialog.cpp drawparams.cpp graphtreelabel.cpp main.cpp pannerview.cpp resgraphview.cpp restreewidget.cpp solvertree.cpp .tmp/solvertree1.0.0/ && (cd `dirname .tmp/solvertree1.0.0` && $(TAR) solvertree1.0.0.tar solvertree1.0.0 && $(COMPRESS) solvertree1.0.0.tar) && $(MOVE) `dirname .tmp/solvertree1.0.0`/solvertree1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/solvertree1.0.0 + $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/solvertree1.0.0/ && $(COPY_FILE) --parents QZyppSolverDialog.h drawparams.h graphtree_defines.h graphtreelabel.h pannerview.h resgraphview.h restreewidget.h solvertree.h .tmp/solvertree1.0.0/ && $(COPY_FILE) --parents QZyppSolverDialog.cpp drawparams.cpp graphtreelabel.cpp main.cpp pannerview.cpp resgraphview.cpp restreewidget.cpp solvertree.cpp .tmp/solvertree1.0.0/ && (cd `dirname .tmp/solvertree1.0.0` && $(TAR) solvertree1.0.0.tar solvertree1.0.0 && $(COMPRESS) solvertree1.0.0.tar) && $(MOVE) `dirname .tmp/solvertree1.0.0`/solvertree1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/solvertree1.0.0 yaccclean: @@ -135,12 +135,12 @@ mocables: compiler_moc_header_make_all compiler_moc_source_make_all -compiler_moc_header_make_all: moc_dialog.cpp moc_pannerview.cpp moc_resgraphview.cpp moc_restreewidget.cpp +compiler_moc_header_make_all: moc_QZyppSolverDialog.cpp moc_pannerview.cpp moc_resgraphview.cpp moc_restreewidget.cpp compiler_moc_header_clean: - -$(DEL_FILE) moc_dialog.cpp moc_pannerview.cpp moc_resgraphview.cpp moc_restreewidget.cpp -dialog.moc: dialog.h \ + -$(DEL_FILE) moc_QZyppSolverDialog.cpp moc_pannerview.cpp moc_resgraphview.cpp moc_restreewidget.cpp +QZyppSolverDialog.moc: QZyppSolverDialog.h \ /usr/bin/moc - /usr/lib/qt3/bin/moc dialog.h -o dialog.moc + /usr/lib/qt3/bin/moc QZyppSolverDialog.h -o QZyppSolverDialog.moc pannerview.moc: pannerview.h \ /usr/bin/moc @@ -167,9 +167,9 @@ ####### Compile -dialog.o: dialog.cpp dialog.h \ - dialog.moc - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o dialog.o dialog.cpp +QZyppSolverDialog.o: QZyppSolverDialog.cpp QZyppSolverDialog.h \ + QZyppSolverDialog.moc + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QZyppSolverDialog.o QZyppSolverDialog.cpp drawparams.o: drawparams.cpp drawparams.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o drawparams.o drawparams.cpp @@ -179,7 +179,7 @@ graphtree_defines.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o graphtreelabel.o graphtreelabel.cpp -main.o: main.cpp dialog.h +main.o: main.cpp QZyppSolverDialog.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o main.cpp pannerview.o: pannerview.cpp pannerview.h \ Copied: branches/tmp/schubi/solvertree/QZyppSolverDialog.cpp (from r5875, branches/tmp/schubi/solvertree/dialog.cpp) URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/schubi/solvertree/QZyppSolverDialog.cpp?p2=branches/tmp/schubi/solvertree/QZyppSolverDialog.cpp&p1=branches/tmp/schubi/solvertree/dialog.cpp&r1=5875&r2=5902&rev=5902&view=diff ============================================================================== --- branches/tmp/schubi/solvertree/dialog.cpp (original) +++ branches/tmp/schubi/solvertree/QZyppSolverDialog.cpp Fri Jul 6 10:02:26 2007 @@ -4,17 +4,17 @@ #include #include -#include "dialog.h" +#include "QZyppSolverDialog.h" #include "solvertree.h" -Dialog::Dialog() - : QDialog(0,"Test dialog",true) +QZyppSolverDialog::QZyppSolverDialog() + : QDialog(0,"Solvertree",true) { SolverTree *solvertree = new SolverTree(this); } -Dialog::~Dialog() +QZyppSolverDialog::~QZyppSolverDialog() { } -#include "dialog.moc" +#include "QZyppSolverDialog.moc" Copied: branches/tmp/schubi/solvertree/QZyppSolverDialog.h (from r5875, branches/tmp/schubi/solvertree/dialog.h) URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/schubi/solvertree/QZyppSolverDialog.h?p2=branches/tmp/schubi/solvertree/QZyppSolverDialog.h&p1=branches/tmp/schubi/solvertree/dialog.h&r1=5875&r2=5902&rev=5902&view=diff ============================================================================== --- branches/tmp/schubi/solvertree/dialog.h (original) +++ branches/tmp/schubi/solvertree/QZyppSolverDialog.h Fri Jul 6 10:02:26 2007 @@ -1,20 +1,20 @@ -#ifndef DIALOG_H - #define DIALOG_H +#ifndef QZYPPSOLVERDIALOG_H +#define QZYPPSOLVERDIALOG_H - #include +#include - class QLabel; - class QErrorMessage; +class QLabel; +class QErrorMessage; - class Dialog : public QDialog - { - Q_OBJECT +class QZyppSolverDialog : public QDialog +{ + Q_OBJECT - public: - Dialog(); - ~Dialog(); +public: + QZyppSolverDialog(); + ~QZyppSolverDialog(); - }; +}; - #endif +#endif Modified: branches/tmp/schubi/solvertree/main.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/schubi/solvertree/main.cpp?rev=5902&r1=5901&r2=5902&view=diff ============================================================================== --- branches/tmp/schubi/solvertree/main.cpp (original) +++ branches/tmp/schubi/solvertree/main.cpp Fri Jul 6 10:02:26 2007 @@ -4,13 +4,13 @@ #include #include -#include "dialog.h" +#include "QZyppSolverDialog.h" int main(int argc, char *argv[]) { QApplication app(argc, argv); - Dialog *dialog = new Dialog(); + QZyppSolverDialog *dialog = new QZyppSolverDialog(); app.setMainWidget( dialog ); dialog->setCaption("Solvertree"); dialog->setMinimumSize ( 700, 700 ); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org