summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/tinykate/libkate/view/kateviewdialog.cpp2
-rw-r--r--noncore/apps/tinykate/libkate/view/kateviewdialog.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/noncore/apps/tinykate/libkate/view/kateviewdialog.cpp b/noncore/apps/tinykate/libkate/view/kateviewdialog.cpp
index 4cb13e8..bd5b74f 100644
--- a/noncore/apps/tinykate/libkate/view/kateviewdialog.cpp
+++ b/noncore/apps/tinykate/libkate/view/kateviewdialog.cpp
@@ -511,49 +511,49 @@ ColorConfig::~ColorConfig()
}
void ColorConfig::setColors(QColor *colors)
{
m_back->setColor( colors[0] );
m_selected->setColor( colors[1] );
}
void ColorConfig::getColors(QColor *colors)
{
colors[0] = m_back->color();
colors[1] = m_selected->color();
}
FontConfig::FontConfig( QWidget *parent, char *name )
: QWidget( parent, name )
{
// sizemanagment
QGridLayout *grid = new QGridLayout( this, 1, 1 );
// QString familyStr = cfg. readEntry ( "FontFamily", "Helvetica" );
// QString styleStr = cfg. readEntry ( "FontStyle", "Regular" );
// int size = cfg. readNumEntry ( "FontSize", 10 );
// OFontSelector *m_fontselect;
- m_fontselect = new OFontSelector ( false, this, "FontTab" );
+ m_fontselect = new Opie::OFontSelector ( false, this, "FontTab" );
// m_fontselect-> setSelectedFont ( familyStr, styleStr, size );
// QWhatsThis::add( m_fontselect,
// tr( "Select the desired name, style and size of the default font applications will use." ) );
connect( m_fontselect, SIGNAL( fontSelected ( const QFont & )),
this, SLOT( slotFontSelected( const QFont & )));
grid->addWidget( m_fontselect, 0, 0);
// #if 0
// m_fontchooser = new KFontChooser ( this );
// m_fontchooser->enableColumn(KFontChooser::StyleList, false);
// grid->addWidget( m_fontchooser, 0, 0);
// connect (m_fontchooser, SIGNAL (fontSelected( const QFont & )), this, SLOT (slotFontSelected( const QFont & )));
// #endif
}
FontConfig::~FontConfig()
{
}
void FontConfig::setFont ( const QFont &font )
{
diff --git a/noncore/apps/tinykate/libkate/view/kateviewdialog.h b/noncore/apps/tinykate/libkate/view/kateviewdialog.h
index 2ce5a11..98d8799 100644
--- a/noncore/apps/tinykate/libkate/view/kateviewdialog.h
+++ b/noncore/apps/tinykate/libkate/view/kateviewdialog.h
@@ -10,49 +10,49 @@
/***************************************************************************
* *
* 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 option) any later version. *
* *
***************************************************************************/
// Dialogs
#ifndef _KWDIALOG_H_
#define _KWDIALOG_H_
class QCheckBox;
class QLineEdit;
class QPushButton;
class QRadioButton;
class QSpinBox;
class KColorButton;
class QComboBox;
#include <kdialogbase.h>
-#include <opie/ofontselector.h>
+#include <opie2/ofontselector.h>
#include "kateview.h"
class SearchDialog : public KDialogBase
{
Q_OBJECT
public:
SearchDialog( QWidget *parent, QStringList &searchFor, QStringList &replaceWith, int flags );
QString getSearchFor();
QString getReplaceWith();
int getFlags();
void setSearchText( const QString &searchstr );
protected slots:
void slotOk();
protected:
QComboBox *m_search;
QComboBox *m_replace;
QCheckBox *m_opt1;
QCheckBox *m_opt2;
QCheckBox *m_opt3;
QCheckBox *m_optRegExp;
QCheckBox *m_opt4;
@@ -163,34 +163,34 @@ public:
~ColorConfig();
void setColors( QColor * );
void getColors( QColor * );
private:
KColorButton *m_back;
KColorButton *m_selected;
};
class FontConfig : public QWidget
{
Q_OBJECT
public:
FontConfig( QWidget *parent = 0, char *name = 0 );
~FontConfig();
void setFont ( const QFont &font );
QFont getFont ( ) { return myFont; };
private:
- OFontSelector *m_fontselect;
+ Opie::OFontSelector *m_fontselect;
// class KFontChooser *m_fontchooser;
QFont myFont;
private slots:
void slotFontSelected( const QFont &font );
};
#endif //_KWDIALOG_H_