Rename a number of classes to enhance compatibility with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent 088cc453ec
commit ee52bb567f

@ -234,7 +234,7 @@ void blinken::keyPressEvent(TQKeyEvent *e)
}
else
{
KShortcut ks(e -> key());
TDEShortcut ks(e -> key());
if (!ks.toString().isEmpty())
{
bool different = true;

@ -16,7 +16,7 @@
class TQTimer;
class KAction;
class TDEAction;
class KHelpMenu;
class button;

@ -66,7 +66,7 @@ void button::setShortcut(int key)
TQString button::shortcut() const
{
return KShortcut(m_key).toString();
return TDEShortcut(m_key).toString();
}
int button::key() const

@ -14,9 +14,9 @@
#include "blinkengame.h"
class KAction;
class KActionCollection;
class KShortcut;
class TDEAction;
class TDEActionCollection;
class TDEShortcut;
class button
{

@ -65,7 +65,7 @@ DetailedInfoDlg::DetailedInfoDlg( Element *el , TQWidget *parent, const char *na
// setting the element
createContent();
m_actionCollection = new KActionCollection(this);
m_actionCollection = new TDEActionCollection(this);
KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotClose()), m_actionCollection);
setButtonTip( User2, i18n( "Goes to the previous element" ) );

@ -29,7 +29,7 @@ class TQMouseEvent;
class TQFrame;
class TQLabel;
class TQVBoxLayout;
class KActionCollection;
class TDEActionCollection;
class TDEHTMLPart;
/**
@ -57,7 +57,7 @@ class DetailedInfoDlg : public KDialogBase
Element *m_element;
int m_elementNumber;
KActionCollection* m_actionCollection;
TDEActionCollection* m_actionCollection;
SpectrumViewImpl *m_spectrumview;

@ -68,7 +68,7 @@ ElementDataViewer::ElementDataViewer( TQWidget *parent, const char* name )
setButtonText( User1, i18n("&Plot") );
m_actionCollection = new KActionCollection(this);
m_actionCollection = new TDEActionCollection(this);
KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotClose()), m_actionCollection);
connect ( m_pPlotSetupWidget->KCB_y, TQT_SIGNAL( activated(int) ),

@ -22,7 +22,7 @@ class Element;
class KalziumDataObject;
class PlotSetupWidget;
class PlotWidget;
class KActionCollection;
class TDEActionCollection;
/**
* @short the values of the y-Axis
@ -135,7 +135,7 @@ class ElementDataViewer : public KDialogBase
TQStringList names;
KActionCollection* m_actionCollection;
TDEActionCollection* m_actionCollection;
void initData();
void setupAxisData();

@ -56,7 +56,7 @@
#define IDS_ELEMENTINFO 7
Kalzium::Kalzium()
: KMainWindow( 0, "Kalzium" )
: TDEMainWindow( 0, "Kalzium" )
{
// reading the elements from file
KalziumDataObject::instance();
@ -107,14 +107,14 @@ Kalzium::Kalzium()
void Kalzium::setupActions()
{
m_actionNoScheme = new KToggleAction(i18n("&No Color Scheme"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotNoLook()), actionCollection(), "view_look_noscheme");
m_actionNoScheme = new TDEToggleAction(i18n("&No Color Scheme"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotNoLook()), actionCollection(), "view_look_noscheme");
// the actions for the color schemes
m_actionGroups = new KToggleAction(i18n("Show &Groups"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotLookGroups()), actionCollection(), "view_look_groups");
m_actionBlocks = new KToggleAction(i18n("Show &Blocks"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotLookBlocks()), actionCollection(), "view_look_blocks");
m_actionAcid = new KToggleAction(i18n("Show &Acid Behavior"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotLookAcidBehavior()), actionCollection(), "view_look_acid");
m_actionFamily = new KToggleAction(i18n("Show &Family"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotLookFamily()), actionCollection(), "view_look_family");
m_actionCrystal = new KToggleAction(i18n("Show &Crystal Structures"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotLookCrystal()), actionCollection(), "view_look_crystal");
m_actionGroups = new TDEToggleAction(i18n("Show &Groups"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotLookGroups()), actionCollection(), "view_look_groups");
m_actionBlocks = new TDEToggleAction(i18n("Show &Blocks"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotLookBlocks()), actionCollection(), "view_look_blocks");
m_actionAcid = new TDEToggleAction(i18n("Show &Acid Behavior"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotLookAcidBehavior()), actionCollection(), "view_look_acid");
m_actionFamily = new TDEToggleAction(i18n("Show &Family"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotLookFamily()), actionCollection(), "view_look_family");
m_actionCrystal = new TDEToggleAction(i18n("Show &Crystal Structures"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotLookCrystal()), actionCollection(), "view_look_crystal");
//the actions for switching PerodicTableView
TQStringList gradientlist;
@ -127,7 +127,7 @@ void Kalzium::setupActions()
gradientlist.append(i18n("Melting Point"));
gradientlist.append(i18n("Electronegativity"));
gradientlist.append(i18n("Electron Affinity"));
gradient_action = new KSelectAction(i18n("&Gradient"), 0, TQT_TQOBJECT(this), 0, actionCollection(), "view_look_gradmenu");
gradient_action = new TDESelectAction(i18n("&Gradient"), 0, TQT_TQOBJECT(this), 0, actionCollection(), "view_look_gradmenu");
gradient_action->setItems(gradientlist);
connect (gradient_action, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotSwitchtoGradient(int)));
@ -137,24 +137,24 @@ void Kalzium::setupActions()
numlist.append(i18n("Show &IUPAC"));
numlist.append(i18n("Show &CAS"));
numlist.append(i18n("Show &Old IUPAC"));
numeration_action = new KSelectAction (i18n("&Numeration"), 0, TQT_TQOBJECT(this), 0, actionCollection(), "view_numerationtype");
numeration_action = new TDESelectAction (i18n("&Numeration"), 0, TQT_TQOBJECT(this), 0, actionCollection(), "view_numerationtype");
numeration_action->setItems(numlist);
numeration_action->setCurrentItem(Prefs::numeration());
connect (numeration_action, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotSwitchtoNumeration(int)));
m_SidebarAction = new KAction(i18n("Show &Sidebar"), "sidebar", 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowHideSidebar()), actionCollection(), "view_sidebar");
m_SidebarAction = new TDEAction(i18n("Show &Sidebar"), "sidebar", 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowHideSidebar()), actionCollection(), "view_sidebar");
#ifdef HAVE_FACILE
m_EQSolverAction = new KAction(i18n("&Equation Solver..."), "eqchem", 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowEQSolver()), actionCollection(), "tools_eqsolver");
m_EQSolverAction = new TDEAction(i18n("&Equation Solver..."), "eqchem", 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowEQSolver()), actionCollection(), "tools_eqsolver");
#endif
// tools actions
m_pPlotAction = new KAction(i18n("&Plot Data..."), "plot", 0, TQT_TQOBJECT(this), TQT_SLOT(slotPlotData()), actionCollection(), "tools_plotdata");
m_pGlossaryAction = new KAction(i18n("&Glossary..."), "glossary", 0, TQT_TQOBJECT(this), TQT_SLOT(slotGlossary()), actionCollection(), "tools_glossary");
m_pPlotAction = new TDEAction(i18n("&Plot Data..."), "plot", 0, TQT_TQOBJECT(this), TQT_SLOT(slotPlotData()), actionCollection(), "tools_plotdata");
m_pGlossaryAction = new TDEAction(i18n("&Glossary..."), "glossary", 0, TQT_TQOBJECT(this), TQT_SLOT(slotGlossary()), actionCollection(), "tools_glossary");
// other period view options
m_pLegendAction = new KAction(i18n("Show &Legend"), "legend", 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowLegend()), actionCollection(), "view_legend");
m_pTooltipAction = new KAction(i18n("Show &Tooltip"), "tooltip", 0, TQT_TQOBJECT(this), TQT_SLOT(slotEnableTooltips()), actionCollection(), "view_tooltip");
m_pLegendAction = new TDEAction(i18n("Show &Legend"), "legend", 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowLegend()), actionCollection(), "view_legend");
m_pTooltipAction = new TDEAction(i18n("Show &Tooltip"), "tooltip", 0, TQT_TQOBJECT(this), TQT_SLOT(slotEnableTooltips()), actionCollection(), "view_tooltip");
// the standard actions
KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(showSettingsDialog()), actionCollection());

@ -19,8 +19,8 @@
#include <kmainwindow.h>
class KSelectAction;
class KToggleAction;
class TDESelectAction;
class TDEToggleAction;
class QuizsettingsDlg;
class SliderWidget;
class TQToolBox;
@ -43,7 +43,7 @@ class GlossaryDialog;
* This class connects the parts of kalzium. All actions will
* be set, the menu generated and so on.
*/
class Kalzium : public KMainWindow
class Kalzium : public TDEMainWindow
{
Q_OBJECT
@ -86,24 +86,24 @@ class Kalzium : public KMainWindow
void setFullDraw();
/**
* all KActions Kalzium uses
* all TDEActions Kalzium uses
*/
KSelectAction *gradient_action;
KSelectAction *numeration_action;
KAction *m_pPlotAction,
TDESelectAction *gradient_action;
TDESelectAction *numeration_action;
TDEAction *m_pPlotAction,
*m_pGlossaryAction;
KAction *m_pTooltipAction;
KAction *m_pLegendAction;
KAction *m_SidebarAction;
KAction *m_EQSolverAction;
KToggleAction *m_actionNoScheme;
KToggleAction *m_actionGroups;
KToggleAction *m_actionBlocks;
KToggleAction *m_actionAcid;
KToggleAction *m_actionFamily;
KToggleAction *m_actionCrystal;
TDEAction *m_pTooltipAction;
TDEAction *m_pLegendAction;
TDEAction *m_SidebarAction;
TDEAction *m_EQSolverAction;
TDEToggleAction *m_actionNoScheme;
TDEToggleAction *m_actionGroups;
TDEToggleAction *m_actionBlocks;
TDEToggleAction *m_actionAcid;
TDEToggleAction *m_actionFamily;
TDEToggleAction *m_actionCrystal;
/**
* the layout of the central Widget ( CentralWidget )

@ -24,7 +24,7 @@
#include "moleculeparser.h"
class KToggleAction;
class TDEToggleAction;
class KLineEdit;
class Element;

@ -36,7 +36,7 @@
* added program icon
* added KHelpMenu as KPopupMenu to the help button in the main window
* added KHelpMenu as TDEPopupMenu to the help button in the main window
* added section main window to the handbook

@ -55,7 +55,7 @@ MainQtWidget::MainQtWidget()
// get the settings
readOptions();
// creating KActions, used by the kbruchui.rc file
// creating TDEActions, used by the kbruchui.rc file
setupActions();
createGUI(0L);
@ -154,7 +154,7 @@ void MainQtWidget::writeOptions()
void MainQtWidget::setupActions()
{
// new task action
m_NewTaskAction = new KAction(i18n("&New"), "filenew", KStdAccel::shortcut(KStdAccel::New),
m_NewTaskAction = new TDEAction(i18n("&New"), "filenew", TDEStdAccel::shortcut(TDEStdAccel::New),
TQT_TQOBJECT(this), TQT_SLOT(NewTask()),
actionCollection(), "NewTask");

@ -37,7 +37,7 @@ class TaskView;
* \author Sebastian Stein
* \author Eva Brucherseifer
**/
class MainQtWidget : public KMainWindow
class MainQtWidget : public TDEMainWindow
{
Q_OBJECT
@ -100,7 +100,7 @@ class MainQtWidget : public KMainWindow
KWidgetAction * m_OperationBoxAction;
KWidgetAction * m_OperationLabelAction;
KAction * m_NewTaskAction;
TDEAction * m_NewTaskAction;
private slots:
/**

@ -24,7 +24,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="KFontChooser">
<widget class="TDEFontChooser">
<property name="name">
<cstring>kcfg_taskFont</cstring>
</property>

@ -24,7 +24,7 @@
KCheckEduca::KCheckEduca(TQWidget *parent, const char *name ) : TQCheckBox(parent,name)
{
_doc = 0;
KAcceleratorManager::setNoAccel( this );
TDEAcceleratorManager::setNoAccel( this );
}
KCheckEduca::~KCheckEduca()

@ -64,7 +64,7 @@ Keduca::~Keduca()
void Keduca::setupActions()
{
KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT( slotFileOpen() ), actionCollection() );
(void)new KAction( i18n( "Open &Gallery..." ), 0, 0, TQT_TQOBJECT(this), TQT_SLOT( slotGallery() ),
(void)new TDEAction( i18n( "Open &Gallery..." ), 0, 0, TQT_TQOBJECT(this), TQT_SLOT( slotGallery() ),
actionCollection(), "open_gallery" );
_recentFiles = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT ( slotFileOpenURL(const KURL &) ),
actionCollection());

@ -57,7 +57,7 @@ private:
// Private attributes
/** Recent files */
KRecentFilesAction *_recentFiles;
TDERecentFilesAction *_recentFiles;
/** A KEDUCA file main view */
KParts::ReadOnlyPart *_part;

@ -75,7 +75,7 @@ class KEducaPart : public KParts::ReadOnlyPart
private:
/*
* Sets the KActions for this part.
* Sets the TDEActions for this part.
*/
void setupActions();

@ -48,7 +48,7 @@ void KGroupEduca::insertAnswer( const TQString& text)
switch( _typeMode )
{
case Radio:
answer = new KRadioEduca( _vbox2 );
answer = new TDERadioEduca( _vbox2 );
break;
case Check:
answer = new KCheckEduca( _vbox2 );
@ -87,7 +87,7 @@ bool KGroupEduca::isChecked(int id)
{
case Radio:
{
KRadioEduca *tmpRadioButton = (KRadioEduca*) find(id);
TDERadioEduca *tmpRadioButton = (TDERadioEduca*) find(id);
if(tmpRadioButton != 0) return tmpRadioButton->isChecked();
}
break;

@ -20,19 +20,19 @@
#include <tqstyle.h>
#include <kaccelmanager.h>
KRadioEduca::KRadioEduca(TQWidget *parent, const char *name) : TQRadioButton(parent,name)
TDERadioEduca::TDERadioEduca(TQWidget *parent, const char *name) : TQRadioButton(parent,name)
{
_doc=0;
KAcceleratorManager::setNoAccel(this);
TDEAcceleratorManager::setNoAccel(this);
}
KRadioEduca::~KRadioEduca()
TDERadioEduca::~TDERadioEduca()
{
delete _doc;
}
/** reimpl */
void KRadioEduca::drawButtonLabel( TQPainter *p)
void TDERadioEduca::drawButtonLabel( TQPainter *p)
{
int x, y, w, h;
int extra_width, indicator_width;

@ -25,13 +25,13 @@
/**TQRadioButton with wordwrap and richtext features
*@author Javier Campos Morales
*/
class KRadioEduca : public TQRadioButton {
class TDERadioEduca : public TQRadioButton {
Q_OBJECT
public:
KRadioEduca(TQWidget *parent=0, const char *name=0);
~KRadioEduca();
TDERadioEduca(TQWidget *parent=0, const char *name=0);
~TDERadioEduca();
protected:

@ -636,7 +636,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="KListView">
<widget class="TDEListView">
<column>
<property name="text">
<string>Answer</string>

@ -61,7 +61,7 @@ static const char* const keducabuilder_data[] = {
"..............."};
KEducaBuilder::KEducaBuilder(TQWidget* parent, const char *name, WFlags f )
: KMainWindow(parent,name,f),
: TDEMainWindow(parent,name,f),
_nativeFormat("application/x-edu")
{
_keducaFile = new FileRead();
@ -90,7 +90,7 @@ void KEducaBuilder::init()
_split = new TQSplitter( mainView );
_split->setOrientation( Qt::Vertical );
_listAnswer = new KListBox( _split, "_listAnswer" );
_listAnswer = new TDEListBox( _split, "_listAnswer" );
_listAnswer->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, _listAnswer->sizePolicy().hasHeightForWidth() ) );
connect( _listAnswer, TQT_SIGNAL( highlighted(TQListBoxItem *) ), TQT_TQOBJECT(this), TQT_SLOT( slotPreview(TQListBoxItem *) ) );
connect( _listAnswer, TQT_SIGNAL( doubleClicked(TQListBoxItem *) ), TQT_TQOBJECT(this), TQT_SLOT( slotEditbyList(TQListBoxItem *) ) );
@ -113,19 +113,19 @@ void KEducaBuilder::initMenuBar()
{
KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT( slotFileOpenNew() ), actionCollection());
KStdAction::open (TQT_TQOBJECT(this), TQT_SLOT( slotFileOpen() ), actionCollection());
(void)new KAction(i18n("Open &Gallery..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT( slotGallery() ), actionCollection(), "open_gallery");
(void)new TDEAction(i18n("Open &Gallery..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT( slotGallery() ), actionCollection(), "open_gallery");
_recentFiles = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT ( slotFileOpenURL(const KURL &)), actionCollection());
KStdAction::save (TQT_TQOBJECT(this), TQT_SLOT( slotFileSave() ), actionCollection());
KStdAction::saveAs (TQT_TQOBJECT(this), TQT_SLOT( slotFileSaveAs() ), actionCollection());
KStdAction::print (TQT_TQOBJECT(this), TQT_SLOT( slotFilePrint() ), actionCollection());
(void)new KAction(i18n("Document Info"), "info", 0, TQT_TQOBJECT(this), TQT_SLOT( slotHeader() ), actionCollection(), "info_doc");
(void)new TDEAction(i18n("Document Info"), "info", 0, TQT_TQOBJECT(this), TQT_SLOT( slotHeader() ), actionCollection(), "info_doc");
KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection());
(void)new KAction(i18n("&Add..."), "addquestion", 0, TQT_TQOBJECT(this), TQT_SLOT( slotAdd() ), actionCollection(), "question_add");
(void)new KAction(i18n("&Edit..."), "editquestion", 0, TQT_TQOBJECT(this), TQT_SLOT( slotEdit() ), actionCollection(), "question_edit");
(void)new KAction(i18n("&Remove"), "delquestion", 0, TQT_TQOBJECT(this), TQT_SLOT( slotRemove() ), actionCollection(), "question_remove");
(void)new KAction(i18n("&Up"), "up", 0, TQT_TQOBJECT(this), TQT_SLOT( slotUp() ), actionCollection(), "question_up");
(void)new KAction(i18n("&Down"), "down", 0, TQT_TQOBJECT(this), TQT_SLOT( slotDown() ), actionCollection(), "question_down");
(void)new TDEAction(i18n("&Add..."), "addquestion", 0, TQT_TQOBJECT(this), TQT_SLOT( slotAdd() ), actionCollection(), "question_add");
(void)new TDEAction(i18n("&Edit..."), "editquestion", 0, TQT_TQOBJECT(this), TQT_SLOT( slotEdit() ), actionCollection(), "question_edit");
(void)new TDEAction(i18n("&Remove"), "delquestion", 0, TQT_TQOBJECT(this), TQT_SLOT( slotRemove() ), actionCollection(), "question_remove");
(void)new TDEAction(i18n("&Up"), "up", 0, TQT_TQOBJECT(this), TQT_SLOT( slotUp() ), actionCollection(), "question_up");
(void)new TDEAction(i18n("&Down"), "down", 0, TQT_TQOBJECT(this), TQT_SLOT( slotDown() ), actionCollection(), "question_down");
}
/** Delete current document and start new */

@ -34,7 +34,7 @@
*@author Javier Campos
*/
class KEducaBuilder : public KMainWindow {
class KEducaBuilder : public TDEMainWindow {
Q_OBJECT
@ -76,9 +76,9 @@ private:
/** KEDUCA file */
FileRead *_keducaFile;
/** Recent files */
KRecentFilesAction *_recentFiles;
TDERecentFilesAction *_recentFiles;
/** List of answers */
KListBox *_listAnswer;
TDEListBox *_listAnswer;
/** Preview */
TQTextView *_preview;
/** Main splitter */

@ -40,7 +40,7 @@ boxAsker::boxAsker(TQWidget *parent, KGmap *m, TQWidget *w, uint count) : askWid
p_lay -> addWidget(p_label);
p_lay -> addWidget(bg, 1);
p_lay -> addWidget(p_accept);
KAcceleratorManager::setNoAccel(this);
TDEAcceleratorManager::setNoAccel(this);
}
boxAsker::~boxAsker()

@ -36,7 +36,7 @@
#include "mapparser.h"
#include "map.h"
kgeography::kgeography() : KMainWindow(), p_firstShow(true), p_mustShowResultsDialog(false)
kgeography::kgeography() : TDEMainWindow(), p_firstShow(true), p_mustShowResultsDialog(false)
{
p_map = 0;
p_askWidget = 0;
@ -72,20 +72,20 @@ kgeography::kgeography() : KMainWindow(), p_firstShow(true), p_mustShowResultsDi
connect(p_askFlagDivisions, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(askFlagDivisions()));
connect(p_askDivisionFlags, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(askDivisionFlags()));
KAction *a = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(openMap()), actionCollection(), "openMap");
TDEAction *a = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(openMap()), actionCollection(), "openMap");
a -> setText(i18n("&Open Map..."));
KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection(), "quit");
p_zoom = new KToggleAction(i18n("&Zoom"), "viewmagfit", 0, 0, 0, actionCollection(), "zoom_select");
p_zoom = new TDEToggleAction(i18n("&Zoom"), "viewmagfit", 0, 0, 0, actionCollection(), "zoom_select");
p_zoom -> setEnabled(false);
p_zoomOriginal = new KAction(i18n("&Original Size"), "viewmag1", 0, 0, 0, actionCollection(), "zoom_original");
p_zoomOriginal = new TDEAction(i18n("&Original Size"), "viewmag1", 0, 0, 0, actionCollection(), "zoom_original");
p_zoomOriginal -> setEnabled(false);
p_move = new KToggleAction(i18n("&Move"), "move", 0, 0, 0, actionCollection(), "move");
p_move = new TDEToggleAction(i18n("&Move"), "move", 0, 0, 0, actionCollection(), "move");
p_move -> setEnabled(false);
new KAction(i18n("Disclaimer"), 0, TQT_TQOBJECT(this), TQT_SLOT(disclaimer()), actionCollection(), "disclaimer");
new TDEAction(i18n("Disclaimer"), 0, TQT_TQOBJECT(this), TQT_SLOT(disclaimer()), actionCollection(), "disclaimer");
setupGUI(Keys | ToolBar | Save | Create);

@ -13,9 +13,9 @@
#include <kmainwindow.h>
class KAction;
class TDEAction;
class KPushButton;
class KToggleAction;
class TDEToggleAction;
class TQHBox;
class TQLabel;
@ -24,7 +24,7 @@ class TQVBox;
class KGmap;
class askWidget;
class kgeography : public KMainWindow
class kgeography : public TDEMainWindow
{
Q_OBJECT
@ -64,8 +64,8 @@ Q_OBJECT
KPushButton *p_askMap;
KPushButton *p_askFlagDivisions;
KPushButton *p_askDivisionFlags;
KToggleAction *p_zoom, *p_move;
KAction *p_zoomOriginal;
TDEToggleAction *p_zoom, *p_move;
TDEAction *p_zoomOriginal;
TQLabel *p_currentMap;
KGmap *p_map;

@ -45,7 +45,7 @@
KHangMan::KHangMan()
: KMainWindow( 0, "KHangMan" ),
: TDEMainWindow( 0, "KHangMan" ),
m_view(new KHangManView(this))
{
m_newStuff = 0;
@ -57,7 +57,7 @@ KHangMan::KHangMan()
// Toolbar for special characters
secondToolbar = toolBar("secondToolBar");
secondToolbar->setBarPos(KToolBar::Bottom);
secondToolbar->setBarPos(TDEToolBar::Bottom);
loadSettings();
setAccent();
loadLangToolBar();
@ -74,21 +74,21 @@ KHangMan::~KHangMan()
void KHangMan::setupActions()
{
// Game->New
KAction *action = new KAction(i18n("&New"), "filenew", CTRL+Key_N , TQT_TQOBJECT(m_view), TQT_SLOT(slotNewGame()), actionCollection(), "file_new");
TDEAction *action = new TDEAction(i18n("&New"), "filenew", CTRL+Key_N , TQT_TQOBJECT(m_view), TQT_SLOT(slotNewGame()), actionCollection(), "file_new");
action->setToolTip(i18n( "Play with a new word" ));
// Game->Get Words in New Language
new KAction( i18n("&Get Words in New Language..."), "knewstuff", CTRL+Key_G, TQT_TQOBJECT(this), TQT_SLOT( slotDownloadNewStuff() ), actionCollection(), "downloadnewstuff" );
new TDEAction( i18n("&Get Words in New Language..."), "knewstuff", CTRL+Key_G, TQT_TQOBJECT(this), TQT_SLOT( slotDownloadNewStuff() ), actionCollection(), "downloadnewstuff" );
KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actionCollection());
m_levelAction = new KSelectAction(i18n("Le&vel"), 0, actionCollection(), "combo_level");
m_levelAction = new TDESelectAction(i18n("Le&vel"), 0, actionCollection(), "combo_level");
m_levelAction->setToolTip(i18n( "Choose the level" ));
m_levelAction->setWhatsThis(i18n( "Choose the level of difficulty" ));
connect(m_levelAction, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotChangeLevel(int)));
// Action for selecting language.
m_languageAction = new KSelectAction(i18n("&Language"), 0, actionCollection(), "languages");
m_languageAction = new TDESelectAction(i18n("&Language"), 0, actionCollection(), "languages");
m_languageAction->setItems(m_languageNames);
m_languageAction->setCurrentItem(m_languages.findIndex(Prefs::selectedLanguage()));
connect(m_languageAction, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotChangeLanguage(int)));
@ -97,7 +97,7 @@ void KHangMan::setupActions()
// Mode. Currently hard coded into Sea and Desert themes.
TQStringList modes;
m_modeAction = new KSelectAction(i18n("L&ook"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotChangeMode()), actionCollection(), "combo_mode");
m_modeAction = new TDESelectAction(i18n("L&ook"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotChangeMode()), actionCollection(), "combo_mode");
modes += i18n("&Sea Theme");
modes += i18n("&Desert Theme");
m_modeAction->setItems(modes);
@ -473,7 +473,7 @@ void KHangMan::loadLangToolBar()
void KHangMan::slotPasteChar()
{
KToolBarButton *charBut = (KToolBarButton* ) sender();
TDEToolBarButton *charBut = (TDEToolBarButton* ) sender();
m_view->enterLetter(m_allData[charBut->id()]);
}

@ -30,8 +30,8 @@
#include "khangmanview.h"
class KSelectAction;
class KToggleAction;
class TDESelectAction;
class TDEToggleAction;
class KHNewStuff;
class advanced;
@ -48,7 +48,7 @@ const int IDS_HINT = 103;
* @author Anne-Marie Mahfouf <annemarie.mahfouf@free.fr>
* @version 0.1
*/
class KHangMan : public KMainWindow
class KHangMan : public TDEMainWindow
{
Q_OBJECT
@ -71,7 +71,7 @@ public:
void changeStatusbar(const TQString& text, int id);
///Action that sets up the Language menu
KSelectAction *m_languageAction;
TDESelectAction *m_languageAction;
///Method to set the current language into the Statusbar and to pass it to KHangManView
void setLanguages();
@ -146,11 +146,11 @@ private:
KHNewStuff *m_newStuff;
// Actions in the Game menu
KSelectAction *m_levelAction;
KSelectAction *m_modeAction;
TDESelectAction *m_levelAction;
TDESelectAction *m_modeAction;
///Create the Special Characters Toolbar
KToolBar *secondToolbar;
TDEToolBar *secondToolbar;
// True if the language has no special chars, such as en, it and nl.
// FIXME: Reverse the bool. Negated bools are difficult to read.

@ -666,7 +666,7 @@
* Clean the status bar text on time in ConstructMode and
TestConstructMode.
* Make SetCoordinateSystemAction into a KSelectAction, so the user
* Make SetCoordinateSystemAction into a TDESelectAction, so the user
can see what kind of coordinate system he's currently using.
* Some tuning of the UI: move Transformations and Tests menu into

@ -51,7 +51,7 @@ Please select which to import:</string>
<property name="spacing">
<number>6</number>
</property>
<widget class="KListBox">
<widget class="TDEListBox">
<property name="name">
<cstring>FigureListBox</cstring>
</property>

@ -58,20 +58,20 @@ static bool operator<( const TQColor& a, const TQColor& b )
}
class ExporterAction
: public KAction
: public TDEAction
{
KigExporter* mexp;
const KigPart* mdoc;
KigWidget* mw;
public:
ExporterAction( const KigPart* doc, KigWidget* w,
KActionCollection* parent, KigExporter* exp );
TDEActionCollection* parent, KigExporter* exp );
void slotActivated();
};
ExporterAction::ExporterAction( const KigPart* doc, KigWidget* w,
KActionCollection* parent, KigExporter* exp )
: KAction( exp->menuEntryName(), KShortcut(), 0, 0, parent ),
TDEActionCollection* parent, KigExporter* exp )
: TDEAction( exp->menuEntryName(), TDEShortcut(), 0, 0, parent ),
mexp( exp ), mdoc( doc ), mw( w )
{
TQString iconstr = exp->menuIcon();
@ -190,10 +190,10 @@ KigExportManager::~KigExportManager()
}
void KigExportManager::addMenuAction( const KigPart* doc, KigWidget* w,
KActionCollection* coll )
TDEActionCollection* coll )
{
KActionMenu* m =
new KActionMenu( i18n( "&Export To" ), coll, "file_export" );
TDEActionMenu* m =
new TDEActionMenu( i18n( "&Export To" ), coll, "file_export" );
for ( uint i = 0; i < mexporters.size(); ++i )
m->insert( new ExporterAction( doc, w, coll, mexporters[i] ) );
}

@ -24,7 +24,7 @@ class TQString;
class KigDocument;
class KigPart;
class KigWidget;
class KActionCollection;
class TDEActionCollection;
class KigExporter;
@ -36,7 +36,7 @@ class KigExportManager
public:
static KigExportManager* instance();
void addMenuAction( const KigPart* doc, KigWidget* w,
KActionCollection* coll );
TDEActionCollection* coll );
};
/**

@ -169,7 +169,7 @@ void Kig::fileNew()
void Kig::openURL(const KURL& url)
{
// Called for opening a file by either the KRecentFilesAction or our
// Called for opening a file by either the TDERecentFilesAction or our
// own fileOpen() method.
// if we are in the "initial state", we open the url in this window:
if ( m_part->url().isEmpty() && ! m_part->isModified() )

@ -39,8 +39,8 @@
#include <tdeparts/mainwindow.h>
#include <dcopclient.h>
class KToggleAction;
class KRecentFilesAction;
class TDEToggleAction;
class TDERecentFilesAction;
/**
* This is the application "Shell". It has a menubar, toolbar, and
@ -136,10 +136,10 @@ class Kig : public KParts::MainWindow
KParts::ReadWritePart *m_part;
//#ifdef KIG_DONT_USE_NEW_KMAINWINDOW_FEATURES
KToggleAction *m_toolbarAction;
KToggleAction *m_statusbarAction;
TDEToggleAction *m_toolbarAction;
TDEToggleAction *m_statusbarAction;
//#endif
KRecentFilesAction *m_recentFilesAction;
TDERecentFilesAction *m_recentFilesAction;
TDEConfig* config;

@ -83,17 +83,17 @@ TDEAboutData* KigPart::createAboutData()
}
class SetCoordinateSystemAction
: public KSelectAction
: public TDESelectAction
{
KigPart& md;
public:
SetCoordinateSystemAction( KigPart& d, KActionCollection* parent );
SetCoordinateSystemAction( KigPart& d, TDEActionCollection* parent );
void slotActivated( int index );
};
SetCoordinateSystemAction::SetCoordinateSystemAction(
KigPart& d, KActionCollection* parent )
: KSelectAction( i18n( "&Set Coordinate System" ), 0, parent, "settings_set_coordinate_system" ),
KigPart& d, TDEActionCollection* parent )
: TDESelectAction( i18n( "&Set Coordinate System" ), 0, parent, "settings_set_coordinate_system" ),
md( d )
{
setItems( CoordinateSystemFactory::names() );
@ -218,7 +218,7 @@ void KigPart::setupActions()
this, TQT_SLOT( slotSelectAll() ), actionCollection() );
aDeselectAll = KStdAction::deselect(
this, TQT_SLOT( slotDeselectAll() ), actionCollection() );
aInvertSelection = new KAction(
aInvertSelection = new TDEAction(
i18n( "Invert Selection" ), "", 0, this,
TQT_SLOT( slotInvertSelection() ), actionCollection(),
"edit_invert_selection" );
@ -227,30 +227,30 @@ void KigPart::setupActions()
KIconLoader* l = instance()->iconLoader();
TQPixmap tmp;
aDeleteObjects = new KAction(
aDeleteObjects = new TDEAction(
i18n("&Delete Objects"), "editdelete", Key_Delete, this,
TQT_SLOT(deleteObjects()), actionCollection(), "delete_objects");
aDeleteObjects->setToolTip(i18n("Delete the selected objects"));
aCancelConstruction = new KAction(
aCancelConstruction = new TDEAction(
i18n("Cancel Construction"), "stop", Key_Escape, this,
TQT_SLOT(cancelConstruction()), actionCollection(), "cancel_construction");
aCancelConstruction->setToolTip(
i18n("Cancel the construction of the object being constructed"));
aCancelConstruction->setEnabled(false);
aShowHidden = new KAction(
aShowHidden = new TDEAction(
i18n("U&nhide All"), 0, this, TQT_SLOT( showHidden() ),
actionCollection(), "edit_unhide_all");
aShowHidden->setToolTip(i18n("Show all hidden objects"));
aShowHidden->setEnabled( true );
aNewMacro = new KAction(
aNewMacro = new TDEAction(
i18n("&New Macro..."), "gear", 0, this, TQT_SLOT(newMacro()),
actionCollection(), "macro_action");
aNewMacro->setToolTip(i18n("Define a new macro"));
aConfigureTypes = new KAction(
aConfigureTypes = new TDEAction(
i18n("Manage &Types..."), 0, this, TQT_SLOT(editTypes()),
actionCollection(), "types_edit");
aConfigureTypes->setToolTip(i18n("Manage macro types."));
@ -258,7 +258,7 @@ void KigPart::setupActions()
KigExportManager::instance()->addMenuAction( this, m_widget->realWidget(),
actionCollection() );
KAction* a = KStdAction::zoomIn( TQT_TQOBJECT(m_widget), TQT_SLOT( slotZoomIn() ),
TDEAction* a = KStdAction::zoomIn( TQT_TQOBJECT(m_widget), TQT_SLOT( slotZoomIn() ),
actionCollection() );
a->setToolTip( i18n( "Zoom in on the document" ) );
a->setWhatsThis( i18n( "Zoom in on the document" ) );
@ -284,7 +284,7 @@ void KigPart::setupActions()
a = KStdAction::fullScreen( TQT_TQOBJECT(m_widget), TQT_SLOT( toggleFullScreen() ), actionCollection(), (TQWidget*)(widget()->parent()),"fullscreen" );
#else
tmp = l->loadIcon( "window_fullscreen", KIcon::Toolbar );
a = new KAction(
a = new TDEAction(
i18n( "Full Screen" ), tmp, CTRL+SHIFT+Key_F,
m_widget, TQT_SLOT( toggleFullScreen() ),
actionCollection(), "fullscreen" );
@ -293,37 +293,37 @@ void KigPart::setupActions()
a->setWhatsThis( i18n( "View this document full-screen." ) );
// TODO: an icon for this..
a = new KAction(
a = new TDEAction(
i18n( "&Select Shown Area" ), "viewmagfit", 0, TQT_TQOBJECT(m_widget), TQT_SLOT( zoomRect() ),
actionCollection(), "view_select_shown_rect" );
a->setToolTip( i18n( "Select the area that you want to be shown in the window." ) );
a->setWhatsThis( i18n( "Select the area that you want to be shown in the window." ) );
a = new KAction(
a = new TDEAction(
i18n( "S&elect Zoom Area" ), "viewmag", 0, TQT_TQOBJECT(m_widget), TQT_SLOT( zoomArea() ),
actionCollection(), "view_zoom_area" );
// a->setToolTip( i18n( "Select the area that you want to be shown in the window." ) );
// a->setWhatsThis( i18n( "Select the area that you want to be shown in the window." ) );
aToggleGrid = new KToggleAction(
aToggleGrid = new TDEToggleAction(
i18n( "Show &Grid" ), 0, this, TQT_SLOT( toggleGrid() ),
actionCollection(), "settings_show_grid" );
aToggleGrid->setToolTip( i18n( "Show or hide the grid." ) );
aToggleGrid->setChecked( true );
aToggleAxes = new KToggleAction(
aToggleAxes = new TDEToggleAction(
i18n( "Show &Axes" ), 0, this, TQT_SLOT( toggleAxes() ),
actionCollection(), "settings_show_axes" );
aToggleAxes->setToolTip( i18n( "Show or hide the axes." ) );
aToggleAxes->setChecked( true );
aToggleNightVision = new KToggleAction(
aToggleNightVision = new TDEToggleAction(
i18n( "Wear Infrared Glasses" ), 0, this, TQT_SLOT( toggleNightVision() ),
actionCollection(), "settings_toggle_nightvision" );
aToggleNightVision->setToolTip( i18n( "Enable/Disable hidden objects visibility." ) );
aToggleNightVision->setChecked( false );
// select coordinate system KActionMenu..
// select coordinate system TDEActionMenu..
aCoordSystem = new SetCoordinateSystemAction( *this, actionCollection() );
}
@ -563,7 +563,7 @@ void KigPart::delObjects( const std::vector<ObjectHolder*>& os )
void KigPart::enableConstructActions( bool enabled )
{
for_each( aActions.begin(), aActions.end(),
bind2nd( mem_fun( &KAction::setEnabled ),
bind2nd( mem_fun( &TDEAction::setEnabled ),
enabled ) );
}

@ -29,12 +29,12 @@
#include "../objects/common.h"
class TDEAboutData;
class KActionMenu;
class TDEActionMenu;
class KCommandHistory;
class KPrinter;
class KSelectAction;
class KToolBar;
class KToggleAction;
class TDESelectAction;
class TDEToolBar;
class TDEToggleAction;
class KURL;
class TQWidget;
@ -175,7 +175,7 @@ protected:
protected:
KigMode* mMode;
KSelectAction* aCoordSystem;
TDESelectAction* aCoordSystem;
/**
* the command history
@ -192,26 +192,26 @@ public:
// the previous mode. Enabling/disabling is done at the same time,
// of course..
// some MenuActions..
TQPtrList<KAction> aMNewSegment;
TQPtrList<KAction> aMNewPoint;
TQPtrList<KAction> aMNewCircle;
TQPtrList<KAction> aMNewLine;
TQPtrList<KAction> aMNewOther;
TQPtrList<KAction> aMNewAll;
TQPtrList<KAction> aMNewConic;
KAction* aCancelConstruction;
KAction* aSelectAll;
KAction* aDeselectAll;
KAction* aInvertSelection;
KAction* aDeleteObjects;
KAction* aNewMacro;
KAction* aShowHidden;
KAction* aConfigureTypes;
KToggleAction* aToggleGrid;
KToggleAction* aToggleAxes;
KToggleAction* aToggleNightVision;
TQPtrList<TDEAction> aMNewSegment;
TQPtrList<TDEAction> aMNewPoint;
TQPtrList<TDEAction> aMNewCircle;
TQPtrList<TDEAction> aMNewLine;
TQPtrList<TDEAction> aMNewOther;
TQPtrList<TDEAction> aMNewAll;
TQPtrList<TDEAction> aMNewConic;
TDEAction* aCancelConstruction;
TDEAction* aSelectAll;
TDEAction* aDeselectAll;
TDEAction* aInvertSelection;
TDEAction* aDeleteObjects;
TDEAction* aNewMacro;
TDEAction* aShowHidden;
TDEAction* aConfigureTypes;
TDEToggleAction* aToggleGrid;
TDEToggleAction* aToggleAxes;
TDEToggleAction* aToggleNightVision;
std::vector<KigGUIAction*> aActions;
/**

@ -82,7 +82,7 @@ void ConstructibleAction::act( KigPart& d )
KigGUIAction::KigGUIAction( GUIAction* act,
KigPart& doc,
TQObject* parent )
: KAction( act->descriptiveName(),
: TDEAction( act->descriptiveName(),
doc.instance()->iconLoader()->loadIcon(
act->iconFileName(), KIcon::Toolbar, 0, KIcon::DefaultState, 0L, true ),
act->shortcut(),

@ -32,7 +32,7 @@ class GUIAction;
class KigPart;
class KigGUIAction
: public KAction
: public TDEAction
{
Q_OBJECT

@ -185,7 +185,7 @@ NormalModePopupObjects::NormalModePopupObjects( KigPart& part,
NormalMode& mode,
const std::vector<ObjectHolder*>& objs,
const TQPoint& plc )
: KPopupMenu( &view ), mplc( plc ), mpart( part ), mview( view ), mobjs( objs ),
: TDEPopupMenu( &view ), mplc( plc ), mpart( part ), mview( view ), mobjs( objs ),
mmode( mode ), monlylabels( false )
{
bool empty = objs.empty();
@ -1177,7 +1177,7 @@ int ObjectChooserPopup::getObjectFromList( const TQPoint& p, KigWidget* w,
ObjectChooserPopup::ObjectChooserPopup( const TQPoint& p, KigWidget& view,
const std::vector<ObjectHolder*>& objs )
: KPopupMenu(), mplc( p ), mview( view ), mobjs( objs ), mselected( -1 )
: TDEPopupMenu(), mplc( p ), mview( view ), mobjs( objs ), mselected( -1 )
{
for ( uint i = 0; i < mobjs.size(); i++ )
{

@ -44,7 +44,7 @@ class ObjectHolder;
* PopupActionProviders are disabled, and some others enabled..
*/
class NormalModePopupObjects
: public KPopupMenu
: public TDEPopupMenu
{
Q_OBJECT
@ -115,7 +115,7 @@ private:
* You can't use this class directly, but these's a convenience method.
*/
class ObjectChooserPopup
: public KPopupMenu
: public TDEPopupMenu
{
Q_OBJECT

4