[Kmyirc-cvs] kmyirc-ng/src ircchannel.ui,NONE,1.1 kmiircchannel.cpp,NONE,1.1 kmiircchannel.h,NONE,1.

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/kmyirc/kmyirc-ng/src
In directory sc8-pr-cvs1:/tmp/cvs-serv29519/src

Modified Files:
	Makefile.am Makefile.in kmyirc.cpp kmyirc.h kmyircui.rc 
	kmyircview.cpp kmyircview.h pref.cpp 
Added Files:
	ircchannel.ui kmiircchannel.cpp kmiircchannel.h 
Log Message:
Changed UI settings in ircChannel.ui
Added a QTabWidget to KMyIRCView
Added ircChannel UI
Added KMIIrcChannel Class

--- NEW FILE: ircchannel.ui ---
<!DOCTYPE UI><UI version="3.1" stdsetdef="1">
<class>ircChannel</class>
<widget class="QWidget">
    <property name="name">
        <cstring>ircChannel</cstring>
    </property>
    <property name="geometry">
        <rect>
            <x>0</x>
            <y>0</y>
            <width>597</width>
            <height>480</height>
        </rect>
    </property>
    <property name="caption">
        <string>ircChannel</string>
    </property>
    <grid>
        <property name="name">
            <cstring>unnamed</cstring>
        </property>
        <widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
            <property name="name">
                <cstring>layout5</cstring>
            </property>
            <grid>
                <property name="name">
                    <cstring>unnamed</cstring>
                </property>
                <widget class="KLineEdit" row="1" column="0" rowspan="1" colspan="2">
                    <property name="name">
                        <cstring>le_inputText</cstring>
                    </property>
                </widget>
                <widget class="KTextEdit" row="0" column="0">
                    <property name="name">
                        <cstring>te_output</cstring>
                    </property>
                    <property name="readOnly">
                        <bool>true</bool>
                    </property>
                </widget>
                <widget class="KListBox" row="0" column="1">
                    <property name="name">
                        <cstring>lb_channelUsers</cstring>
                    </property>
                    <property name="sizePolicy">
                        <sizepolicy>
                            <hsizetype>5</hsizetype>
                            <vsizetype>5</vsizetype>
                            <horstretch>0</horstretch>
                            <verstretch>0</verstretch>
                        </sizepolicy>
                    </property>
                </widget>
            </grid>
        </widget>
        <widget class="QLayoutWidget" row="0" column="0">
            <property name="name">
                <cstring>layout6</cstring>
            </property>
            <hbox>
                <property name="name">
                    <cstring>unnamed</cstring>
                </property>
                <widget class="QToolButton">
                    <property name="name">
                        <cstring>toolButton1</cstring>
                    </property>
                    <property name="text">
                        <string>T</string>
                    </property>
                </widget>
                <widget class="QToolButton">
                    <property name="name">
                        <cstring>toolButton2</cstring>
                    </property>
                    <property name="text">
                        <string>A</string>
                    </property>
                </widget>
                <widget class="QToolButton">
                    <property name="name">
                        <cstring>toolButton3</cstring>
                    </property>
                    <property name="sizePolicy">
                        <sizepolicy>
                            <hsizetype>5</hsizetype>
                            <vsizetype>5</vsizetype>
                            <horstretch>0</horstretch>
                            <verstretch>0</verstretch>
                        </sizepolicy>
                    </property>
                    <property name="text">
                        <string>B</string>
                    </property>
                </widget>
            </hbox>
        </widget>
        <spacer row="0" column="1">
            <property name="name">
                <cstring>spacer1</cstring>
            </property>
            <property name="orientation">
                <enum>Horizontal</enum>
            </property>
            <property name="sizeType">
                <enum>Expanding</enum>
            </property>
            <property name="sizeHint">
                <size>
                    <width>490</width>
                    <height>16</height>
                </size>
            </property>
        </spacer>
    </grid>
</widget>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
    <includehint>klineedit.h</includehint>
    <includehint>ktextedit.h</includehint>
    <includehint>klistbox.h</includehint>
</includehints>
</UI>

--- NEW FILE: kmiircchannel.cpp ---


#include "kmiircchannel.h"

KMIIrcChannel::KMIIrcChannel(QWidget* parent, const char* name)
: ircChannel(parent,name)
{
}

KMIIrcChannel::~KMIIrcChannel()
{
}

/*$SPECIALIZATION$*/

#include "kmiircchannel.moc"


--- NEW FILE: kmiircchannel.h ---

#ifndef KMIIRCCHANNEL_H
#define KMIIRCCHANNEL_H

#include "ircchannel.h"

class KMIIrcChannel : public ircChannel
{
  Q_OBJECT

public:
  KMIIrcChannel(QWidget* parent = 0, const char* name = 0 );
  ~KMIIrcChannel();
  /*$PUBLIC_FUNCTIONS$*/

public slots:
  /*$PUBLIC_SLOTS$*/

protected:
  /*$PROTECTED_FUNCTIONS$*/

protected slots:
  /*$PROTECTED_SLOTS$*/

};

#endif


Index: Makefile.am
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/src/Makefile.am,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- Makefile.am	2 Jun 2003 08:44:03 -0000	1.11
+++ Makefile.am	4 Jun 2003 13:07:08 -0000	1.12
@@ -14,7 +14,7 @@
 kmyirc_LDADD   = $(LIB_KFILE) $(LIB_KDEPRINT)
 
 # which sources should be compiled for kmyirc
-kmyirc_SOURCES = main.cpp kmyirc.cpp kmyircview.cpp pref.cpp kmyirciface.skel ircservercfg.ui kmiircservercfg.cpp kmiircservercfg.h groupdlg.ui kmigroupdlg.cpp kmigroupdlg.h serverdlg.ui kmiserverdlg.cpp kmiserverdlg.h avatardlg.ui kmiavatardlg.cpp kmiavatardlg.h nickname.ui kminickdlg.cpp kminickdlg.h kmiircmessage.h kmiircmessage.cpp kmiircsocket.h kmiircsocket.cpp kmisystray.cpp kmisocket.cpp kmigeneralcfg.cpp ircdefault.ui kmiircdefault.cpp kmiircdefault.h
+kmyirc_SOURCES = main.cpp kmyirc.cpp kmyircview.cpp pref.cpp kmyirciface.skel ircservercfg.ui kmiircservercfg.cpp kmiircservercfg.h groupdlg.ui kmigroupdlg.cpp kmigroupdlg.h serverdlg.ui kmiserverdlg.cpp kmiserverdlg.h avatardlg.ui kmiavatardlg.cpp kmiavatardlg.h nickname.ui kminickdlg.cpp kminickdlg.h kmiircmessage.h kmiircmessage.cpp kmiircsocket.h kmiircsocket.cpp kmisystray.cpp kmisocket.cpp kmigeneralcfg.cpp ircdefault.ui kmiircdefault.cpp kmiircdefault.h ircchannel.ui kmiircchannel.cpp kmiircchannel.h
 
 # these are the headers for your project
 noinst_HEADERS = kmyirc.h kmyircview.h pref.h

Index: Makefile.in
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/src/Makefile.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Makefile.in	2 Jun 2003 08:44:04 -0000	1.15
+++ Makefile.in	4 Jun 2003 13:07:08 -0000	1.16
@@ -264,9 +264,9 @@
 kmyirc_LDADD = $(LIB_KFILE) $(LIB_KDEPRINT)
 
 # which sources should be compiled for kmyirc
-#>- kmyirc_SOURCES = main.cpp kmyirc.cpp kmyircview.cpp pref.cpp kmyirciface.skel ircservercfg.ui kmiircservercfg.cpp kmiircservercfg.h groupdlg.ui kmigroupdlg.cpp kmigroupdlg.h serverdlg.ui kmiserverdlg.cpp kmiserverdlg.h avatardlg.ui kmiavatardlg.cpp kmiavatardlg.h nickname.ui kminickdlg.cpp kminickdlg.h kmiircmessage.h kmiircmessage.cpp kmiircsocket.h kmiircsocket.cpp kmisystray.cpp kmisocket.cpp kmigeneralcfg.cpp ircdefault.ui kmiircdefault.cpp kmiircdefault.h
+#>- kmyirc_SOURCES = main.cpp kmyirc.cpp kmyircview.cpp pref.cpp kmyirciface.skel ircservercfg.ui kmiircservercfg.cpp kmiircservercfg.h groupdlg.ui kmigroupdlg.cpp kmigroupdlg.h serverdlg.ui kmiserverdlg.cpp kmiserverdlg.h avatardlg.ui kmiavatardlg.cpp kmiavatardlg.h nickname.ui kminickdlg.cpp kminickdlg.h kmiircmessage.h kmiircmessage.cpp kmiircsocket.h kmiircsocket.cpp kmisystray.cpp kmisocket.cpp kmigeneralcfg.cpp ircdefault.ui kmiircdefault.cpp kmiircdefault.h ircchannel.ui kmiircchannel.cpp kmiircchannel.h
 #>+ 1
-kmyirc_SOURCES=main.cpp kmyirc.cpp kmyircview.cpp pref.cpp   kmiircservercfg.cpp kmiircservercfg.h  kmigroupdlg.cpp kmigroupdlg.h  kmiserverdlg.cpp kmiserverdlg.h  kmiavatardlg.cpp kmiavatardlg.h  kminickdlg.cpp kminickdlg.h kmiircmessage.h kmiircmessage.cpp kmiircsocket.h kmiircsocket.cpp kmisystray.cpp kmisocket.cpp kmigeneralcfg.cpp  kmiircdefault.cpp kmiircdefault.h kmyirciface_skel.cpp ircservercfg.cpp groupdlg.cpp serverdlg.cpp avatardlg.cpp nickname.cpp ircdefault.cpp
+kmyirc_SOURCES=main.cpp kmyirc.cpp kmyircview.cpp pref.cpp   kmiircservercfg.cpp kmiircservercfg.h  kmigroupdlg.cpp kmigroupdlg.h  kmiserverdlg.cpp kmiserverdlg.h  kmiavatardlg.cpp kmiavatardlg.h  kminickdlg.cpp kminickdlg.h kmiircmessage.h kmiircmessage.cpp kmiircsocket.h kmiircsocket.cpp kmisystray.cpp kmisocket.cpp kmigeneralcfg.cpp  kmiircdefault.cpp kmiircdefault.h  kmiircchannel.cpp kmiircchannel.h kmyirciface_skel.cpp ircservercfg.cpp groupdlg.cpp serverdlg.cpp avatardlg.cpp nickname.cpp ircdefault.cpp ircchannel.cpp
 
 # these are the headers for your project
 noinst_HEADERS = kmyirc.h kmyircview.h pref.h
@@ -300,16 +300,18 @@
 	kmiserverdlg.$(OBJEXT) kmiavatardlg.$(OBJEXT) \
 	kminickdlg.$(OBJEXT) kmiircmessage.$(OBJEXT) \
 	kmiircsocket.$(OBJEXT) kmisystray.$(OBJEXT) kmisocket.$(OBJEXT) \
-	kmigeneralcfg.$(OBJEXT) kmiircdefault.$(OBJEXT)
+	kmigeneralcfg.$(OBJEXT) kmiircdefault.$(OBJEXT) \
+	kmiircchannel.$(OBJEXT)
 #>- kmyirc_OBJECTS = $(am_kmyirc_OBJECTS)
-#>+ 10
+#>+ 11
 kmyirc_final_OBJECTS = kmyirc.all_cpp.o 
 kmyirc_nofinal_OBJECTS = main.$(OBJEXT) kmyirc.$(OBJEXT) kmyircview.$(OBJEXT) \
 	pref.$(OBJEXT) kmiircservercfg.$(OBJEXT) kmigroupdlg.$(OBJEXT) \
 	kmiserverdlg.$(OBJEXT) kmiavatardlg.$(OBJEXT) \
 	kminickdlg.$(OBJEXT) kmiircmessage.$(OBJEXT) \
 	kmiircsocket.$(OBJEXT) kmisystray.$(OBJEXT) kmisocket.$(OBJEXT) \
-	kmigeneralcfg.$(OBJEXT) kmiircdefault.$(OBJEXT) kmyirciface_skel.$(OBJEXT) ircservercfg.$(OBJEXT) groupdlg.$(OBJEXT) serverdlg.$(OBJEXT) avatardlg.$(OBJEXT) nickname.$(OBJEXT) ircdefault.$(OBJEXT)\
+	kmigeneralcfg.$(OBJEXT) kmiircdefault.$(OBJEXT) \
+	kmiircchannel.$(OBJEXT) kmyirciface_skel.$(OBJEXT) ircservercfg.$(OBJEXT) groupdlg.$(OBJEXT) serverdlg.$(OBJEXT) avatardlg.$(OBJEXT) nickname.$(OBJEXT) ircdefault.$(OBJEXT) ircchannel.$(OBJEXT)\
 kmiircsocket.moc.o kmigeneralcfg.moc.o 
 @KDE_USE_FINAL_FALSE@kmyirc_OBJECTS = $(kmyirc_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@kmyirc_OBJECTS = $(kmyirc_final_OBJECTS)
@@ -330,6 +332,7 @@
 #>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/kmiavatardlg.Po \
 #>- @AMDEP_TRUE@	./$(DEPDIR)/kmigeneralcfg.Po \
 #>- @AMDEP_TRUE@	./$(DEPDIR)/kmigroupdlg.Po \
+#>- @AMDEP_TRUE@	./$(DEPDIR)/kmiircchannel.Po \
 #>- @AMDEP_TRUE@	./$(DEPDIR)/kmiircdefault.Po \
 #>- @AMDEP_TRUE@	./$(DEPDIR)/kmiircmessage.Po \
 #>- @AMDEP_TRUE@	./$(DEPDIR)/kmiircservercfg.Po \
@@ -340,10 +343,11 @@
 #>- @AMDEP_TRUE@	./$(DEPDIR)/kmyirc.Po ./$(DEPDIR)/kmyirc_client.Po \
 #>- @AMDEP_TRUE@	./$(DEPDIR)/kmyircview.Po ./$(DEPDIR)/main.Po \
 #>- @AMDEP_TRUE@	./$(DEPDIR)/pref.Po
-#>+ 27
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =  $(DEPDIR)/kmyirciface_skel.P $(DEPDIR)/ircservercfg.P $(DEPDIR)/groupdlg.P $(DEPDIR)/serverdlg.P $(DEPDIR)/avatardlg.P $(DEPDIR)/nickname.P $(DEPDIR)/ircdefault.P $(DEPDIR)/kmiircsocket.moc.P $(DEPDIR)/kmigeneralcfg.moc.P  $(DEPDIR)/kmyirc.all_cpp.P $(DEPDIR)/kmyirc_client.all_cpp.P  ./$(DEPDIR)/kmiavatardlg.Po \
+#>+ 29
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =  $(DEPDIR)/kmyirciface_skel.P $(DEPDIR)/ircservercfg.P $(DEPDIR)/groupdlg.P $(DEPDIR)/serverdlg.P $(DEPDIR)/avatardlg.P $(DEPDIR)/nickname.P $(DEPDIR)/ircdefault.P $(DEPDIR)/ircchannel.P $(DEPDIR)/kmiircsocket.moc.P $(DEPDIR)/kmigeneralcfg.moc.P  $(DEPDIR)/kmyirc.all_cpp.P $(DEPDIR)/kmyirc_client.all_cpp.P  ./$(DEPDIR)/kmiavatardlg.Po \
 @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kmigeneralcfg.Po \
 @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kmigroupdlg.Po \
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kmiircchannel.Po \
 @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kmiircdefault.Po \
 @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kmiircmessage.Po \
 @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kmiircservercfg.Po \
@@ -354,9 +358,10 @@
 @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kmyirc.Po ./$(DEPDIR)/kmyirc_client.Po \
 @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kmyircview.Po ./$(DEPDIR)/main.Po \
 @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/pref.Po
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =  $(DEPDIR)/kmyirciface_skel.P $(DEPDIR)/ircservercfg.P $(DEPDIR)/groupdlg.P $(DEPDIR)/serverdlg.P $(DEPDIR)/avatardlg.P $(DEPDIR)/nickname.P $(DEPDIR)/ircdefault.P $(DEPDIR)/kmiircsocket.moc.P $(DEPDIR)/kmigeneralcfg.moc.P  ./$(DEPDIR)/kmiavatardlg.Po \
+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =  $(DEPDIR)/kmyirciface_skel.P $(DEPDIR)/ircservercfg.P $(DEPDIR)/groupdlg.P $(DEPDIR)/serverdlg.P $(DEPDIR)/avatardlg.P $(DEPDIR)/nickname.P $(DEPDIR)/ircdefault.P $(DEPDIR)/ircchannel.P $(DEPDIR)/kmiircsocket.moc.P $(DEPDIR)/kmigeneralcfg.moc.P  ./$(DEPDIR)/kmiavatardlg.Po \
 @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kmigeneralcfg.Po \
 @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kmigroupdlg.Po \
+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kmiircchannel.Po \
 @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kmiircdefault.Po \
 @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kmiircmessage.Po \
 @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kmiircservercfg.Po \
@@ -463,6 +468,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kmiavatardlg.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kmigeneralcfg.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kmigroupdlg.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kmiircchannel.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kmiircdefault.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kmiircmessage.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kmiircservercfg.Po@am__quote@
@@ -582,7 +588,7 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
 #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 #>+ 4
-KDE_DIST=kmyirc.desktop kmigeneralcfg.h hi16-app-kmyirc.png ircservercfg.ui serverdlg.ui kmyirciface.h kmisystray.h ircdefault.ui groupdlg.ui kmyircui.rc avatardlg.ui hi32-app-kmyirc.png kmyirc.lsm nickname.ui kmisocket.h 
+KDE_DIST=kmyirc.desktop kmigeneralcfg.h hi16-app-kmyirc.png ircservercfg.ui serverdlg.ui kmyirciface.h kmisystray.h ircdefault.ui groupdlg.ui ircchannel.ui kmyircui.rc avatardlg.ui hi32-app-kmyirc.png kmyirc.lsm nickname.ui kmisocket.h 
 
 DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
 
@@ -711,7 +717,7 @@
 kmyirciface_skel.cpp: kmyirciface.kidl
 	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub kmyirciface.kidl
 
-#>+ 79
+#>+ 92
 ircservercfg.cpp: $(srcdir)/ircservercfg.ui ircservercfg.h ircservercfg.moc
 	rm -f ircservercfg.cpp
 	echo '#include <klocale.h>' > ircservercfg.cpp
@@ -790,6 +796,19 @@
 
 ircdefault.moc: ircdefault.h
 	$(MOC) ircdefault.h -o ircdefault.moc
+ircchannel.cpp: $(srcdir)/ircchannel.ui ircchannel.h ircchannel.moc
+	rm -f ircchannel.cpp
+	echo '#include <klocale.h>' > ircchannel.cpp
+	$(UIC) -tr ${UIC_TR} -i ircchannel.h $(srcdir)/ircchannel.ui > ircchannel.cpp.temp ; ret=$$?; \
+	sed -e "s,${UIC_TR}( \"\" ),QString::null,g" ircchannel.cpp.temp | sed -e "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | sed -e "s,image\([0-9][0-9]*\)_data,img\1_ircchannel,g" >> ircchannel.cpp ;\
+	rm -f ircchannel.cpp.temp ;\
+	if test "$$ret" = 0; then echo '#include "ircchannel.moc"' >> ircchannel.cpp; else rm -f ircchannel.cpp ; exit $$ret ; fi
+
+ircchannel.h: $(srcdir)/ircchannel.ui
+	$(UIC) -o ircchannel.h $(srcdir)/ircchannel.ui
+
+ircchannel.moc: ircchannel.h
+	$(MOC) ircchannel.h -o ircchannel.moc
 
 #>+ 3
 kmiircdefault.moc: $(srcdir)/kmiircdefault.h
@@ -828,6 +847,10 @@
 	$(MOC) $(srcdir)/kmiserverdlg.h -o kmiserverdlg.moc
 
 #>+ 3
+kmiircchannel.moc: $(srcdir)/kmiircchannel.h
+	$(MOC) $(srcdir)/kmiircchannel.h -o kmiircchannel.moc
+
+#>+ 3
 kminickdlg.moc: $(srcdir)/kminickdlg.h
 	$(MOC) $(srcdir)/kminickdlg.h -o kminickdlg.moc
 
@@ -849,14 +872,14 @@
 
 #>+ 3
 clean-metasources:
-	-rm -f  kmiircdefault.moc kmyircview.moc kmyirc.moc kmiircsocket.moc.cpp kmigeneralcfg.moc.cpp pref.moc kmigroupdlg.moc kmisystray.moc kmiserverdlg.moc kminickdlg.moc kmisocket.moc kmiavatardlg.moc kmiircservercfg.moc kmiircmessage.moc
+	-rm -f  kmiircdefault.moc kmyircview.moc kmyirc.moc kmiircsocket.moc.cpp kmigeneralcfg.moc.cpp pref.moc kmigroupdlg.moc kmisystray.moc kmiserverdlg.moc kmiircchannel.moc kminickdlg.moc kmisocket.moc kmiavatardlg.moc kmiircservercfg.moc kmiircmessage.moc
 
 #>+ 4
 clean-idl:
 	-rm -f \
 	kmyirciface_skel.cpp kmyirciface_skel.h kmyirciface.kidl 
 
-#>+ 9
+#>+ 10
 clean-ui:
 	-rm -f \
 	ircservercfg.cpp ircservercfg.h ircservercfg.moc \
@@ -864,7 +887,8 @@
 	serverdlg.cpp serverdlg.h serverdlg.moc \
 	avatardlg.cpp avatardlg.h avatardlg.moc \
 	nickname.cpp nickname.h nickname.moc \
-	ircdefault.cpp ircdefault.h ircdefault.moc 
+	ircdefault.cpp ircdefault.h ircdefault.moc \
+	ircchannel.cpp ircchannel.h ircchannel.moc 
 
 #>+ 2
 docs-am:
@@ -887,11 +911,11 @@
 	test ! -s bchecktest.cc.oldclass || test ! -s bchecktest.cc.class || cmp -s bchecktest.cc.oldclass bchecktest.cc.class
 
 #>+ 11
-kmyirc.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kmyirc.cpp $(srcdir)/kmyircview.cpp $(srcdir)/pref.cpp $(srcdir)/kmiircservercfg.cpp $(srcdir)/kmigroupdlg.cpp $(srcdir)/kmiserverdlg.cpp $(srcdir)/kmiavatardlg.cpp $(srcdir)/kminickdlg.cpp $(srcdir)/kmiircmessage.cpp $(srcdir)/kmiircsocket.cpp $(srcdir)/kmisystray.cpp $(srcdir)/kmisocket.cpp $(srcdir)/kmigeneralcfg.cpp $(srcdir)/kmiircdefault.cpp kmyirciface_skel.cpp ircservercfg.cpp groupdlg.cpp serverdlg.cpp avatardlg.cpp nickname.cpp ircdefault.cpp kmigeneralcfg.moc.cpp kmiircsocket.moc.cpp  kmyirc.moc kmyircview.moc ircdefault.moc kmigroupdlg.moc kmiserverdlg.moc kmiircmessage.moc ircservercfg.moc serverdlg.moc kmiircdefault.moc avatardlg.moc nickname.moc groupdlg.moc pref.moc kmisystray.moc kminickdlg.moc kmisocket.moc kmiircservercfg.moc kmiavatardlg.moc
+kmyirc.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kmyirc.cpp $(srcdir)/kmyircview.cpp $(srcdir)/pref.cpp $(srcdir)/kmiircservercfg.cpp $(srcdir)/kmigroupdlg.cpp $(srcdir)/kmiserverdlg.cpp $(srcdir)/kmiavatardlg.cpp $(srcdir)/kminickdlg.cpp $(srcdir)/kmiircmessage.cpp $(srcdir)/kmiircsocket.cpp $(srcdir)/kmisystray.cpp $(srcdir)/kmisocket.cpp $(srcdir)/kmigeneralcfg.cpp $(srcdir)/kmiircdefault.cpp $(srcdir)/kmiircchannel.cpp kmyirciface_skel.cpp ircservercfg.cpp groupdlg.cpp serverdlg.cpp avatardlg.cpp nickname.cpp ircdefault.cpp ircchannel.cpp kmigeneralcfg.moc.cpp kmiircsocket.moc.cpp  kmyirc.moc kmyircview.moc ircdefault.moc ircchannel.moc kmigroupdlg.moc kmiserverdlg.moc kmiircchannel.moc kmiircmessage.moc ircservercfg.moc serverdlg.moc kmiircdefault.moc avatardlg.moc nickname.moc groupdlg.moc pref.moc kmisystray.moc kminickdlg.moc kmisocket.moc kmiircservercfg.moc kmiavatardlg.moc
 	@echo 'creating kmyirc.all_cpp.cpp ...'; \
 	rm -f kmyirc.all_cpp.files kmyirc.all_cpp.final; \
 	echo "#define KDE_USE_FINAL 1" >> kmyirc.all_cpp.final; \
-	for file in main.cpp kmyirc.cpp kmyircview.cpp pref.cpp kmiircservercfg.cpp kmigroupdlg.cpp kmiserverdlg.cpp kmiavatardlg.cpp kminickdlg.cpp kmiircmessage.cpp kmiircsocket.cpp kmisystray.cpp kmisocket.cpp kmigeneralcfg.cpp kmiircdefault.cpp kmyirciface_skel.cpp ircservercfg.cpp groupdlg.cpp serverdlg.cpp avatardlg.cpp nickname.cpp ircdefault.cpp kmigeneralcfg.moc.cpp kmiircsocket.moc.cpp ; do \
+	for file in main.cpp kmyirc.cpp kmyircview.cpp pref.cpp kmiircservercfg.cpp kmigroupdlg.cpp kmiserverdlg.cpp kmiavatardlg.cpp kminickdlg.cpp kmiircmessage.cpp kmiircsocket.cpp kmisystray.cpp kmisocket.cpp kmigeneralcfg.cpp kmiircdefault.cpp kmiircchannel.cpp kmyirciface_skel.cpp ircservercfg.cpp groupdlg.cpp serverdlg.cpp avatardlg.cpp nickname.cpp ircdefault.cpp ircchannel.cpp kmigeneralcfg.moc.cpp kmiircsocket.moc.cpp ; do \
 	  echo "#include \"$$file\"" >> kmyirc.all_cpp.files; \
 	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kmyirc.all_cpp.final; \
 	done; \
@@ -934,53 +958,57 @@
 kde-rpo-clean:
 	-rm -f *.rpo
 
-#>+ 50
+#>+ 54
 kmyircview.o: kmyircview.moc 
-$(srcdir)/kmiavatardlg.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h 
-$(srcdir)/kminickdlg.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h 
-$(srcdir)/kmiircservercfg.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h 
-$(srcdir)/main.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h 
-$(srcdir)/kmigroupdlg.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h 
-$(srcdir)/kmiserverdlg.h: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h 
+kmiircchannel.lo: kmiircchannel.moc 
+$(srcdir)/kmiavatardlg.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h 
+$(srcdir)/kminickdlg.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h 
+$(srcdir)/kmiircservercfg.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h 
+$(srcdir)/main.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h 
+$(srcdir)/kmigroupdlg.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h 
+$(srcdir)/kmiserverdlg.h: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h 
 kmiircdefault.o: kmiircdefault.moc 
-$(srcdir)/kmiircsocket.h: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h 
-$(srcdir)/kmigroupdlg.h: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h 
-$(srcdir)/kmiavatardlg.h: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h 
-$(srcdir)/kmiserverdlg.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h 
+$(srcdir)/kmiircsocket.h: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h 
+$(srcdir)/kmigroupdlg.h: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h 
+$(srcdir)/kmiavatardlg.h: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h 
+$(srcdir)/kmiserverdlg.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h 
 kmisocket.o: kmisocket.moc 
 kmigroupdlg.lo: kmigroupdlg.moc 
-$(srcdir)/kmiircdefault.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h 
-$(srcdir)/kmiircservercfg.h: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h 
+$(srcdir)/kmiircdefault.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h 
+$(srcdir)/kmiircservercfg.h: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h 
 kmiircservercfg.o: kmiircservercfg.moc 
 kmisystray.lo: kmisystray.moc 
 kmisystray.o: kmisystray.moc 
 kmiserverdlg.o: kmiserverdlg.moc 
 nmcheck-am: nmcheck
-$(srcdir)/kminickdlg.h: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h 
+$(srcdir)/kminickdlg.h: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h 
 pref.lo: pref.moc 
 kmiserverdlg.lo: kmiserverdlg.moc 
-$(srcdir)/kmigeneralcfg.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h 
+$(srcdir)/kmigeneralcfg.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h 
 kmyirc.lo: kmyirc.moc 
-$(srcdir)/kmiircmessage.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h 
+$(srcdir)/kmiircmessage.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h 
 kmiircmessage.o: kmiircmessage.moc 
 kminickdlg.lo: kminickdlg.moc 
-$(srcdir)/kmiircsocket.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h 
+$(srcdir)/kmiircsocket.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h 
 kminickdlg.o: kminickdlg.moc 
-$(srcdir)/kmisystray.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h 
+$(srcdir)/kmisystray.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h 
 kmiircservercfg.lo: kmiircservercfg.moc 
 kmiavatardlg.o: kmiavatardlg.moc 
 kmyircview.lo: kmyircview.moc 
-$(srcdir)/kmisocket.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h 
+$(srcdir)/kmisocket.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h 
+$(srcdir)/kmyircview.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h 
 kmisocket.lo: kmisocket.moc 
-$(srcdir)/kmyircview.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h 
 nmcheck: 
-$(srcdir)/kmiircdefault.h: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h 
-$(srcdir)/pref.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h 
-$(srcdir)/kmiircmessage.h: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h 
+$(srcdir)/kmiircdefault.h: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h 
+$(srcdir)/pref.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h 
+$(srcdir)/kmiircmessage.h: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h 
 kmyirc.o: kmyirc.moc 
+$(srcdir)/kmyirc.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h 
+kmiircchannel.o: kmiircchannel.moc 
 kmiircdefault.lo: kmiircdefault.moc 
-$(srcdir)/kmyirc.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h 
 pref.o: pref.moc 
 kmiircmessage.lo: kmiircmessage.moc 
+$(srcdir)/kmiircchannel.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h 
 kmiavatardlg.lo: kmiavatardlg.moc 
+$(srcdir)/kmiircchannel.h: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h 
 kmigroupdlg.o: kmigroupdlg.moc 

Index: kmyirc.cpp
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/src/kmyirc.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- kmyirc.cpp	2 Jun 2003 08:44:04 -0000	1.5
+++ kmyirc.cpp	4 Jun 2003 13:07:08 -0000	1.6
@@ -108,12 +108,18 @@
 
     // this doesn't do anything useful.  it's just here to illustrate
     // how to insert a custom menu and menu item
-    KAction *custom = new KAction(i18n("&Connect"), 0,
-                                  this, SLOT(slotServerConnect()),
-                                  actionCollection(), "connect");
+	KAction *custom = new KAction(i18n("&Connect"), 0,
+					this, SLOT(slotServerConnect()),
+					actionCollection(), "connect");
+	KAction *channel_add=new KAction(i18n("&Add Channel"),0,
+					this,SLOT(slotAddChannel()),
+					actionCollection(),"channel_add");
+
 #ifdef DEBUG 
 #ifdef STAMPEDE
 	#warning "You must set your development path here to get the kmyircui.rc file"
+	#warning "define in preprocessor: #define STAMPEDE 1 to get your default directory where kmyircui.rc is"
+	
 	createGUI("/home/stampede/kmyirc/kmyirc-ng/src/kmyircui.rc");
 #else
 	createGUI("/home/sh/projekte/kmyirc-ng/src/kmyircui.rc");
@@ -323,6 +329,10 @@
 void KMyIRC::slotServerConnect()
 {
 #warning "not implemented yet!!"
+}
+
+void KMyIRC::slotAddChannel() {
+#warning "not implemened yet !!"
 }
 
 #include "kmyirc.moc"

Index: kmyirc.h
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/src/kmyirc.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kmyirc.h	24 Apr 2003 07:52:06 -0000	1.2
+++ kmyirc.h	4 Jun 2003 13:07:08 -0000	1.3
@@ -13,6 +13,7 @@
 #include <kmainwindow.h>
 
 #include "kmyircview.h"
+#include "kmiircchannel.h"
 
 class KPrinter;
 class KToggleAction;
@@ -89,12 +90,13 @@
 
 private:
     KMyIRCView *m_view;
-
+    KMIIrcChannel *m_view1;
     KPrinter   *m_printer;
     KToggleAction *m_toolbarAction;
     KToggleAction *m_statusbarAction;
 
     protected slots: virtual void slotServerConnect();
+    protected slots: virtual void slotAddChannel();
 };
 
 #endif // _KMYIRC_H_

Index: kmyircui.rc
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/src/kmyircui.rc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kmyircui.rc	24 Apr 2003 07:52:07 -0000	1.2
+++ kmyircui.rc	4 Jun 2003 13:07:08 -0000	1.3
@@ -2,7 +2,11 @@
 <kpartgui name="kmyirc" version="1">
 <MenuBar>
 	<Menu name="server"><text>&amp;Server</text>
-    	<Action name="connect" />
-  </Menu>
+		<Action name="connect" />
+	</Menu>
+	<Menu name="channel"><text>&amp;Channels</text>
+		<Action name="channel_add" />
+		
+	</Menu>
 </MenuBar>
 </kpartgui>

Index: kmyircview.cpp
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/src/kmyircview.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- kmyircview.cpp	23 Apr 2003 11:18:43 -0000	1.1.1.1
+++ kmyircview.cpp	4 Jun 2003 13:07:08 -0000	1.2
@@ -6,6 +6,7 @@
 
 #include <qpainter.h>
 #include <qlayout.h>
+#include <qtabwidget.h>
 
 #include <kurl.h>
 
@@ -15,61 +16,17 @@
 #include <krun.h>
 #include <klocale.h>
 
+#include "kmiircchannel.h"
+
 KMyIRCView::KMyIRCView(QWidget *parent)
     : QWidget(parent),
       DCOPObject("KMyIRCIface")
 {
     // setup our layout manager to automatically add our widgets
     QHBoxLayout *top_layout = new QHBoxLayout(this);
-    top_layout->setAutoAdd(true);
-
-    // we want to look for all components that satisfy our needs.  the
-    // trader will actually search through *all* registered KDE
-    // applications and components -- not just KParts.  So we have to
-    // specify two things: a service type and a constraint
-    //
-    // the service type is like a mime type.  we say that we want all
-    // applications and components that can handle HTML -- 'text/html'
-    //
-    // however, by itself, this will return such things as Netscape..
-    // not what we wanted.  so we constrain it by saying that the
-    // string 'KParts/ReadOnlyPart' must be found in the ServiceTypes
-    // field.  with this, only components of the type we want will be
-    // returned.
-    KTrader::OfferList offers = KTrader::self()->query("text/html", "'KParts/ReadOnlyPart' in ServiceTypes");
-
-    KLibFactory *factory = 0;
-    // in theory, we only care about the first one.. but let's try all
-    // offers just in case the first can't be loaded for some reason
-    KTrader::OfferList::Iterator it(offers.begin());
-    for( ; it != offers.end(); ++it)
-    {
-        KService::Ptr ptr = (*it);
-
-        // we now know that our offer can handle HTML and is a part.
-        // since it is a part, it must also have a library... let's try to
-        // load that now
-        factory = KLibLoader::self()->factory( ptr->library() );
-        if (factory)
-        {
-            m_html = static_cast<KParts::ReadOnlyPart *>(factory->create(this, ptr->name(), "KParts::ReadOnlyPart"));
-            break;
-        }
-    }
-
-    // if our factory is invalid, then we never found our component
-    // and we might as well just exit now
-    if (!factory)
-    {
-        KMessageBox::error(this, i18n("Could not find a suitable HTML component"));
-        return;
-    }
-
-    connect(m_html, SIGNAL(setWindowCaption(const QString&)),
-            this,   SLOT(slotSetTitle(const QString&)));
-    connect(m_html, SIGNAL(setStatusBarText(const QString&)),
-            this,   SLOT(slotOnURL(const QString&)));
-
+    top_layout->setAutoAdd(false);
+    tabChannelBar=new QTabWidget(this,"channelTabBar");
+    tabChannelBar->setTabPosition(QTabWidget::Bottom);
 }
 
 KMyIRCView::~KMyIRCView()

Index: kmyircview.h
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/src/kmyircview.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- kmyircview.h	23 Apr 2003 11:18:43 -0000	1.1.1.1
+++ kmyircview.h	4 Jun 2003 13:07:08 -0000	1.2
@@ -11,6 +11,7 @@
 
 class QPainter;
 class KURL;
+class QTabWidget;
 
 /**
  * This is the main view class for KMyIRC.  Most of the non-menu,
@@ -74,6 +75,7 @@
 
 private:
     KParts::ReadOnlyPart *m_html;
+    QTabWidet *tabChannelBar;
 };
 
 #endif // _KMYIRCVIEW_H_

Index: pref.cpp
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/src/pref.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- pref.cpp	2 Jun 2003 08:44:04 -0000	1.6
+++ pref.cpp	4 Jun 2003 13:07:08 -0000	1.7
@@ -50,13 +50,11 @@
 }
 
 void KMyIRCPreferences::slotOk() {
-	if (m_pageOne->isSystray()) {
-		KGlobal::config()->setGroup("General Settings");
-		KGlobal::config()->writeEntry("Enable Systray",m_pageOne->isSystray());
-	} else {
-		KGlobal::config()->setGroup("General Settings");
-		KGlobal::config()->writeEntry("Enable Systray",m_pageOne->isSystray());
-	}
+	// 
+	// Writing default systray setting to global configuration file
+	//
+	KGlobal::config()->setGroup("General Settings");
+	KGlobal::config()->writeEntry("Enable Systray",m_pageOne->isSystray());
 	//
 	// Writing default irc settings to global configuration file
 	//






[Kmyirc-cvs] kmyirc-ng/src ircchannel.ui,NONE,1.1 kmiircchannel.cpp,NONE,1.1 kmiircchannel.h,NONE,1.

[Kmyirc-cvs] kmyirc-ng/src ircchannel.ui,NONE,1.1 kmiircchannel.cpp,NONE,1.1 kmiircchannel.h,NONE,1.1 Makefile.am,1.11,1.12 Makefile.in,1.15,1.16 kmyirc.cpp,1.5,1.6 kmyirc.h,1.2,1.3 kmyircui.rc,1.2,1.3 kmyircview.cpp,1.1.1.1,1.2 kmyircview.h,1.1.1.1,1.2 pref.cpp,1.6,1.7