Removing annoying trailing CRs from files (VS issue)

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@505 17fca916-40b9-46aa-a4ea-0a15b648b75c

1 files changed, 222 insertions, 222 deletions

diff --git a/src/modules/notifier/notifierwindowborder.cpp b/src/modules/notifier/notifierwindowborder.cpp
index b88baef68..588b9cc59 100644
--- a/src/modules/notifier/notifierwindowborder.cpp
+++ b/src/modules/notifier/notifierwindowborder.cpp
@@ -1,222 +1,222 @@
-//=============================================================================

-//

-//   File : kvinotifierwindowborder.cpp

-//   Created on lun 03 gen 2005 02:27:22 by Iacopo Palazzi

-//

-//   This file is part of the KVIrc distribution

-//   Copyright (C) 2005 Iacopo Palazzi < iakko(at)siena(dot)linux(dot)it >

-//

-//   This program is FREE software. You can redistribute it and/or

-//   modify it under the terms of the GNU General Public License

-//   as published by the Free Software Foundation; either version 2

-//   of the License, or (at your opinion) any later version.

-//

-//   This program is distributed in the HOPE that it will be USEFUL,

-//   but WITHOUT ANY WARRANTY; without even the implied warranty of

-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

-//   See the GNU General Public License for more details.

-//

-//   You should have received a copy of the GNU General Public License

-//   along with this program. If not, write to the Free Software Foundation,

-//   Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

-//

-//=============================================================================

-

-#include "notifierwindowborder.h"

-#include "notifierwindowtabs.h"

-#include "kvi_iconmanager.h"

-

-#include <qpainter.h>

-

-KviNotifierWindowBorder::KviNotifierWindowBorder(QSize s)

-{

-	loadImages();

-	resize(s);

-}

-

-KviNotifierWindowBorder::~KviNotifierWindowBorder()

-{

-}

-

-void KviNotifierWindowBorder::loadImages() {

-

-	// Normal Border

-

-	QPixmap * p;

-

-	if((p = g_pIconManager->getPixmap("notifier_pix_wnd_sx.png")))

-		m_pixSX_N = *p;

-	if((p = g_pIconManager->getPixmap("notifier_pix_wnd_dx.png")))

-		m_pixDX_N = *p;

-	if((p = g_pIconManager->getPixmap("notifier_pix_wnd_dwn.png")))

-		m_pixDWN_N = *p;

-	if((p = g_pIconManager->getPixmap("notifier_pix_wnd_dwndx.png")))

-		m_pixDWNDX_N = *p;

-	if((p = g_pIconManager->getPixmap("notifier_pix_wnd_dwnsx.png")))

-		m_pixDWNSX_N = *p;

-	if((p = g_pIconManager->getPixmap("notifier_pix_caption_sx.png")))

-		m_pixCaptionSX_N = *p;

-	if((p = g_pIconManager->getPixmap("notifier_pix_caption_dx.png")))

-		m_pixCaptionDX_N = *p;

-	if((p = g_pIconManager->getPixmap("notifier_pix_caption_bkg.png")))

-		m_pixCaptionBKG_N = *p;

-	

-	if((p = g_pIconManager->getPixmap("notifier_icon_close_out.png")))

-		m_pixIconClose_out_N = *p;

-	if((p = g_pIconManager->getPixmap("notifier_icon_close_over.png")))

-		m_pixIconClose_over_N = *p;

-	if((p = g_pIconManager->getPixmap("notifier_icon_close_clicked.png")))

-		m_pixIconClose_clicked_N = *p;

-

-	// Highlighted Border

-

-	if((p = g_pIconManager->getPixmap("notifier_pix_wnd_sx_hl.png")))

-		m_pixSX_HL = *p;

-	if((p = g_pIconManager->getPixmap("notifier_pix_wnd_dx_hl.png")))

-		m_pixDX_HL = *p;

-	if((p = g_pIconManager->getPixmap("notifier_pix_wnd_dwn_hl.png")))

-		m_pixDWN_HL = *p;

-	if((p = g_pIconManager->getPixmap("notifier_pix_wnd_dwndx_hl.png")))

-		m_pixDWNDX_HL = *p;

-	if((p = g_pIconManager->getPixmap("notifier_pix_wnd_dwnsx_hl.png")))

-		m_pixDWNSX_HL = *p;

-	if((p = g_pIconManager->getPixmap("notifier_pix_caption_sx_hl.png")))

-		m_pixCaptionSX_HL = *p;

-	if((p = g_pIconManager->getPixmap("notifier_pix_caption_dx_hl.png")))

-		m_pixCaptionDX_HL = *p;

-	if((p = g_pIconManager->getPixmap("notifier_pix_caption_bkg_hl.png")))

-		m_pixCaptionBKG_HL = *p;

-	

-	if((p = g_pIconManager->getPixmap("notifier_icon_close_out_hl.png")))

-		m_pixIconClose_out_HL = *p;

-	if((p = g_pIconManager->getPixmap("notifier_icon_close_over_hl.png")))

-		m_pixIconClose_over_HL = *p;

-	if((p = g_pIconManager->getPixmap("notifier_icon_close_clicked_hl.png")))

-		m_pixIconClose_clicked_HL = *p;

-	

-	setPics();

-	setCloseIcon(WDG_ICON_OUT);

-	

-	if ( m_pixCaptionDX->height()==m_pixCaptionSX->height() && m_pixCaptionDX->height()==m_pixCaptionBKG->height())		// just to be sure that the height is fitting

-		m_captionRect.setHeight(m_pixCaptionDX->height());

-		

-	// We want to see the tabs height to calculate the appropriate rect..

-	if((p = g_pIconManager->getPixmap("notifier_pix_tab_sx.png")))

-		m_iTabsHeight = p->height();

-	else

-		m_iTabsHeight = 10;

-	

-	m_bNeedToRedraw = true;

-	

-}

-

-void KviNotifierWindowBorder::setPics(bool b)

-{

-	if (b) {

-		m_pixSX = &m_pixSX_HL;

-		m_pixDX = &m_pixDX_HL;

-		m_pixDWN = &m_pixDWN_HL;

-		m_pixDWNSX = &m_pixDWNSX_HL;

-		m_pixDWNDX = &m_pixDWNDX_HL;

-		m_pixCaptionSX = &m_pixCaptionSX_HL;

-		m_pixCaptionDX = &m_pixCaptionDX_HL;

-		m_pixCaptionBKG = &m_pixCaptionBKG_HL;

-		m_pixIconClose_out = &m_pixIconClose_out_HL;

-		m_pixIconClose_over = &m_pixIconClose_over_HL;

-		m_pixIconClose_clicked = &m_pixIconClose_clicked_HL;

-	} else {

-		m_pixSX = &m_pixSX_N;

-		m_pixDX = &m_pixDX_N;

-		m_pixDWN = &m_pixDWN_N;

-		m_pixDWNSX = &m_pixDWNSX_N;

-		m_pixDWNDX = &m_pixDWNDX_N;

-		m_pixCaptionSX = &m_pixCaptionSX_N;

-		m_pixCaptionDX = &m_pixCaptionDX_N;

-		m_pixCaptionBKG = &m_pixCaptionBKG_N;

-		m_pixIconClose_out = &m_pixIconClose_out_N;

-		m_pixIconClose_over = &m_pixIconClose_over_N;

-		m_pixIconClose_clicked = &m_pixIconClose_clicked_N;

-	}

-}

-

-void KviNotifierWindowBorder::setWidth(int w) {

-	m_iRctWidth = w;

-	recalculatePositions();

-}

-

-void KviNotifierWindowBorder::setHeight(int h) {

-	m_iRctHeight = h;

-	recalculatePositions();

-}

-

-void KviNotifierWindowBorder::recalculatePositions()

-{

-	m_rct.setHeight(m_iRctHeight);

-	m_rct.setWidth(m_iRctWidth);

-	m_rct.setTopLeft(QPoint(0,0));

-

-	m_closeIconRect.setX(m_rct.width()-m_pixCaptionDX->width()-m_pixIconClose->width());

-	m_closeIconRect.setY(2);

-	m_closeIconRect.setWidth(m_pixIconClose->width());

-	m_closeIconRect.setHeight(m_pixIconClose->height());

-	

-	m_captionRect.setTopLeft( m_rct.topLeft() );

-	m_captionRect.setSize( QSize(m_rct.width(),m_pixCaptionDX->height()) );

-	

-	m_tabsRect.setTopLeft( QPoint(m_pixCaptionDX->width()+7,m_captionRect.height()) );

-	m_tabsRect.setSize( QSize(m_captionRect.width()-(2*m_pixCaptionDX->width())-7,m_iTabsHeight) );

-	

-	m_bodyRect.setTopLeft( QPoint(m_pixCaptionDX->width()+7,m_captionRect.height()+m_tabsRect.height()) );

-	m_bodyRect.setSize( QSize(m_captionRect.width()-(2*m_pixCaptionDX->width())-7,m_rct.height()-m_captionRect.height()-m_pixDWN->height()-m_tabsRect.height()) );

-

-	m_titleRect.setTopLeft( QPoint(m_pixCaptionSX->width(), (m_captionRect.height()-m_iTitleFontHeight)/2 ) );

-	m_titleRect.setSize( QSize(m_rct.width()-m_pixCaptionSX->width()-m_pixCaptionDX->width(),m_iTitleFontHeight) );

-	

-	m_progressRect.setTopLeft( QPoint(m_pixCaptionDX->width(),m_pixCaptionDX->height()));

-	m_progressRect.setSize( QSize(6,m_iRctHeight-m_pixCaptionDX->height()-m_pixDWN->height()));

-

-	m_bNeedToRedraw = true;

-}

-

-void KviNotifierWindowBorder::setCloseIcon(int state) { 

-	m_bNeedToRedraw = true; m_eIconState = state;

-	switch (m_eIconState) {

-			case WDG_ICON_OUT: m_pixIconClose = m_pixIconClose_out; break;

-			case WDG_ICON_OVER: m_pixIconClose = m_pixIconClose_over; break;

-			case WDG_ICON_CLICKED: m_pixIconClose = m_pixIconClose_clicked; break;

-	};

-}

-

-void KviNotifierWindowBorder::resetIcons() {

-	setCloseIcon(WDG_ICON_OUT);

-}

-

-void KviNotifierWindowBorder::draw(QPainter * p, bool b) {

-

-	if (m_bNeedToRedraw) {

-	

-		setPics(b);

-		setCloseIcon(m_eIconState);

-		// Draw the caption

-		

-		p->drawPixmap(m_captionRect.x(),m_captionRect.y(), *m_pixCaptionSX);

-		p->drawTiledPixmap(m_pixCaptionSX->width(), 0, m_captionRect.width()-(m_pixCaptionSX->width()+m_pixCaptionDX->width()), m_captionRect.height(), *m_pixCaptionBKG);

-		p->drawPixmap(m_captionRect.width()-m_pixCaptionDX->width(), 0, *m_pixCaptionDX);

-	

-		// Draw the tiled borders

-		p->drawTiledPixmap(0,m_captionRect.height(), m_pixSX->width(), m_bodyRect.height()+m_iTabsHeight, *m_pixSX );

-		p->drawTiledPixmap(m_bodyRect.width()+m_bodyRect.x(),m_captionRect.height(), m_pixDX->width(), m_bodyRect.height()+m_iTabsHeight, *m_pixDX );

-		p->drawTiledPixmap(m_pixDWNSX->width(),m_captionRect.height()+m_bodyRect.height()+m_iTabsHeight, m_bodyRect.width(), m_pixDWN->height(), *m_pixDWN );

-	

-		// Draw down corners

-		p->drawPixmap(0,m_captionRect.height()+m_bodyRect.height()+m_iTabsHeight, *m_pixDWNSX);

-		p->drawPixmap(m_bodyRect.width()+m_bodyRect.x(),m_captionRect.height()+m_bodyRect.height()+m_iTabsHeight, *m_pixDWNDX);

-				

-		//Drawing icons

-		p->drawPixmap(m_closeIconRect.x(), m_closeIconRect.y(), *m_pixIconClose);

-

-		m_bNeedToRedraw = false;

-

-	}

-	

-}

+//=============================================================================
+//
+//   File : kvinotifierwindowborder.cpp
+//   Created on lun 03 gen 2005 02:27:22 by Iacopo Palazzi
+//
+//   This file is part of the KVIrc distribution
+//   Copyright (C) 2005 Iacopo Palazzi < iakko(at)siena(dot)linux(dot)it >
+//
+//   This program is FREE software. You can redistribute it and/or
+//   modify it under the terms of the GNU General Public License
+//   as published by the Free Software Foundation; either version 2
+//   of the License, or (at your opinion) any later version.
+//
+//   This program is distributed in the HOPE that it will be USEFUL,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+//   See the GNU General Public License for more details.
+//
+//   You should have received a copy of the GNU General Public License
+//   along with this program. If not, write to the Free Software Foundation,
+//   Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+//=============================================================================
+
+#include "notifierwindowborder.h"
+#include "notifierwindowtabs.h"
+#include "kvi_iconmanager.h"
+
+#include <qpainter.h>
+
+KviNotifierWindowBorder::KviNotifierWindowBorder(QSize s)
+{
+	loadImages();
+	resize(s);
+}
+
+KviNotifierWindowBorder::~KviNotifierWindowBorder()
+{
+}
+
+void KviNotifierWindowBorder::loadImages() {
+
+	// Normal Border
+
+	QPixmap * p;
+
+	if((p = g_pIconManager->getPixmap("notifier_pix_wnd_sx.png")))
+		m_pixSX_N = *p;
+	if((p = g_pIconManager->getPixmap("notifier_pix_wnd_dx.png")))
+		m_pixDX_N = *p;
+	if((p = g_pIconManager->getPixmap("notifier_pix_wnd_dwn.png")))
+		m_pixDWN_N = *p;
+	if((p = g_pIconManager->getPixmap("notifier_pix_wnd_dwndx.png")))
+		m_pixDWNDX_N = *p;
+	if((p = g_pIconManager->getPixmap("notifier_pix_wnd_dwnsx.png")))
+		m_pixDWNSX_N = *p;
+	if((p = g_pIconManager->getPixmap("notifier_pix_caption_sx.png")))
+		m_pixCaptionSX_N = *p;
+	if((p = g_pIconManager->getPixmap("notifier_pix_caption_dx.png")))
+		m_pixCaptionDX_N = *p;
+	if((p = g_pIconManager->getPixmap("notifier_pix_caption_bkg.png")))
+		m_pixCaptionBKG_N = *p;
+	
+	if((p = g_pIconManager->getPixmap("notifier_icon_close_out.png")))
+		m_pixIconClose_out_N = *p;
+	if((p = g_pIconManager->getPixmap("notifier_icon_close_over.png")))
+		m_pixIconClose_over_N = *p;
+	if((p = g_pIconManager->getPixmap("notifier_icon_close_clicked.png")))
+		m_pixIconClose_clicked_N = *p;
+
+	// Highlighted Border
+
+	if((p = g_pIconManager->getPixmap("notifier_pix_wnd_sx_hl.png")))
+		m_pixSX_HL = *p;
+	if((p = g_pIconManager->getPixmap("notifier_pix_wnd_dx_hl.png")))
+		m_pixDX_HL = *p;
+	if((p = g_pIconManager->getPixmap("notifier_pix_wnd_dwn_hl.png")))
+		m_pixDWN_HL = *p;
+	if((p = g_pIconManager->getPixmap("notifier_pix_wnd_dwndx_hl.png")))
+		m_pixDWNDX_HL = *p;
+	if((p = g_pIconManager->getPixmap("notifier_pix_wnd_dwnsx_hl.png")))
+		m_pixDWNSX_HL = *p;
+	if((p = g_pIconManager->getPixmap("notifier_pix_caption_sx_hl.png")))
+		m_pixCaptionSX_HL = *p;
+	if((p = g_pIconManager->getPixmap("notifier_pix_caption_dx_hl.png")))
+		m_pixCaptionDX_HL = *p;
+	if((p = g_pIconManager->getPixmap("notifier_pix_caption_bkg_hl.png")))
+		m_pixCaptionBKG_HL = *p;
+	
+	if((p = g_pIconManager->getPixmap("notifier_icon_close_out_hl.png")))
+		m_pixIconClose_out_HL = *p;
+	if((p = g_pIconManager->getPixmap("notifier_icon_close_over_hl.png")))
+		m_pixIconClose_over_HL = *p;
+	if((p = g_pIconManager->getPixmap("notifier_icon_close_clicked_hl.png")))
+		m_pixIconClose_clicked_HL = *p;
+	
+	setPics();
+	setCloseIcon(WDG_ICON_OUT);
+	
+	if ( m_pixCaptionDX->height()==m_pixCaptionSX->height() && m_pixCaptionDX->height()==m_pixCaptionBKG->height())		// just to be sure that the height is fitting
+		m_captionRect.setHeight(m_pixCaptionDX->height());
+		
+	// We want to see the tabs height to calculate the appropriate rect..
+	if((p = g_pIconManager->getPixmap("notifier_pix_tab_sx.png")))
+		m_iTabsHeight = p->height();
+	else
+		m_iTabsHeight = 10;
+	
+	m_bNeedToRedraw = true;
+	
+}
+
+void KviNotifierWindowBorder::setPics(bool b)
+{
+	if (b) {
+		m_pixSX = &m_pixSX_HL;
+		m_pixDX = &m_pixDX_HL;
+		m_pixDWN = &m_pixDWN_HL;
+		m_pixDWNSX = &m_pixDWNSX_HL;
+		m_pixDWNDX = &m_pixDWNDX_HL;
+		m_pixCaptionSX = &m_pixCaptionSX_HL;
+		m_pixCaptionDX = &m_pixCaptionDX_HL;
+		m_pixCaptionBKG = &m_pixCaptionBKG_HL;
+		m_pixIconClose_out = &m_pixIconClose_out_HL;
+		m_pixIconClose_over = &m_pixIconClose_over_HL;
+		m_pixIconClose_clicked = &m_pixIconClose_clicked_HL;
+	} else {
+		m_pixSX = &m_pixSX_N;
+		m_pixDX = &m_pixDX_N;
+		m_pixDWN = &m_pixDWN_N;
+		m_pixDWNSX = &m_pixDWNSX_N;
+		m_pixDWNDX = &m_pixDWNDX_N;
+		m_pixCaptionSX = &m_pixCaptionSX_N;
+		m_pixCaptionDX = &m_pixCaptionDX_N;
+		m_pixCaptionBKG = &m_pixCaptionBKG_N;
+		m_pixIconClose_out = &m_pixIconClose_out_N;
+		m_pixIconClose_over = &m_pixIconClose_over_N;
+		m_pixIconClose_clicked = &m_pixIconClose_clicked_N;
+	}
+}
+
+void KviNotifierWindowBorder::setWidth(int w) {
+	m_iRctWidth = w;
+	recalculatePositions();
+}
+
+void KviNotifierWindowBorder::setHeight(int h) {
+	m_iRctHeight = h;
+	recalculatePositions();
+}
+
+void KviNotifierWindowBorder::recalculatePositions()
+{
+	m_rct.setHeight(m_iRctHeight);
+	m_rct.setWidth(m_iRctWidth);
+	m_rct.setTopLeft(QPoint(0,0));
+
+	m_closeIconRect.setX(m_rct.width()-m_pixCaptionDX->width()-m_pixIconClose->width());
+	m_closeIconRect.setY(2);
+	m_closeIconRect.setWidth(m_pixIconClose->width());
+	m_closeIconRect.setHeight(m_pixIconClose->height());
+	
+	m_captionRect.setTopLeft( m_rct.topLeft() );
+	m_captionRect.setSize( QSize(m_rct.width(),m_pixCaptionDX->height()) );
+	
+	m_tabsRect.setTopLeft( QPoint(m_pixCaptionDX->width()+7,m_captionRect.height()) );
+	m_tabsRect.setSize( QSize(m_captionRect.width()-(2*m_pixCaptionDX->width())-7,m_iTabsHeight) );
+	
+	m_bodyRect.setTopLeft( QPoint(m_pixCaptionDX->width()+7,m_captionRect.height()+m_tabsRect.height()) );
+	m_bodyRect.setSize( QSize(m_captionRect.width()-(2*m_pixCaptionDX->width())-7,m_rct.height()-m_captionRect.height()-m_pixDWN->height()-m_tabsRect.height()) );
+
+	m_titleRect.setTopLeft( QPoint(m_pixCaptionSX->width(), (m_captionRect.height()-m_iTitleFontHeight)/2 ) );
+	m_titleRect.setSize( QSize(m_rct.width()-m_pixCaptionSX->width()-m_pixCaptionDX->width(),m_iTitleFontHeight) );
+	
+	m_progressRect.setTopLeft( QPoint(m_pixCaptionDX->width(),m_pixCaptionDX->height()));
+	m_progressRect.setSize( QSize(6,m_iRctHeight-m_pixCaptionDX->height()-m_pixDWN->height()));
+
+	m_bNeedToRedraw = true;
+}
+
+void KviNotifierWindowBorder::setCloseIcon(int state) { 
+	m_bNeedToRedraw = true; m_eIconState = state;
+	switch (m_eIconState) {
+			case WDG_ICON_OUT: m_pixIconClose = m_pixIconClose_out; break;
+			case WDG_ICON_OVER: m_pixIconClose = m_pixIconClose_over; break;
+			case WDG_ICON_CLICKED: m_pixIconClose = m_pixIconClose_clicked; break;
+	};
+}
+
+void KviNotifierWindowBorder::resetIcons() {
+	setCloseIcon(WDG_ICON_OUT);
+}
+
+void KviNotifierWindowBorder::draw(QPainter * p, bool b) {
+
+	if (m_bNeedToRedraw) {
+	
+		setPics(b);
+		setCloseIcon(m_eIconState);
+		// Draw the caption
+		
+		p->drawPixmap(m_captionRect.x(),m_captionRect.y(), *m_pixCaptionSX);
+		p->drawTiledPixmap(m_pixCaptionSX->width(), 0, m_captionRect.width()-(m_pixCaptionSX->width()+m_pixCaptionDX->width()), m_captionRect.height(), *m_pixCaptionBKG);
+		p->drawPixmap(m_captionRect.width()-m_pixCaptionDX->width(), 0, *m_pixCaptionDX);
+	
+		// Draw the tiled borders
+		p->drawTiledPixmap(0,m_captionRect.height(), m_pixSX->width(), m_bodyRect.height()+m_iTabsHeight, *m_pixSX );
+		p->drawTiledPixmap(m_bodyRect.width()+m_bodyRect.x(),m_captionRect.height(), m_pixDX->width(), m_bodyRect.height()+m_iTabsHeight, *m_pixDX );
+		p->drawTiledPixmap(m_pixDWNSX->width(),m_captionRect.height()+m_bodyRect.height()+m_iTabsHeight, m_bodyRect.width(), m_pixDWN->height(), *m_pixDWN );
+	
+		// Draw down corners
+		p->drawPixmap(0,m_captionRect.height()+m_bodyRect.height()+m_iTabsHeight, *m_pixDWNSX);
+		p->drawPixmap(m_bodyRect.width()+m_bodyRect.x(),m_captionRect.height()+m_bodyRect.height()+m_iTabsHeight, *m_pixDWNDX);
+				
+		//Drawing icons
+		p->drawPixmap(m_closeIconRect.x(), m_closeIconRect.y(), *m_pixIconClose);
+
+		m_bNeedToRedraw = false;
+
+	}
+	
+}