diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-07-31 19:51:49 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-07-31 19:51:49 +0000 |
| commit | 4ae0c208b66e0f7954e194384464fe2d0a2c56dd (patch) | |
| tree | b0a7cd1c184f0003c0292eb416ed27f674f9cc43 /kompare/libdialogpages/viewsettings.cpp | |
| parent | 1964ea0fb4ab57493ca2ebb709c8d3b5395fd653 (diff) | |
| download | tdesdk-4ae0c208b66e0f7954e194384464fe2d0a2c56dd.tar.gz tdesdk-4ae0c208b66e0f7954e194384464fe2d0a2c56dd.zip | |
Trinity Qt initial conversion
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1157652 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kompare/libdialogpages/viewsettings.cpp')
| -rw-r--r-- | kompare/libdialogpages/viewsettings.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/kompare/libdialogpages/viewsettings.cpp b/kompare/libdialogpages/viewsettings.cpp index c55dd40e..403746b1 100644 --- a/kompare/libdialogpages/viewsettings.cpp +++ b/kompare/libdialogpages/viewsettings.cpp @@ -17,7 +17,7 @@ ** ***************************************************************************/ -#include <qfont.h> +#include <tqfont.h> #include <kconfig.h> #include <kglobalsettings.h> @@ -26,12 +26,12 @@ using namespace Diff2; -const QColor ViewSettings::default_removeColor (190, 237, 190); -const QColor ViewSettings::default_changeColor (237, 190, 190); -const QColor ViewSettings::default_addColor (190, 190, 237); -const QColor ViewSettings::default_appliedColor(237, 237, 190); +const TQColor ViewSettings::default_removeColor (190, 237, 190); +const TQColor ViewSettings::default_changeColor (237, 190, 190); +const TQColor ViewSettings::default_addColor (190, 190, 237); +const TQColor ViewSettings::default_appliedColor(237, 237, 190); -ViewSettings::ViewSettings( QWidget* parent ) +ViewSettings::ViewSettings( TQWidget* parent ) : SettingsBase( parent ), m_removeColor( 0, 0, 0 ), m_changeColor( 0, 0, 0), @@ -56,7 +56,7 @@ void ViewSettings::loadSettings( KConfig* config ) m_scrollNoOfLines = cfg.readNumEntry ( "ScrollNoOfLines", 3 ); m_tabToNumberOfSpaces = cfg.readNumEntry ( "TabToNumberOfSpaces", 4 ); - QFont stdFixed = KGlobalSettings::fixedFont(); + TQFont stdFixed = KGlobalSettings::fixedFont(); stdFixed.setPointSize( 10 ); m_font = cfg.readFontEntry ( "TextFont", &stdFixed ); } @@ -74,10 +74,10 @@ void ViewSettings::saveSettings( KConfig* config ) cfg.writeEntry( "TextFont", m_font ); } -QColor ViewSettings::colorForDifferenceType( int type, bool selected, bool applied ) +TQColor ViewSettings::colorForDifferenceType( int type, bool selected, bool applied ) { // FIXME: does not belong here - QColor color; + TQColor color; if( applied ) color = m_appliedColor; else |