[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: koffice/kword
From: Laurent Montel <montel () kde ! org>
Date: 2006-10-09 12:16:04
Message-ID: 1160396164.299006.8525.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 593873 by mlaurent:
Q3Frame--
M +2 -2 KWConfig.cpp
M +1 -1 KWConfigFootNoteDia.cpp
M +7 -7 KWFrameDia.cpp
M +2 -2 KWFrameDia.h
M +1 -1 KWFrameStyleManager.cpp
M +3 -3 KWMailMergeDataBase.cpp
M +9 -9 KWStatisticsDialog.cpp
M +3 -3 KWStatisticsDialog.h
M +1 -2 KWTableStyleManager.h
--- trunk/koffice/kword/KWConfig.cpp #593872:593873
@@ -41,7 +41,7 @@
//Added by qt3to4:
#include <QPixmap>
#include <Q3GridLayout>
-#include <Q3Frame>
+#include <QFrame>
#include <Q3GroupBox>
#include "KWConfig.h"
@@ -757,7 +757,7 @@
QString labelName = font->family() + ' ' + QString::number(font->pointSize());
fontName = new QLabel(labelName, fontContainer);
fontName->setFont(*font);
- fontName->setFrameStyle(Q3Frame::StyledPanel | Q3Frame::Sunken);
+ fontName->setFrameStyle(QFrame::StyledPanel | QFrame::Sunken);
QPushButton *chooseButton = new QPushButton(i18n("Choose..."), fontContainer);
connect(chooseButton, SIGNAL(clicked()), this, SLOT(selectNewDefaultFont()));
--- trunk/koffice/kword/KWConfigFootNoteDia.cpp #593872:593873
@@ -40,7 +40,7 @@
#include <Q3VBoxLayout>
#include <Q3HBoxLayout>
#include <Q3GridLayout>
-#include <Q3Frame>
+#include <QFrame>
KWConfigFootNoteDia::KWConfigFootNoteDia( QWidget *parent, const char *name, KWDocument *doc )
--- trunk/koffice/kword/KWFrameDia.cpp #593872:593873
@@ -55,7 +55,7 @@
#include <QPixmap>
#include <Q3GridLayout>
#include <Q3PtrList>
-#include <Q3Frame>
+#include <QFrame>
#include <QList>
#include <Q3HBoxLayout>
#include <Q3VBoxLayout>
@@ -68,7 +68,7 @@
/* Class KWBrushStylePreview - only used by kwframestylemanager */
/******************************************************************/
KWBrushStylePreview::KWBrushStylePreview( QWidget* parent )
- : Q3Frame(parent)
+ : QFrame(parent)
{
}
@@ -852,10 +852,10 @@
tabLayout->addWidget( m_rNewFrameset );
myGroup->insert(m_rNewFrameset,2);
- Q3Frame *line1 = new Q3Frame( m_tab3 );
- line1->setProperty( "frameShape", (int)Q3Frame::HLine );
- line1->setFrameShadow( Q3Frame::Plain );
- line1->setFrameShape( Q3Frame::HLine );
+ QFrame *line1 = new QFrame( m_tab3 );
+ line1->setProperty( "frameShape", (int)QFrame::HLine );
+ line1->setFrameShadow( QFrame::Plain );
+ line1->setFrameShape( QFrame::HLine );
tabLayout->addWidget( line1 );
Q3HBoxLayout *layout1 = new Q3HBoxLayout( 0, 0, 6 );
@@ -1302,7 +1302,7 @@
grid->addWidget( m_bColor, 5, 0 );
Q3ButtonGroup * bb = new Q3HButtonGroup( m_tab6 );
- //bb->setFrameStyle(Q3Frame::NoFrame);
+ //bb->setFrameStyle(QFrame::NoFrame);
m_bLeft = new QPushButton(bb);
m_bLeft->setPixmap( BarIcon( "borderleft" ) );
m_bLeft->setToggleButton( true );
--- trunk/koffice/kword/KWFrameDia.h #593872:593873
@@ -31,7 +31,7 @@
#include <QCloseEvent>
#include <Q3GridLayout>
#include <Q3PtrList>
-#include <Q3Frame>
+#include <QFrame>
#include <QLabel>
#include <QMouseEvent>
@@ -55,7 +55,7 @@
/******************************************************************/
/* Class: KWBrushStylePreview */
/******************************************************************/
-class KWBrushStylePreview : public Q3Frame
+class KWBrushStylePreview : public QFrame
{
Q_OBJECT
public:
--- trunk/koffice/kword/KWFrameStyleManager.cpp #593872:593873
@@ -41,7 +41,7 @@
#include <QPaintEvent>
#include <Q3GridLayout>
#include <Q3PtrList>
-#include <Q3Frame>
+#include <QFrame>
#include <QList>
#include <QResizeEvent>
--- trunk/koffice/kword/KWMailMergeDataBase.cpp #593872:593873
@@ -43,7 +43,7 @@
#include <QLabel>
#include <QPushButton>
//Added by qt3to4:
-#include <Q3Frame>
+#include <QFrame>
#include <Q3VBoxLayout>
#include <kvbox.h>
@@ -354,8 +354,8 @@
descriptionLabel = new QLabel( back );
descriptionLabel->hide();
descriptionLabel->setWordWrap( true );
- descriptionLabel->setFrameShape( Q3Frame::Box );
- descriptionLabel->setFrameShadow( Q3Frame::Sunken );
+ descriptionLabel->setFrameShape( QFrame::Box );
+ descriptionLabel->setFrameShadow( QFrame::Sunken );
QSize old_sizeHint;
for ( KService::List::Iterator it = pluginOffers.begin(); *it; ++it )
--- trunk/koffice/kword/KWStatisticsDialog.cpp #593872:593873
@@ -29,7 +29,7 @@
//Added by qt3to4:
#include <Q3VBoxLayout>
#include <Q3GridLayout>
-#include <Q3Frame>
+#include <QFrame>
#include <Q3GroupBox>
KWStatisticsDialog::KWStatisticsDialog( QWidget *parent, KWDocument *document )
@@ -43,9 +43,9 @@
Q3VBoxLayout *topLayout = new Q3VBoxLayout( page, 0, KDialog::spacingHint() );
QTabWidget *tab = new QTabWidget( page );
- Q3Frame *pageAll = 0;
- Q3Frame *pageGeneral = 0;
- Q3Frame *pageSelected = 0;
+ QFrame *pageAll = 0;
+ QFrame *pageGeneral = 0;
+ QFrame *pageSelected = 0;
for (int i=0; i < 7; ++i) {
m_resultLabelAll[i] = 0;
m_resultLabelSelected[i] = 0;
@@ -58,20 +58,20 @@
// add Tab "General"
- pageGeneral = new Q3Frame( this );
+ pageGeneral = new QFrame( this );
tab->addTab( pageGeneral, i18n( "General" ) );
addBoxGeneral( pageGeneral, m_resultGeneralLabel );
calcGeneral( m_resultGeneralLabel );
// add Tab "All"
- pageAll = new Q3Frame( this );
+ pageAll = new QFrame( this );
tab->addTab( pageAll, i18n( "Text" ) );
addBox( pageAll, m_resultLabelAll, true );
m_canceled = true;
- pageSelected = new Q3Frame( this );
+ pageSelected = new QFrame( this );
tab->addTab( pageSelected, i18n( "Selected Text" ) );
// let's see if there's selected text
bool b = docHasSelection();
@@ -230,7 +230,7 @@
return flesch_score;
}
-void KWStatisticsDialog::addBoxGeneral( Q3Frame *page, QLabel **resultLabel )
+void KWStatisticsDialog::addBoxGeneral( QFrame *page, QLabel **resultLabel )
{
// Layout Managers
Q3VBoxLayout *topLayout = new Q3VBoxLayout( page, 0, 7 );
@@ -278,7 +278,7 @@
topLayout->addWidget( box );
}
-void KWStatisticsDialog::addBox( Q3Frame *page, QLabel **resultLabel, bool calcWithFootNoteCheckbox )
+void KWStatisticsDialog::addBox( QFrame *page, QLabel **resultLabel, bool calcWithFootNoteCheckbox )
{
// Layout Managers
Q3VBoxLayout *topLayout = new Q3VBoxLayout( page, 0, 7 );
--- trunk/koffice/kword/KWStatisticsDialog.h #593872:593873
@@ -27,7 +27,7 @@
//Added by qt3to4:
#include <Q3VBoxLayout>
#include <QLabel>
-#include <Q3Frame>
+#include <QFrame>
#include <defs.h>
#include <kdialog.h>
@@ -51,8 +51,8 @@
QLabel *m_resultLabelSelected[7];
QLabel *m_resultGeneralLabel[6];
- void addBox( Q3Frame *page, QLabel **resultLabel, bool calcWithFootNoteCheckbox );
- void addBoxGeneral( Q3Frame *page, QLabel **resultLabel );
+ void addBox( QFrame *page, QLabel **resultLabel, bool calcWithFootNoteCheckbox );
+ void addBoxGeneral( QFrame *page, QLabel **resultLabel );
bool calcStats( QLabel **resultLabel, bool selection, bool useFootEndNote );
void calcGeneral( QLabel **resultLabel );
--- trunk/koffice/kword/KWTableStyleManager.h #593872:593873
@@ -28,7 +28,7 @@
#include <q3ptrlist.h>
//Added by qt3to4:
#include <Q3GridLayout>
-#include <Q3Frame>
+#include <QFrame>
class Q3GridLayout;
@@ -36,7 +36,6 @@
class Q3ListBox;
class QPushButton;
class QWidget;
-class Q3Frame;
class QComboBox;
class KWDocument;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic