more qt4 port (renamed QT3 stuff))

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

9 files changed, 24 insertions, 22 deletions

diff --git a/src/kvirc/ui/kvi_customtoolbar.cpp b/src/kvirc/ui/kvi_customtoolbar.cpp
index 4418c653b..652e359c0 100644
--- a/src/kvirc/ui/kvi_customtoolbar.cpp
+++ b/src/kvirc/ui/kvi_customtoolbar.cpp
@@ -50,8 +50,8 @@ KviCustomToolBarSeparator::KviCustomToolBarSeparator(KviCustomToolBar *pParent,c
 : QWidget(pParent,name)
 {
 	m_pToolBar = pParent;
-	setBackgroundMode(pParent->backgroundMode());
-	setBackgroundOrigin(ParentOrigin);
+//	setBackgroundMode(pParent->backgroundMode());
+//	setBackgroundOrigin(ParentOrigin);
 	setSizePolicy(QSizePolicy(QSizePolicy::Minimum,QSizePolicy::Minimum));
 }
 
diff --git a/src/kvirc/ui/kvi_listview.cpp b/src/kvirc/ui/kvi_listview.cpp
index eaa3d768a..b3fd39d57 100644
--- a/src/kvirc/ui/kvi_listview.cpp
+++ b/src/kvirc/ui/kvi_listview.cpp
@@ -48,11 +48,7 @@ KviListView::~KviListView()
 void KviListView::setBackgroundOverlayPixmap(QPixmap * pix,int iAlignmentFlags)
 {
 	setStaticBackground(TRUE);
-#ifdef COMPILE_USE_QT4
 	viewport()->setAutoFillBackground(false);
-#else
-	viewport()->setBackgroundMode(QWidget::NoBackground);
-#endif
 	m_pBackgroundOverlayPixmap=new QPixmap(*pix);
 	m_iBackgroundOverlayAlignment= Qt::AlignRight | Qt::AlignBottom;
 	repaintContents();
diff --git a/src/kvirc/ui/kvi_taskbar.cpp b/src/kvirc/ui/kvi_taskbar.cpp
index 7078a0354..2aba8b250 100644
--- a/src/kvirc/ui/kvi_taskbar.cpp
+++ b/src/kvirc/ui/kvi_taskbar.cpp
@@ -188,7 +188,6 @@ KviTaskBarButton::KviTaskBarButton(QWidget * par,KviWindow * wnd,const char * na
 	m_bActive         = false;
 	m_pTip            = new KviDynamicToolTip(this);
 	connect(m_pTip,SIGNAL(tipRequest(KviDynamicToolTip *,const QPoint &)),this,SLOT(tipRequest(KviDynamicToolTip *,const QPoint &)));
-//	setBackgroundMode(QWidget::NoBackground);
 	setToggleButton (true);
 	setFlat ( KVI_OPTION_BOOL(KviOption_boolUseFlatClassicTaskbarButtons) );
 }
@@ -452,7 +451,6 @@ KviClassicTaskBar::KviClassicTaskBar()
 	calcButtonHeight();
 
 	m_pBase = new QWidget(this);
-//	m_pBase->setBackgroundMode(NoBackground);
 	setWidget(m_pBase);
 
 	m_pBase->setMinimumWidth(KVI_TASKBAR_MIN_WIDTH);
diff --git a/src/kvirc/ui/kvi_userlistview.cpp b/src/kvirc/ui/kvi_userlistview.cpp
index 19a325e65..86407107e 100644
--- a/src/kvirc/ui/kvi_userlistview.cpp
+++ b/src/kvirc/ui/kvi_userlistview.cpp
@@ -211,7 +211,6 @@ KviUserListView::KviUserListView(QWidget * parent,KviWindowToolPageButton* butto
 	m_ieEntries   = 0;
 	m_iIEntries   = 0;
 	m_iSelectedCount = 0;
-//	setBackgroundMode(QWidget::NoBackground);
 	applyOptions();
 	registerSelf();
 }
diff --git a/src/modules/editor/scripteditor.cpp b/src/modules/editor/scripteditor.cpp
index ad976c213..326f2b4ff 100644
--- a/src/modules/editor/scripteditor.cpp
+++ b/src/modules/editor/scripteditor.cpp
@@ -72,8 +72,11 @@ static QFont g_fntNormal("Courier New",8);
 KviCompletionBox::KviCompletionBox(QWidget * parent = 0)
 : KviTalListBox(parent)
 {
-	setPaletteForegroundColor(QColor(0,0,0));
-	setPaletteBackgroundColor(QColor(255,255,255));
+	QPalette p = palette();
+	p.setColor(foregroundRole(),QColor(0,0,0));
+	p.setColor(backgroundRole(),QColor(255,255,255));
+//	setPaletteBackgroundColor(QColor(255,255,255));
+	setPalette(p);
 	setHScrollBarMode(KviTalListBox::AlwaysOff);
 
 	QFont listfont=font();
@@ -277,7 +280,9 @@ void KviScriptEditorWidget::updateOptions()
 	setText(text()); // an "hack" to ensure Update all in the editor
 	KviScriptSyntaxHighlighter *h = new KviScriptSyntaxHighlighter(this);
 	(void)h;
-	((KviScriptEditorImplementation*)m_pParent)->getFindlineedit()->setPaletteForegroundColor(g_clrFind);
+	p = ((KviScriptEditorImplementation*)m_pParent)->getFindlineedit()->palette(); 
+	p.setColor(foregroundRole(),g_clrFind); 
+	((KviScriptEditorImplementation*)m_pParent)->getFindlineedit()->setPalette(p); 
 }
 
 void KviScriptEditorWidget::keyPressEvent(QKeyEvent * e)
@@ -823,8 +828,12 @@ KviScriptEditorImplementation::KviScriptEditorImplementation(QWidget * par)
 
 	m_pFindLineedit = new QLineEdit(" ",this);
 	m_pFindLineedit->setText("");
-	m_pFindLineedit->setPaletteForegroundColor(g_clrFind);
 
+	QPalette p = m_pFindLineedit->palette(); 
+	p.setColor(foregroundRole(), g_clrFind); 
+	m_pFindLineedit->setPalette(p);
+
+	
 	m_pEditor = new KviScriptEditorWidget(this);
 	g->addMultiCellWidget(m_pEditor,0,0,0,3);
 	g->setRowStretch(0,1);
@@ -1083,9 +1092,12 @@ KviScriptEditorReplaceDialog::KviScriptEditorReplaceDialog( QWidget* parent, con
 {
 	m_pParent=parent;
 	emit initFind();
-	setPaletteForegroundColor( QColor( 0, 0, 0 ) );
-	setPaletteBackgroundColor( QColor( 236, 233, 216 ) );
-	QGridLayout *layout = new QGridLayout( this, 1, 1, 11, 6, "replace layout"); 
+	QPalette p = palette(); 
+	p.setColor(foregroundRole(),QColor( 0, 0, 0 )); 
+	p.setColor(backgroundRole(),QColor( 236, 233, 216 )); 
+	setPalette(p);
+
+QGridLayout *layout = new QGridLayout( this, 1, 1, 11, 6, "replace layout"); 
  
 	m_pFindlineedit = new QLineEdit( this, "findlineedit" );
 	layout->addMultiCellWidget( m_pFindlineedit, 2, 2, 1, 2 );
diff --git a/src/modules/notifier/notifierwindow.cpp b/src/modules/notifier/notifierwindow.cpp
index f177b8f98..2236f73f2 100644
--- a/src/modules/notifier/notifierwindow.cpp
+++ b/src/modules/notifier/notifierwindow.cpp
@@ -115,7 +115,6 @@ KviNotifierWindow::KviNotifierWindow()
 	m_iInputHeight = cfg.readIntEntry("InputHeight",20);
 	if(m_iInputHeight < 10)m_iInputHeight = 10;
 
-	setBackgroundMode(Qt::NoBackground);
 	setFocusPolicy(Qt::NoFocus);
 	setMouseTracking(true);
 	//setCursor(m_cursor);
diff --git a/src/modules/objects/class_window.cpp b/src/modules/objects/class_window.cpp
index a0cdb4d08..7037d9c9e 100644
--- a/src/modules/objects/class_window.cpp
+++ b/src/modules/objects/class_window.cpp
@@ -36,8 +36,8 @@ KviKvsScriptWindowWindow::KviKvsScriptWindowWindow(KviFrame * pParent,const QStr
 : KviWindow(KVI_WINDOW_TYPE_SCRIPTOBJECT,pParent,szName)
 {
 	m_pCentralWidget = 0;
-		setBackgroundMode(Qt::NoBackground);
-	}
+	
+}
 
 KviKvsScriptWindowWindow::~KviKvsScriptWindowWindow()
 {
diff --git a/src/modules/options/optw_messages.cpp b/src/modules/options/optw_messages.cpp
index d31e98d2c..6df48ffee 100644
--- a/src/modules/options/optw_messages.cpp
+++ b/src/modules/options/optw_messages.cpp
@@ -379,8 +379,7 @@ KviMessageColorsOptionsWidget::KviMessageColorsOptionsWidget(QWidget * parent)
 	m_pListView->setSelectionMode(KviTalListView::Single);
 	m_pListView->setFont(KVI_OPTION_FONT(KviOption_fontIrcView));
 	m_pListView->setStaticBackground(true);
-	m_pListView->viewport()->setBackgroundMode(Qt::NoBackground);
-
+	
 	addWidgetToLayout(m_pListView,0,0,2,0);
 
 	KviTalVBox * box = new KviTalVBox(this);
diff --git a/src/modules/tip/libkvitip.cpp b/src/modules/tip/libkvitip.cpp
index 6ba8933e8..3b11aa5c1 100644
--- a/src/modules/tip/libkvitip.cpp
+++ b/src/modules/tip/libkvitip.cpp
@@ -57,7 +57,6 @@ KviTipFrame::KviTipFrame(QWidget * par)
 	QString buffer;

 	g_pApp->findImage(buffer,"kvi_tip.png");

 	m_pTipPixmap = new QPixmap(buffer);

-	//setBackgroundMode(Qt::NoBackground);

 	setFrameStyle(QFrame::Sunken | QFrame::WinPanel);

 }