From 35cfeb1230c22ee3bd7d14617ebf4fa62ed93534 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 1 Feb 2013 15:00:05 -0600
Subject: Rename a number of classes to enhance compatibility with KDE4

---
 src/optiondialog.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/optiondialog.cpp')

diff --git a/src/optiondialog.cpp b/src/optiondialog.cpp
index be84a9b..f4448fa 100644
--- a/src/optiondialog.cpp
+++ b/src/optiondialog.cpp
@@ -35,7 +35,7 @@
 
 #include <kapplication.h>
 #include <kcolorbtn.h>
-#include <kfontdialog.h> // For KFontChooser
+#include <kfontdialog.h> // For TDEFontChooser
 #include <kiconloader.h>
 #include <klocale.h>
 #include <tdeconfig.h>
@@ -168,11 +168,11 @@ typedef OptionT<TQPoint> OptionPoint;
 typedef OptionT<TQSize> OptionSize;
 typedef OptionT<TQStringList> OptionStringList;
 
-class OptionFontChooser : public KFontChooser, public OptionItem
+class OptionFontChooser : public TDEFontChooser, public OptionItem
 {
 public:
    OptionFontChooser( const TQFont& defaultVal, const TQString& saveName, TQFont* pbVar, TQWidget* pParent, OptionDialog* pOD )
-   :KFontChooser( pParent,"font",true/*onlyFixed*/,TQStringList(),false,6 ),
+   :TDEFontChooser( pParent,"font",true/*onlyFixed*/,TQStringList(),false,6 ),
     OptionItem( pOD, saveName )
    {
       m_pbVar = pbVar;
@@ -494,7 +494,7 @@ void OptionDialog::setupOtherOptions()
    new OptionToggleAction( true,  "Show Toolbar", &m_bShowToolBar, this );
    new OptionToggleAction( true,  "Show Statusbar", &m_bShowStatusBar, this );
 
-   new OptionNum( (int)KToolBar::Top, "ToolBarPos", &m_toolBarPos, this );
+   new OptionNum( (int)TDEToolBar::Top, "ToolBarPos", &m_toolBarPos, this );
    new OptionSize( TQSize(600,400),"Geometry", &m_geometry, this );
    new OptionPoint( TQPoint(0,22), "Position", &m_position, this );
    new OptionToggleAction( false, "WindowStateMaximised", &m_bMaximised, this );
@@ -1540,7 +1540,7 @@ void OptionDialog::setupKeysPage( void )
    //                          BarIcon("fonts", KIcon::SizeMedium ) );
 
    //TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() );
-    //           new KFontChooser( page,"font",false/*onlyFixed*/,TQStringList(),false,6 );
+    //           new TDEFontChooser( page,"font",false/*onlyFixed*/,TQStringList(),false,6 );
    //m_pKeyDialog=new KKeyDialog( false, 0 );
    //topLayout->addWidget( m_pKeyDialog );
 }
-- 
cgit v1.2.3