diff options
Diffstat (limited to 'lib')
102 files changed, 766 insertions, 766 deletions
diff --git a/lib/kformula/DESIGN b/lib/kformula/DESIGN index a6a7eccb..90a85d72 100644 --- a/lib/kformula/DESIGN +++ b/lib/kformula/DESIGN @@ -324,7 +324,7 @@ blame. Interface templates ################### -Decide what KAction have to be toolbars, +Decide what TDEAction have to be toolbars, what element templates must be loaded, what toolbar display.... There will be predefined (sorry for the spelling error) templates for -General... diff --git a/lib/kformula/README b/lib/kformula/README index 5cd97995..e4632dc6 100644 --- a/lib/kformula/README +++ b/lib/kformula/README @@ -40,6 +40,6 @@ Ctrl-G make current letter a greek one Text, numbers and operators are supported as well. Please note that the key bindings are for testing only. The library -is meant to be used with KActions. Look at KFormulaDocument::createActions. +is meant to be used with TDEActions. Look at KFormulaDocument::createActions. See DESIGN to know the structure of the formulas diff --git a/lib/kformula/kformulaconfigpage.cc b/lib/kformula/kformulaconfigpage.cc index 3152c26b..687345e2 100644 --- a/lib/kformula/kformulaconfigpage.cc +++ b/lib/kformula/kformulaconfigpage.cc @@ -287,9 +287,9 @@ bool ConfigurePage::selectFont( TQFont & font ) { TQStringList list; - KFontChooser::getFontList( list, KFontChooser::SmoothScalableFonts ); + TDEFontChooser::getFontList( list, TDEFontChooser::SmoothScalableFonts ); - KFontDialog dlg( m_view, 0, false, true, list ); + TDEFontDialog dlg( m_view, 0, false, true, list ); dlg.setFont( font ); int result = dlg.exec(); @@ -317,10 +317,10 @@ void ConfigurePage::slotChanged() m_changed = true; } -// class UsedFontItem : public KListViewItem { +// class UsedFontItem : public TDEListViewItem { // public: // UsedFontItem( MathFontsConfigurePage* page, TQListView* parent, TQString font ) -// : KListViewItem( parent, font ), m_page( page ) {} +// : TDEListViewItem( parent, font ), m_page( page ) {} // int compare( TQListViewItem* i, int col, bool ascending ) const; @@ -350,7 +350,7 @@ void ConfigurePage::slotChanged() // TQHBoxLayout* hLayout = new TQHBoxLayout( 0, 0, 6 ); -// availableFonts = new KListView( fontWidget ); +// availableFonts = new TDEListView( fontWidget ); // availableFonts->addColumn( i18n( "Available Fonts" ) ); // hLayout->addWidget( availableFonts ); @@ -377,7 +377,7 @@ void ConfigurePage::slotChanged() // moveUp->setText( i18n( "Up" ) ); // vLayout->addWidget( moveUp ); -// requestedFonts = new KListView( fontWidget ); +// requestedFonts = new TDEListView( fontWidget ); // requestedFonts->addColumn( i18n( "Used Fonts" ) ); // vLayout->addWidget( requestedFonts ); @@ -471,7 +471,7 @@ void ConfigurePage::slotChanged() // } // } // for ( TQMap<TQString, TQString>::iterator it = fontMap.begin(); it != fontMap.end(); ++it ) { -// new KListViewItem( availableFonts, it.key() ); +// new TDEListViewItem( availableFonts, it.key() ); // } // } @@ -499,7 +499,7 @@ void ConfigurePage::slotChanged() // } // //requestedFonts->takeItem( fontItem ); // delete fontItem; -// new KListViewItem( availableFonts, fontName ); +// new TDEListViewItem( availableFonts, fontName ); // } // } diff --git a/lib/kformula/kformulaconfigpage.h b/lib/kformula/kformulaconfigpage.h index 37776f0f..b87cf844 100644 --- a/lib/kformula/kformulaconfigpage.h +++ b/lib/kformula/kformulaconfigpage.h @@ -40,7 +40,7 @@ class TQWidget; class KColorButton; class TDEConfig; -class KListView; +class TDEListView; class KPushButton; class KIntNumInput; @@ -135,8 +135,8 @@ private: // TQWidget* m_view; // TDEConfig* m_config; -// KListView* availableFonts; -// KListView* requestedFonts; +// TDEListView* availableFonts; +// TDEListView* requestedFonts; // KPushButton* addFont; // KPushButton* removeFont; diff --git a/lib/kformula/kformuladocument.cc b/lib/kformula/kformuladocument.cc index 1b440b99..251893d1 100644 --- a/lib/kformula/kformuladocument.cc +++ b/lib/kformula/kformuladocument.cc @@ -369,7 +369,7 @@ void Document::introduceWrapper( DocumentWrapper* wrapper, bool init ) ////////////////////////////////////////////////////////////////////////////// DocumentWrapper::DocumentWrapper( TDEConfig* config, - KActionCollection* collection, + TDEActionCollection* collection, KoCommandHistory* history ) : m_document( 0 ), m_leftBracketChar( LeftRoundBracket ), @@ -434,193 +434,193 @@ void DocumentWrapper::setCommandStack( KoCommandHistory* history ) } -void DocumentWrapper::createActions( KActionCollection* collection ) +void DocumentWrapper::createActions( TDEActionCollection* collection ) { TDEGlobal::dirs()->addResourceType( "toolbar", TDEStandardDirs::kde_default("data") + "kformula/pics/" ); - m_addNegThinSpaceAction = new KAction( i18n( "Add Negative Thin Space" ), + m_addNegThinSpaceAction = new TDEAction( i18n( "Add Negative Thin Space" ), 0, this, TQT_SLOT( addNegThinSpace() ), collection, "formula_addnegthinspace") ; - m_addThinSpaceAction = new KAction( i18n( "Add Thin Space" ), + m_addThinSpaceAction = new TDEAction( i18n( "Add Thin Space" ), 0, this, TQT_SLOT( addThinSpace() ), collection, "formula_addthinspace") ; - m_addMediumSpaceAction = new KAction( i18n( "Add Medium Space" ), + m_addMediumSpaceAction = new TDEAction( i18n( "Add Medium Space" ), 0, this, TQT_SLOT( addMediumSpace() ), collection, "formula_addmediumspace" ); - m_addThickSpaceAction = new KAction( i18n( "Add Thick Space" ), + m_addThickSpaceAction = new TDEAction( i18n( "Add Thick Space" ), 0, this, TQT_SLOT( addThickSpace() ), collection, "formula_addthickspace" ); - m_addQuadSpaceAction = new KAction( i18n( "Add Quad Space" ), + m_addQuadSpaceAction = new TDEAction( i18n( "Add Quad Space" ), 0, this, TQT_SLOT( addQuadSpace() ), collection, "formula_addquadspace" ); - m_addIntegralAction = new KAction(i18n("Add Integral"), + m_addIntegralAction = new TDEAction(i18n("Add Integral"), "int", 0, this, TQT_SLOT(addIntegral()), collection, "formula_addintegral"); - m_addSumAction = new KAction(i18n("Add Sum"), + m_addSumAction = new TDEAction(i18n("Add Sum"), "sum", 0, this, TQT_SLOT(addSum()), collection, "formula_addsum"); - m_addProductAction = new KAction(i18n("Add Product"), + m_addProductAction = new TDEAction(i18n("Add Product"), "prod", 0, this, TQT_SLOT(addProduct()), collection, "formula_addproduct"); - m_addRootAction = new KAction(i18n("Add Root"), + m_addRootAction = new TDEAction(i18n("Add Root"), "sqrt", 0, this, TQT_SLOT(addRoot()), collection, "formula_addroot"); - m_addFractionAction = new KAction(i18n("Add Fraction"), + m_addFractionAction = new TDEAction(i18n("Add Fraction"), "frac", 0, this, TQT_SLOT(addFraction()), collection, "formula_addfrac"); - m_addBracketAction = new KAction(i18n("Add Bracket"), + m_addBracketAction = new TDEAction(i18n("Add Bracket"), "paren", 0, this, TQT_SLOT(addDefaultBracket()), collection,"formula_addbra"); - m_addSBracketAction = new KAction(i18n("Add Square Bracket"), + m_addSBracketAction = new TDEAction(i18n("Add Square Bracket"), "brackets", 0, this, TQT_SLOT(addSquareBracket()), collection,"formula_addsqrbra"); - m_addCBracketAction = new KAction(i18n("Add Curly Bracket"), + m_addCBracketAction = new TDEAction(i18n("Add Curly Bracket"), "math_brace", 0, this, TQT_SLOT(addCurlyBracket()), collection,"formula_addcurbra"); - m_addAbsAction = new KAction(i18n("Add Abs"), + m_addAbsAction = new TDEAction(i18n("Add Abs"), "abs", 0, this, TQT_SLOT(addLineBracket()), collection,"formula_addabsbra"); - m_addMatrixAction = new KAction(i18n("Add Matrix..."), + m_addMatrixAction = new TDEAction(i18n("Add Matrix..."), "matrix", 0, this, TQT_SLOT(addMatrix()), collection, "formula_addmatrix"); - m_addOneByTwoMatrixAction = new KAction(i18n("Add 1x2 Matrix"), + m_addOneByTwoMatrixAction = new TDEAction(i18n("Add 1x2 Matrix"), "onetwomatrix", 0, this, TQT_SLOT(addOneByTwoMatrix()), collection, "formula_add_one_by_two_matrix"); - m_addUpperLeftAction = new KAction(i18n("Add Upper Left Index"), + m_addUpperLeftAction = new TDEAction(i18n("Add Upper Left Index"), "lsup", 0, this, TQT_SLOT(addUpperLeftIndex()), collection, "formula_addupperleft"); - m_addLowerLeftAction = new KAction(i18n("Add Lower Left Index"), + m_addLowerLeftAction = new TDEAction(i18n("Add Lower Left Index"), "lsub", 0, this, TQT_SLOT(addLowerLeftIndex()), collection, "formula_addlowerleft"); - m_addUpperRightAction = new KAction(i18n("Add Upper Right Index"), + m_addUpperRightAction = new TDEAction(i18n("Add Upper Right Index"), "rsup", 0, this, TQT_SLOT(addUpperRightIndex()), collection, "formula_addupperright"); - m_addLowerRightAction = new KAction(i18n("Add Lower Right Index"), + m_addLowerRightAction = new TDEAction(i18n("Add Lower Right Index"), "rsub", 0, this, TQT_SLOT(addLowerRightIndex()), collection, "formula_addlowerright"); - m_addGenericUpperAction = new KAction(i18n("Add Upper Index"), + m_addGenericUpperAction = new TDEAction(i18n("Add Upper Index"), "gsup", /*CTRL + Key_U*/0, this, TQT_SLOT(addGenericUpperIndex()), collection, "formula_addupperindex"); - m_addGenericLowerAction = new KAction(i18n("Add Lower Index"), + m_addGenericLowerAction = new TDEAction(i18n("Add Lower Index"), "gsub", 0, this, TQT_SLOT(addGenericLowerIndex()), collection, "formula_addlowerindex"); - m_addOverlineAction = new KAction(i18n("Add Overline"), + m_addOverlineAction = new TDEAction(i18n("Add Overline"), "over", 0, this, TQT_SLOT(addOverline()), collection, "formula_addoverline"); - m_addUnderlineAction = new KAction(i18n("Add Underline"), + m_addUnderlineAction = new TDEAction(i18n("Add Underline"), "under", 0, this, TQT_SLOT(addUnderline()), collection, "formula_addunderline"); - m_addMultilineAction = new KAction(i18n("Add Multiline"), + m_addMultilineAction = new TDEAction(i18n("Add Multiline"), "multiline", 0, this, TQT_SLOT(addMultiline()), collection, "formula_addmultiline"); - m_removeEnclosingAction = new KAction(i18n("Remove Enclosing Element"), + m_removeEnclosingAction = new TDEAction(i18n("Remove Enclosing Element"), 0, this, TQT_SLOT(removeEnclosing()), collection, "formula_removeenclosing"); - m_makeGreekAction = new KAction(i18n("Convert to Greek"), + m_makeGreekAction = new TDEAction(i18n("Convert to Greek"), 0, this, TQT_SLOT(makeGreek()), collection, "formula_makegreek"); - m_appendColumnAction = new KAction( i18n( "Append Column" ), + m_appendColumnAction = new TDEAction( i18n( "Append Column" ), "inscol", 0, this, TQT_SLOT( appendColumn() ), collection, "formula_appendcolumn" ); - m_insertColumnAction = new KAction( i18n( "Insert Column" ), + m_insertColumnAction = new TDEAction( i18n( "Insert Column" ), "inscol", 0, this, TQT_SLOT( insertColumn() ), collection, "formula_insertcolumn" ); - m_removeColumnAction = new KAction( i18n( "Remove Column" ), + m_removeColumnAction = new TDEAction( i18n( "Remove Column" ), "remcol", 0, this, TQT_SLOT( removeColumn() ), collection, "formula_removecolumn" ); - m_appendRowAction = new KAction( i18n( "Append Row" ), + m_appendRowAction = new TDEAction( i18n( "Append Row" ), "insrow", 0, this, TQT_SLOT( appendRow() ), collection, "formula_appendrow" ); - m_insertRowAction = new KAction( i18n( "Insert Row" ), + m_insertRowAction = new TDEAction( i18n( "Insert Row" ), "insrow", 0, this, TQT_SLOT( insertRow() ), collection, "formula_insertrow" ); - m_removeRowAction = new KAction( i18n( "Remove Row" ), + m_removeRowAction = new TDEAction( i18n( "Remove Row" ), "remrow", 0, this, TQT_SLOT( removeRow() ), collection, "formula_removerow" ); - m_syntaxHighlightingAction = new KToggleAction(i18n("Syntax Highlighting"), + m_syntaxHighlightingAction = new TDEToggleAction(i18n("Syntax Highlighting"), 0, this, TQT_SLOT(toggleSyntaxHighlighting()), collection, "formula_syntaxhighlighting"); //m_syntaxHighlightingAction->setChecked( m_contextStyle->syntaxHighlighting() ); - m_formatBoldAction = new KToggleAction( i18n( "&Bold" ), "text_bold", + m_formatBoldAction = new TDEToggleAction( i18n( "&Bold" ), "text_bold", 0, //CTRL + Key_B, this, TQT_SLOT( textBold() ), collection, "formula_format_bold" ); - m_formatItalicAction = new KToggleAction( i18n( "&Italic" ), "text_italic", + m_formatItalicAction = new TDEToggleAction( i18n( "&Italic" ), "text_italic", 0, //CTRL + Key_I, this, TQT_SLOT( textItalic() ), collection, "formula_format_italic" ); @@ -640,7 +640,7 @@ void DocumentWrapper::createActions( KActionCollection* collection ) delimiter.append(TQString("]")); delimiter.append(TQString("}")); delimiter.append(TQString(">")); - m_leftBracket = new KSelectAction(i18n("Left Delimiter"), + m_leftBracket = new TDESelectAction(i18n("Left Delimiter"), 0, this, TQT_SLOT(delimiterLeft()), collection, "formula_typeleft"); m_leftBracket->setItems(delimiter); @@ -659,13 +659,13 @@ void DocumentWrapper::createActions( KActionCollection* collection ) delimiter.append(TQString("[")); delimiter.append(TQString("{")); delimiter.append(TQString("<")); - m_rightBracket = new KSelectAction(i18n("Right Delimiter"), + m_rightBracket = new TDESelectAction(i18n("Right Delimiter"), 0, this, TQT_SLOT(delimiterRight()), collection, "formula_typeright"); m_rightBracket->setItems(delimiter); //rightBracket->setCurrentItem(0); - m_insertSymbolAction = new KAction(i18n("Insert Symbol"), + m_insertSymbolAction = new TDEAction(i18n("Insert Symbol"), "key_enter", /*CTRL + Key_I*/0, this, TQT_SLOT(insertSymbol()), @@ -679,7 +679,7 @@ void DocumentWrapper::createActions( KActionCollection* collection ) ff.append( i18n( "Script" ) ); ff.append( i18n( "Fraktur" ) ); ff.append( i18n( "Double Struck" ) ); - m_fontFamily = new KSelectAction(i18n("Font Family"), + m_fontFamily = new TDESelectAction(i18n("Font Family"), 0, this, TQT_SLOT(fontFamily()), collection, "formula_fontfamily"); m_fontFamily->setItems( ff ); @@ -690,7 +690,7 @@ void DocumentWrapper::createActions( KActionCollection* collection ) et.append( i18n( "Operator" ) ); et.append( i18n( "Number" ) ); et.append( i18n( "Text" ) ); - m_tokenElement = new KSelectAction( i18n( "Token Type" ), + m_tokenElement = new TDESelectAction( i18n( "Token Type" ), 0, this, TQT_SLOT( tokenElement() ), collection, "formula_tokenelement" ); m_tokenElement->setItems( et ); @@ -1219,59 +1219,59 @@ void DocumentWrapper::setEnabled( bool enabled ) if ( enabled ) { getAddGenericUpperAction()-> - setShortcut( KShortcut( CTRL + Key_U ) ); + setShortcut( TDEShortcut( CTRL + Key_U ) ); getAddGenericLowerAction()-> - setShortcut( KShortcut( CTRL + Key_L ) ); + setShortcut( TDEShortcut( CTRL + Key_L ) ); getRemoveEnclosingAction()-> - setShortcut( KShortcut( CTRL + Key_R ) ); + setShortcut( TDEShortcut( CTRL + Key_R ) ); getMakeGreekAction()-> - setShortcut( KShortcut( CTRL + Key_G ) ); + setShortcut( TDEShortcut( CTRL + Key_G ) ); getInsertSymbolAction()-> - setShortcut( KShortcut( CTRL + Key_I ) ); + setShortcut( TDEShortcut( CTRL + Key_I ) ); getAddOverlineAction()-> - setShortcut( KShortcut( CTRL + SHIFT + Key_O ) ); + setShortcut( TDEShortcut( CTRL + SHIFT + Key_O ) ); getAddUnderlineAction()-> - setShortcut( KShortcut( CTRL + SHIFT + Key_U ) ); + setShortcut( TDEShortcut( CTRL + SHIFT + Key_U ) ); getAddBracketAction()-> - setShortcut( KShortcut( CTRL + SHIFT + Key_B ) ); + setShortcut( TDEShortcut( CTRL + SHIFT + Key_B ) ); getAddSBracketAction()-> - setShortcut( KShortcut( CTRL + SHIFT + Key_D ) ); + setShortcut( TDEShortcut( CTRL + SHIFT + Key_D ) ); getAddCBracketAction()-> - setShortcut( KShortcut( CTRL + SHIFT + Key_C ) ); + setShortcut( TDEShortcut( CTRL + SHIFT + Key_C ) ); getAddAbsAction()-> - setShortcut( KShortcut( CTRL + SHIFT + Key_A ) ); + setShortcut( TDEShortcut( CTRL + SHIFT + Key_A ) ); getAddFractionAction()-> - setShortcut( KShortcut( CTRL + SHIFT + Key_F ) ); + setShortcut( TDEShortcut( CTRL + SHIFT + Key_F ) ); getAddRootAction()-> - setShortcut( KShortcut( CTRL + SHIFT + Key_R ) ); + setShortcut( TDEShortcut( CTRL + SHIFT + Key_R ) ); getAddSumAction()-> - setShortcut( KShortcut( CTRL + SHIFT + Key_S ) ); + setShortcut( TDEShortcut( CTRL + SHIFT + Key_S ) ); getAddProductAction()-> - setShortcut( KShortcut( CTRL + SHIFT + Key_P ) ); + setShortcut( TDEShortcut( CTRL + SHIFT + Key_P ) ); getAddIntegralAction()-> - setShortcut( KShortcut( CTRL + SHIFT + Key_I ) ); + setShortcut( TDEShortcut( CTRL + SHIFT + Key_I ) ); getAddMatrixAction()-> - setShortcut( KShortcut( CTRL + SHIFT + Key_M ) ); + setShortcut( TDEShortcut( CTRL + SHIFT + Key_M ) ); } else { - getAddGenericUpperAction()->setShortcut( KShortcut() ); - getAddGenericLowerAction()->setShortcut( KShortcut() ); - getRemoveEnclosingAction()->setShortcut( KShortcut() ); - getMakeGreekAction()->setShortcut( KShortcut() ); - getInsertSymbolAction()->setShortcut( KShortcut() ); - getAddOverlineAction()->setShortcut( KShortcut() ); - getAddUnderlineAction()->setShortcut( KShortcut() ); - getAddBracketAction()->setShortcut( KShortcut() ); - getAddSBracketAction()->setShortcut( KShortcut() ); - getAddCBracketAction()->setShortcut( KShortcut() ); - getAddAbsAction()->setShortcut( KShortcut() ); - getAddFractionAction()->setShortcut( KShortcut() ); - getAddRootAction()->setShortcut( KShortcut() ); - getAddSumAction()->setShortcut( KShortcut() ); - getAddProductAction()->setShortcut( KShortcut() ); - getAddIntegralAction()->setShortcut( KShortcut() ); - getAddMatrixAction()->setShortcut( KShortcut() ); + getAddGenericUpperAction()->setShortcut( TDEShortcut() ); + getAddGenericLowerAction()->setShortcut( TDEShortcut() ); + getRemoveEnclosingAction()->setShortcut( TDEShortcut() ); + getMakeGreekAction()->setShortcut( TDEShortcut() ); + getInsertSymbolAction()->setShortcut( TDEShortcut() ); + getAddOverlineAction()->setShortcut( TDEShortcut() ); + getAddUnderlineAction()->setShortcut( TDEShortcut() ); + getAddBracketAction()->setShortcut( TDEShortcut() ); + getAddSBracketAction()->setShortcut( TDEShortcut() ); + getAddCBracketAction()->setShortcut( TDEShortcut() ); + getAddAbsAction()->setShortcut( TDEShortcut() ); + getAddFractionAction()->setShortcut( TDEShortcut() ); + getAddRootAction()->setShortcut( TDEShortcut() ); + getAddSumAction()->setShortcut( TDEShortcut() ); + getAddProductAction()->setShortcut( TDEShortcut() ); + getAddIntegralAction()->setShortcut( TDEShortcut() ); + getAddMatrixAction()->setShortcut( TDEShortcut() ); } } diff --git a/lib/kformula/kformuladocument.h b/lib/kformula/kformuladocument.h index d541a4c5..8a3dd77d 100644 --- a/lib/kformula/kformuladocument.h +++ b/lib/kformula/kformuladocument.h @@ -296,7 +296,7 @@ class KOFORMULA_EXPORT DocumentWrapper : public TQObject { public: DocumentWrapper( TDEConfig* config, - KActionCollection* collection, + TDEActionCollection* collection, KoCommandHistory* history = 0 ); ~DocumentWrapper(); @@ -319,53 +319,53 @@ public: */ void document( Document* document, bool init = true ); - KAction* getAddNegThinSpaceAction() { return m_addNegThinSpaceAction; } - KAction* getAddThinSpaceAction() { return m_addThinSpaceAction; } - KAction* getAddMediumSpaceAction() { return m_addMediumSpaceAction; } - KAction* getAddThickSpaceAction() { return m_addThickSpaceAction; } - KAction* getAddQuadSpaceAction() { return m_addQuadSpaceAction; } - KAction* getAddBracketAction() { return m_addBracketAction; } - KAction* getAddSBracketAction() { return m_addSBracketAction;} - KAction* getAddCBracketAction() { return m_addCBracketAction;} - KAction* getAddAbsAction() { return m_addAbsAction;} - KAction* getAddFractionAction() { return m_addFractionAction; } - KAction* getAddRootAction() { return m_addRootAction; } - KAction* getAddSumAction() { return m_addSumAction; } - KAction* getAddProductAction() { return m_addProductAction; } - KAction* getAddIntegralAction() { return m_addIntegralAction; } - KAction* getAddMatrixAction() { return m_addMatrixAction; } - KAction* getAddOneByTwoMatrixAction(){ return m_addOneByTwoMatrixAction; } - KAction* getAddUpperLeftAction() { return m_addUpperLeftAction; } - KAction* getAddLowerLeftAction() { return m_addLowerLeftAction; } - KAction* getAddUpperRightAction() { return m_addUpperRightAction; } - KAction* getAddLowerRightAction() { return m_addLowerRightAction; } - KAction* getAddGenericUpperAction() { return m_addGenericUpperAction; } - KAction* getAddGenericLowerAction() { return m_addGenericLowerAction; } - KAction* getAddOverlineAction() { return m_addOverlineAction; } - KAction* getAddUnderlineAction() { return m_addUnderlineAction; } - KAction* getAddMultilineAction() { return m_addMultilineAction; } - KAction* getRemoveEnclosingAction() { return m_removeEnclosingAction; } - KAction* getMakeGreekAction() { return m_makeGreekAction; } - KAction* getInsertSymbolAction() { return m_insertSymbolAction; } - - KAction* getAppendColumnAction() { return m_appendColumnAction; } - KAction* getInsertColumnAction() { return m_insertColumnAction; } - KAction* getRemoveColumnAction() { return m_removeColumnAction; } - KAction* getAppendRowAction() { return m_appendRowAction; } - KAction* getInsertRowAction() { return m_insertRowAction; } - KAction* getRemoveRowAction() { return m_removeRowAction; } + TDEAction* getAddNegThinSpaceAction() { return m_addNegThinSpaceAction; } + TDEAction* getAddThinSpaceAction() { return m_addThinSpaceAction; } + TDEAction* getAddMediumSpaceAction() { return m_addMediumSpaceAction; } + TDEAction* getAddThickSpaceAction() { return m_addThickSpaceAction; } + TDEAction* getAddQuadSpaceAction() { return m_addQuadSpaceAction; } + TDEAction* getAddBracketAction() { return m_addBracketAction; } + TDEAction* getAddSBracketAction() { return m_addSBracketAction;} + TDEAction* getAddCBracketAction() { return m_addCBracketAction;} + TDEAction* getAddAbsAction() { return m_addAbsAction;} + TDEAction* getAddFractionAction() { return m_addFractionAction; } + TDEAction* getAddRootAction() { return m_addRootAction; } + TDEAction* getAddSumAction() { return m_addSumAction; } + TDEAction* getAddProductAction() { return m_addProductAction; } + TDEAction* getAddIntegralAction() { return m_addIntegralAction; } + TDEAction* getAddMatrixAction() { return m_addMatrixAction; } + TDEAction* getAddOneByTwoMatrixAction(){ return m_addOneByTwoMatrixAction; } + TDEAction* getAddUpperLeftAction() { return m_addUpperLeftAction; } + TDEAction* getAddLowerLeftAction() { return m_addLowerLeftAction; } + TDEAction* getAddUpperRightAction() { return m_addUpperRightAction; } + TDEAction* getAddLowerRightAction() { return m_addLowerRightAction; } + TDEAction* getAddGenericUpperAction() { return m_addGenericUpperAction; } + TDEAction* getAddGenericLowerAction() { return m_addGenericLowerAction; } + TDEAction* getAddOverlineAction() { return m_addOverlineAction; } + TDEAction* getAddUnderlineAction() { return m_addUnderlineAction; } + TDEAction* getAddMultilineAction() { return m_addMultilineAction; } + TDEAction* getRemoveEnclosingAction() { return m_removeEnclosingAction; } + TDEAction* getMakeGreekAction() { return m_makeGreekAction; } + TDEAction* getInsertSymbolAction() { return m_insertSymbolAction; } + + TDEAction* getAppendColumnAction() { return m_appendColumnAction; } + TDEAction* getInsertColumnAction() { return m_insertColumnAction; } + TDEAction* getRemoveColumnAction() { return m_removeColumnAction; } + TDEAction* getAppendRowAction() { return m_appendRowAction; } + TDEAction* getInsertRowAction() { return m_insertRowAction; } + TDEAction* getRemoveRowAction() { return m_removeRowAction; } void enableMatrixActions(bool); - KSelectAction* getLeftBracketAction() { return m_leftBracket; } - KSelectAction* getRightBracketAction() { return m_rightBracket; } + TDESelectAction* getLeftBracketAction() { return m_leftBracket; } + TDESelectAction* getRightBracketAction() { return m_rightBracket; } SymbolAction* getSymbolNamesAction() { return m_symbolNamesAction; } - KToggleAction* getSyntaxHighlightingAction() + TDEToggleAction* getSyntaxHighlightingAction() { return m_syntaxHighlightingAction; } - KToggleAction* getFormatBoldAction() { return m_formatBoldAction; } - KToggleAction* getFormatItalicAction() { return m_formatItalicAction; } + TDEToggleAction* getFormatBoldAction() { return m_formatBoldAction; } + TDEToggleAction* getFormatItalicAction() { return m_formatItalicAction; } - KSelectAction* getFontFamilyAction() { return m_fontFamily; } - KSelectAction* getTokenElementAction() { return m_tokenElement; } + TDESelectAction* getFontFamilyAction() { return m_fontFamily; } + TDESelectAction* getTokenElementAction() { return m_tokenElement; } SymbolType leftBracketChar() const { return m_leftBracketChar; } SymbolType rightBracketChar() const { return m_rightBracketChar; } @@ -435,7 +435,7 @@ public slots: private: - void createActions( KActionCollection* collection ); + void createActions( TDEActionCollection* collection ); void initSymbolNamesAction(); void setCommandStack( KoCommandHistory* history ); @@ -444,52 +444,52 @@ private: Document* m_document; - KAction* m_addNegThinSpaceAction; - KAction* m_addThinSpaceAction; - KAction* m_addMediumSpaceAction; - KAction* m_addThickSpaceAction; - KAction* m_addQuadSpaceAction; - KAction* m_addBracketAction; - KAction* m_addSBracketAction; - KAction* m_addCBracketAction; - KAction* m_addAbsAction; - KAction* m_addFractionAction; - KAction* m_addRootAction; - KAction* m_addSumAction; - KAction* m_addProductAction; - KAction* m_addIntegralAction; - KAction* m_addMatrixAction; - KAction* m_addOneByTwoMatrixAction; - KAction* m_addUpperLeftAction; - KAction* m_addLowerLeftAction; - KAction* m_addUpperRightAction; - KAction* m_addLowerRightAction; - KAction* m_addGenericUpperAction; - KAction* m_addGenericLowerAction; - KAction* m_addOverlineAction; - KAction* m_addUnderlineAction; - KAction* m_addMultilineAction; - KAction* m_removeEnclosingAction; - KAction* m_makeGreekAction; - KAction* m_insertSymbolAction; - - KAction* m_appendColumnAction; - KAction* m_insertColumnAction; - KAction* m_removeColumnAction; - KAction* m_appendRowAction; - KAction* m_insertRowAction; - KAction* m_removeRowAction; - - KToggleAction* m_syntaxHighlightingAction; - KToggleAction* m_formatBoldAction; - KToggleAction* m_formatItalicAction; - - KSelectAction* m_leftBracket; - KSelectAction* m_rightBracket; + TDEAction* m_addNegThinSpaceAction; + TDEAction* m_addThinSpaceAction; + TDEAction* m_addMediumSpaceAction; + TDEAction* m_addThickSpaceAction; + TDEAction* m_addQuadSpaceAction; + TDEAction* m_addBracketAction; + TDEAction* m_addSBracketAction; + TDEAction* m_addCBracketAction; + TDEAction* m_addAbsAction; + TDEAction* m_addFractionAction; + TDEAction* m_addRootAction; + TDEAction* m_addSumAction; + TDEAction* m_addProductAction; + TDEAction* m_addIntegralAction; + TDEAction* m_addMatrixAction; + TDEAction* m_addOneByTwoMatrixAction; + TDEAction* m_addUpperLeftAction; + TDEAction* m_addLowerLeftAction; + TDEAction* m_addUpperRightAction; + TDEAction* m_addLowerRightAction; + TDEAction* m_addGenericUpperAction; + TDEAction* m_addGenericLowerAction; + TDEAction* m_addOverlineAction; + TDEAction* m_addUnderlineAction; + TDEAction* m_addMultilineAction; + TDEAction* m_removeEnclosingAction; + TDEAction* m_makeGreekAction; + TDEAction* m_insertSymbolAction; + + TDEAction* m_appendColumnAction; + TDEAction* m_insertColumnAction; + TDEAction* m_removeColumnAction; + TDEAction* m_appendRowAction; + TDEAction* m_insertRowAction; + TDEAction* m_removeRowAction; + + TDEToggleAction* m_syntaxHighlightingAction; + TDEToggleAction* m_formatBoldAction; + TDEToggleAction* m_formatItalicAction; + + TDESelectAction* m_leftBracket; + TDESelectAction* m_rightBracket; SymbolAction* m_symbolNamesAction; - KSelectAction* m_fontFamily; - KSelectAction* m_tokenElement; + TDESelectAction* m_fontFamily; + TDESelectAction* m_tokenElement; SymbolType m_leftBracketChar; SymbolType m_rightBracketChar; diff --git a/lib/kformula/symbolaction.cc b/lib/kformula/symbolaction.cc index edc3d62e..58074a2b 100644 --- a/lib/kformula/symbolaction.cc +++ b/lib/kformula/symbolaction.cc @@ -102,27 +102,27 @@ void SymbolComboItem::paint( TQPainter *p ) * The symbol action * */ SymbolAction::SymbolAction( TQObject* parent, const char* name ) - : KSelectAction( parent, name ) + : TDESelectAction( parent, name ) { setEditable( FALSE ); } -SymbolAction::SymbolAction( const TQString& text, const KShortcut& cut, +SymbolAction::SymbolAction( const TQString& text, const TDEShortcut& cut, const TQObject* receiver, const char* slot, TQObject* parent, const char* name ) - : KSelectAction( text, cut, receiver, slot, parent, name ) + : TDESelectAction( text, cut, receiver, slot, parent, name ) { setEditable( FALSE ); } int SymbolAction::plug( TQWidget* w, int index ) { - if (kapp && !kapp->authorizeKAction(name())) + if (kapp && !kapp->authorizeTDEAction(name())) return -1; - if ( w->inherits( "KToolBar" ) ) + if ( w->inherits( "TDEToolBar" ) ) { - KToolBar* bar = static_cast<KToolBar*>( w ); - int id_ = KAction::getToolButtonID(); + TDEToolBar* bar = static_cast<TDEToolBar*>( w ); + int id_ = TDEAction::getToolButtonID(); KComboBox *cb = new KComboBox( bar ); connect( cb, TQT_SIGNAL( activated( const TQString & ) ), TQT_SLOT( slotActivated( const TQString & ) ) ); @@ -138,7 +138,7 @@ int SymbolAction::plug( TQWidget* w, int index ) return containerCount() - 1; } - else return KSelectAction::plug( w, index ); + else return TDESelectAction::plug( w, index ); } void SymbolAction::setSymbols( const TQStringList &names, @@ -157,8 +157,8 @@ void SymbolAction::setSymbols( const TQStringList &names, void SymbolAction::updateItems( int id ) { TQWidget *w = container( id ); - if ( w->inherits( "KToolBar" ) ) { - TQWidget *r = static_cast<KToolBar*>( w )->getWidget( itemId( id ) ); + if ( w->inherits( "TDEToolBar" ) ) { + TQWidget *r = static_cast<TDEToolBar*>( w )->getWidget( itemId( id ) ); if ( r->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) { TQComboBox *cb = static_cast<TQComboBox*>( r ); cb->clear(); diff --git a/lib/kformula/symbolaction.h b/lib/kformula/symbolaction.h index b3158014..a7c91292 100644 --- a/lib/kformula/symbolaction.h +++ b/lib/kformula/symbolaction.h @@ -29,11 +29,11 @@ KFORMULA_NAMESPACE_BEGIN -class SymbolAction : public KSelectAction +class SymbolAction : public TDESelectAction { public: SymbolAction( TQObject* parent = 0, const char* name = 0 ); - SymbolAction( const TQString& text, const KShortcut& cut, + SymbolAction( const TQString& text, const TDEShortcut& cut, const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 ); diff --git a/lib/kofficecore/KoApplicationIface.cc b/lib/kofficecore/KoApplicationIface.cc index 3348e873..188a76d1 100644 --- a/lib/kofficecore/KoApplicationIface.cc +++ b/lib/kofficecore/KoApplicationIface.cc @@ -85,10 +85,10 @@ TQValueList<DCOPRef> KoApplicationIface::getViews() TQValueList<DCOPRef> KoApplicationIface::getWindows() { TQValueList<DCOPRef> lst; - TQPtrList<KMainWindow> *mainWindows = KMainWindow::memberList; + TQPtrList<TDEMainWindow> *mainWindows = TDEMainWindow::memberList; if ( mainWindows ) { - TQPtrListIterator<KMainWindow> it( *mainWindows ); + TQPtrListIterator<TDEMainWindow> it( *mainWindows ); for (; it.current(); ++it ) lst.append( DCOPRef( kapp->dcopClient()->appId(), static_cast<KoMainWindow *>(it.current())->dcopObject()->objId() ) ); diff --git a/lib/kofficecore/KoDetailsPane.cpp b/lib/kofficecore/KoDetailsPane.cpp index 91cdb4ad..31cfde38 100644 --- a/lib/kofficecore/KoDetailsPane.cpp +++ b/lib/kofficecore/KoDetailsPane.cpp @@ -44,12 +44,12 @@ #include "KoTemplates.h" -class KoFileListItem : public KListViewItem +class KoFileListItem : public TDEListViewItem { public: - KoFileListItem(KListView* listView, TQListViewItem* after, const TQString& filename, + KoFileListItem(TDEListView* listView, TQListViewItem* after, const TQString& filename, const TQString& fullPath, KFileItem* fileItem) - : KListViewItem(listView, after, filename, fullPath), m_fileItem(fileItem) + : TDEListViewItem(listView, after, filename, fullPath), m_fileItem(fileItem) { } @@ -107,10 +107,10 @@ KoTemplatesPane::KoTemplatesPane(TQWidget* parent, TDEInstance* instance, connect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()), this, TQT_SLOT(changePalette())); } - KListViewItem* selectItem = 0; + TDEListViewItem* selectItem = 0; for (KoTemplate* t = group->first(); t != 0L; t = group->next()) { - KListViewItem* item = new KListViewItem(m_documentList, t->name(), t->description(), t->file()); + TDEListViewItem* item = new TDEListViewItem(m_documentList, t->name(), t->description(), t->file()); TQImage icon = t->loadPicture(instance).convertToImage(); icon = icon.smoothScale(64, 64, TQ_ScaleMin); icon.setAlphaBuffer(true); diff --git a/lib/kofficecore/KoDocument.cpp b/lib/kofficecore/KoDocument.cpp index 15e7b892..184dcefd 100644 --- a/lib/kofficecore/KoDocument.cpp +++ b/lib/kofficecore/KoDocument.cpp @@ -557,10 +557,10 @@ void KoDocument::slotAutoSave() } } -KAction *KoDocument::action( const TQDomElement &element ) const +TDEAction *KoDocument::action( const TQDomElement &element ) const { // First look in the document itself - KAction* act = KParts::ReadWritePart::action( element ); + TDEAction* act = KParts::ReadWritePart::action( element ); if ( act ) return act; diff --git a/lib/kofficecore/KoDocument.h b/lib/kofficecore/KoDocument.h index 4947506d..cb4f9f25 100644 --- a/lib/kofficecore/KoDocument.h +++ b/lib/kofficecore/KoDocument.h @@ -114,7 +114,7 @@ public: /** * Returns the action described action object. In fact only the "name" attribute * of @p element is of interest here. The method searches first in the - * KActionCollection of the first view and then in the KActionCollection of this + * TDEActionCollection of the first view and then in the TDEActionCollection of this * document. * This allows %KOffice applications to define actions in both the view and the document. * They should only define view-actions (like zooming and stuff) in the view. @@ -126,7 +126,7 @@ public: * @see KXMLGUIClient::actionCollection * @see KoView::action */ - virtual KAction *action( const TQDomElement &element ) const; + virtual TDEAction *action( const TQDomElement &element ) const; /** * Returns the DOM document which describes the GUI of the diff --git a/lib/kofficecore/KoDocumentIface.cc b/lib/kofficecore/KoDocumentIface.cc index 2c9dbe70..cfa21a93 100644 --- a/lib/kofficecore/KoDocumentIface.cc +++ b/lib/kofficecore/KoDocumentIface.cc @@ -97,9 +97,9 @@ DCOPRef KoDocumentIface::action( const TQCString &name ) QCStringList KoDocumentIface::actions() { QCStringList res; - TQValueList<KAction *> lst = m_actionProxy->actions(); - TQValueList<KAction *>::ConstIterator it = lst.begin(); - TQValueList<KAction *>::ConstIterator end = lst.end(); + TQValueList<TDEAction *> lst = m_actionProxy->actions(); + TQValueList<TDEAction *>::ConstIterator it = lst.begin(); + TQValueList<TDEAction *>::ConstIterator end = lst.end(); for (; it != end; ++it ) res.append( (*it)->name() ); diff --git a/lib/kofficecore/KoDocumentInfoDlg.cpp b/lib/kofficecore/KoDocumentInfoDlg.cpp index 7e67c148..361cc5cd 100644 --- a/lib/kofficecore/KoDocumentInfoDlg.cpp +++ b/lib/kofficecore/KoDocumentInfoDlg.cpp @@ -301,7 +301,7 @@ void KoDocumentInfoDlg::addUserMetadataPage( KoDocumentInfoUserMetadata *userMet { TQString name = it.key(); TQString value = it.data(); - KListViewItem* it = new KListViewItem( d->m_metaWidget->metaListView, name, value ); + TDEListViewItem* it = new TDEListViewItem( d->m_metaWidget->metaListView, name, value ); it->setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "text", KIcon::Small ) ); } } diff --git a/lib/kofficecore/KoFilterManager.cpp b/lib/kofficecore/KoFilterManager.cpp index b1e845b7..c2ecb369 100644 --- a/lib/kofficecore/KoFilterManager.cpp +++ b/lib/kofficecore/KoFilterManager.cpp @@ -64,7 +64,7 @@ KoFilterChooser::KoFilterChooser (TQWidget *parent, const TQStringList &mimeType TQLabel *filterLabel = new TQLabel (i18n ("Select a filter:"), page, "filterlabel"); layout->addWidget (filterLabel); - m_filterList = new KListBox (page, "filterlist"); + m_filterList = new TDEListBox (page, "filterlist"); layout->addWidget (m_filterList); Q_ASSERT (!m_mimeTypes.isEmpty ()); diff --git a/lib/kofficecore/KoFilterManager_p.h b/lib/kofficecore/KoFilterManager_p.h index bdee8777..e446f6f7 100644 --- a/lib/kofficecore/KoFilterManager_p.h +++ b/lib/kofficecore/KoFilterManager_p.h @@ -24,7 +24,7 @@ #include <kdialogbase.h> -class KListBox; +class TDEListBox; class KoFilterChooser : public KDialogBase @@ -41,7 +41,7 @@ public: private: TQStringList m_mimeTypes; - KListBox *m_filterList; + TDEListBox *m_filterList; }; #endif diff --git a/lib/kofficecore/KoMainWindow.cpp b/lib/kofficecore/KoMainWindow.cpp index 12e0013d..f013ca36 100644 --- a/lib/kofficecore/KoMainWindow.cpp +++ b/lib/kofficecore/KoMainWindow.cpp @@ -144,16 +144,16 @@ public: TQLabel * statusBarLabel; KProgress *m_progress; - TQPtrList<KAction> m_splitViewActionList; + TQPtrList<TDEAction> m_splitViewActionList; // This additional list is needed, because we don't plug // the first list, when an embedded view gets activated (Werner) - TQPtrList<KAction> m_veryHackyActionList; + TQPtrList<TDEAction> m_veryHackyActionList; TQSplitter *m_splitter; - KSelectAction *m_orientation; - KAction *m_removeView; + TDESelectAction *m_orientation; + TDEAction *m_removeView; KoMainWindowIface *m_dcopObject; - TQPtrList <KAction> m_toolbarList; + TQPtrList <TDEAction> m_toolbarList; bool bMainWindowGUIBuilt; bool m_splitted; @@ -161,17 +161,17 @@ public: bool m_firstTime; bool m_windowSizeDirty; - KAction *m_paDocInfo; - KAction *m_paSave; - KAction *m_paSaveAs; - KAction *m_paPrint; - KAction *m_paPrintPreview; - KAction *m_sendfile; - KAction *m_paCloseFile; - KAction *m_reloadfile; - KAction *m_versionsfile; - KAction *m_importFile; - KAction *m_exportFile; + TDEAction *m_paDocInfo; + TDEAction *m_paSave; + TDEAction *m_paSaveAs; + TDEAction *m_paPrint; + TDEAction *m_paPrintPreview; + TDEAction *m_sendfile; + TDEAction *m_paCloseFile; + TDEAction *m_reloadfile; + TDEAction *m_versionsfile; + TDEAction *m_importFile; + TDEAction *m_exportFile; bool m_isImporting; bool m_isExporting; @@ -217,24 +217,24 @@ KoMainWindow::KoMainWindow( TDEInstance *instance, const char* name ) d->m_paCloseFile = KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT( slotFileClose() ), actionCollection(), "file_close" ); KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( slotFileQuit() ), actionCollection(), "file_quit" ); - d->m_reloadfile = new KAction( i18n( "Reload"), 0, + d->m_reloadfile = new TDEAction( i18n( "Reload"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotReloadFile() ), actionCollection(), "file_reload_file"); - d->m_versionsfile = new KAction( i18n( "Versions..."), 0, + d->m_versionsfile = new TDEAction( i18n( "Versions..."), 0, TQT_TQOBJECT(this), TQT_SLOT( slotVersionsFile() ), actionCollection(), "file_versions_file"); - d->m_importFile = new KAction( i18n( "I&mport..." ), 0, // clashing accel key :( + d->m_importFile = new TDEAction( i18n( "I&mport..." ), 0, // clashing accel key :( TQT_TQOBJECT(this), TQT_SLOT( slotImportFile() ), actionCollection(), "file_import_file"); - d->m_exportFile = new KAction( i18n( "E&xport..." ), 0, + d->m_exportFile = new TDEAction( i18n( "E&xport..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotExportFile() ), actionCollection(), "file_export_file"); /* The following entry opens the document information dialog. Since the action is named so it intends to show data this entry should not have a trailing ellipses (...). */ - d->m_paDocInfo = new KAction( i18n( "&Document Information" ), "documentinfo", 0, + d->m_paDocInfo = new TDEAction( i18n( "&Document Information" ), "documentinfo", 0, TQT_TQOBJECT(this), TQT_SLOT( slotDocumentInfo() ), actionCollection(), "file_documentinfo" ); @@ -259,20 +259,20 @@ KoMainWindow::KoMainWindow( TDEInstance *instance, const char* name ) new KKbdAccessExtensions(this, "mw-panelSizer"); // set up the action "list" for "Close all Views" (hacky :) (Werner) d->m_veryHackyActionList.append( - new KAction(i18n("&Close All Views"), "fileclose", + new TDEAction(i18n("&Close All Views"), "fileclose", "ctrl+shift+w", TQT_TQOBJECT(this), TQT_SLOT(slotCloseAllViews()), actionCollection(), "view_closeallviews") ); // set up the action list for the splitter stuff - d->m_splitViewActionList.append(new KAction(i18n("&Split View"), "view_split", 0, + d->m_splitViewActionList.append(new TDEAction(i18n("&Split View"), "view_split", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSplitView()), actionCollection(), "view_split")); - d->m_removeView=new KAction(i18n("&Remove View"), "view_remove", 0, + d->m_removeView=new TDEAction(i18n("&Remove View"), "view_remove", 0, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveView()), actionCollection(), "view_rm_splitter"); d->m_splitViewActionList.append(d->m_removeView); d->m_removeView->setEnabled(false); - d->m_orientation=new KSelectAction(i18n("Splitter &Orientation"), "view_orientation", 0, + d->m_orientation=new TDESelectAction(i18n("Splitter &Orientation"), "view_orientation", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetOrientation()), actionCollection(), "view_splitter_orientation"); TQStringList items; @@ -281,7 +281,7 @@ KoMainWindow::KoMainWindow( TDEInstance *instance, const char* name ) d->m_orientation->setItems(items); d->m_orientation->setCurrentItem(static_cast<int>(d->m_splitter->orientation())); d->m_splitViewActionList.append(d->m_orientation); - d->m_splitViewActionList.append(new KActionSeparator(TQT_TQOBJECT(this))); + d->m_splitViewActionList.append(new TDEActionSeparator(TQT_TQOBJECT(this))); // Load list of recent files TDEConfig * config = instance ? instance->config() : TDEGlobal::config(); @@ -448,10 +448,10 @@ void KoMainWindow::addRecentURL( const KURL& url ) if ( path.contains( *it ) ) ok = false; // it's in the tmp resource if ( ok ) - KRecentDocument::add(path); + TDERecentDocument::add(path); } else - KRecentDocument::add(url.url(-1), true); + TDERecentDocument::add(url.url(-1), true); if ( ok ) m_recent->addURL( url ); @@ -466,12 +466,12 @@ void KoMainWindow::saveRecentFiles() kdDebug(30003) << this << " Saving recent files list into config. instance()=" << instance() << endl; m_recent->saveEntries( config ); config->sync(); - if (KMainWindow::memberList) + if (TDEMainWindow::memberList) { // Tell all windows to reload their list, after saving // Doesn't work multi-process, but it's a start - KMainWindow *window = KMainWindow::memberList->first(); - for (; window; window = KMainWindow::memberList->next()) + TDEMainWindow *window = TDEMainWindow::memberList->first(); + for (; window; window = TDEMainWindow::memberList->next()) static_cast<KoMainWindow *>(window)->reloadRecentFileList(); } } @@ -1000,7 +1000,7 @@ void KoMainWindow::saveWindowSettings() //kdDebug(30003) << "KoMainWindow::closeEvent -> saveMainWindowSettings rootdoc's instance=" << rootDocument()->instance()->instanceName() << endl; saveMainWindowSettings( TDEGlobal::config(), rootDocument()->instance()->instanceName() ); TDEGlobal::config()->sync(); - resetAutoSaveSettings(); // Don't let KMainWindow override the good stuff we wrote down + resetAutoSaveSettings(); // Don't let TDEMainWindow override the good stuff we wrote down } } @@ -1306,7 +1306,7 @@ void KoMainWindow::slotToolbarToggled( bool toggle ) { //kdDebug(30003) << "KoMainWindow::slotToolbarToggled " << sender()->name() << " toggle=" << true << endl; // The action (sender) and the toolbar have the same name - KToolBar * bar = toolBar( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() ); + TDEToolBar * bar = toolBar( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() ); if (bar) { if (toggle) @@ -1341,12 +1341,12 @@ void KoMainWindow::showToolbar( const char * tbName, bool shown ) tb->hide(); // Update the action appropriately - TQPtrListIterator<KAction> it( d->m_toolbarList ); + TQPtrListIterator<TDEAction> it( d->m_toolbarList ); for ( ; it.current() ; ++it ) if ( !strcmp( it.current()->name(), tbName ) ) { //kdDebug(30003) << "KoMainWindow::showToolbar setChecked " << shown << endl; - static_cast<KToggleAction *>(it.current())->setChecked( shown ); + static_cast<TDEToggleAction *>(it.current())->setChecked( shown ); break; } } @@ -1521,15 +1521,15 @@ void KoMainWindow::slotActivePartChanged( KParts::Part *newPart ) setAutoSaveSettings( newPart->instance()->instanceName(), false ); // Create and plug toolbar list for Settings menu - //TQPtrListIterator<KToolBar> it = toolBarIterator(); + //TQPtrListIterator<TDEToolBar> it = toolBarIterator(); TQPtrList<TQWidget> toolBarList = factory->containers( "ToolBar" ); TQPtrListIterator<TQWidget> it( toolBarList ); for ( ; it.current() ; ++it ) { - if ( it.current()->inherits("KToolBar") ) + if ( it.current()->inherits("TDEToolBar") ) { - KToolBar * tb = static_cast<KToolBar *>(it.current()); - KToggleAction * act = new KToggleAction( i18n("Show %1 Toolbar").arg( tb->text() ), 0, + TDEToolBar * tb = static_cast<TDEToolBar *>(it.current()); + TDEToggleAction * act = new TDEToggleAction( i18n("Show %1 Toolbar").arg( tb->text() ), 0, actionCollection(), tb->name() ); act->setCheckedState(i18n("Hide %1 Toolbar").arg( tb->text() )); connect( act, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(this), TQT_SLOT( slotToolbarToggled( bool ) ) ); diff --git a/lib/kofficecore/KoMainWindow.h b/lib/kofficecore/KoMainWindow.h index 6310deda..81dcd587 100644 --- a/lib/kofficecore/KoMainWindow.h +++ b/lib/kofficecore/KoMainWindow.h @@ -30,7 +30,7 @@ class TQLabel; class KoView; class KoMainWindowPrivate; class KURL; -class KRecentFilesAction; +class TDERecentFilesAction; class KoFilterManager; class DCOPObject; @@ -354,7 +354,7 @@ protected: // protected methods are mostly for koshell, it's the only one derivi */ void saveRecentFiles(); - KRecentFilesAction *recentAction() const { return m_recent; } + TDERecentFilesAction *recentAction() const { return m_recent; } private: @@ -368,7 +368,7 @@ private: void saveWindowSettings(); - KRecentFilesAction *m_recent; + TDERecentFilesAction *m_recent; protected slots: virtual void slotActivePartChanged( KParts::Part *newPart ); diff --git a/lib/kofficecore/KoMainWindowIface.cc b/lib/kofficecore/KoMainWindowIface.cc index 6d38fae0..08b3fdaa 100644 --- a/lib/kofficecore/KoMainWindowIface.cc +++ b/lib/kofficecore/KoMainWindowIface.cc @@ -46,9 +46,9 @@ DCOPRef KoMainWindowIface::action( const TQCString &name ) QCStringList KoMainWindowIface::actions() { QCStringList res; - TQValueList<KAction *> lst = m_actionProxy->actions(); - TQValueList<KAction *>::ConstIterator it = lst.begin(); - TQValueList<KAction *>::ConstIterator end = lst.end(); + TQValueList<TDEAction *> lst = m_actionProxy->actions(); + TQValueList<TDEAction *>::ConstIterator it = lst.begin(); + TQValueList<TDEAction *>::ConstIterator end = lst.end(); for (; it != end; ++it ) res.append( (*it)->name() ); diff --git a/lib/kofficecore/KoOpenPane.cpp b/lib/kofficecore/KoOpenPane.cpp index 5d23b113..4a2872c6 100644 --- a/lib/kofficecore/KoOpenPane.cpp +++ b/lib/kofficecore/KoOpenPane.cpp @@ -48,7 +48,7 @@ class KoSectionListItem : public TQListViewItem { public: - KoSectionListItem(KListView* listView, const TQString& name, int sortWeight, int widgetIndex = -1) + KoSectionListItem(TDEListView* listView, const TQString& name, int sortWeight, int widgetIndex = -1) : TQListViewItem(listView, name), m_sortWeight(sortWeight), m_widgetIndex(widgetIndex) { } diff --git a/lib/kofficecore/KoOpenPane.h b/lib/kofficecore/KoOpenPane.h index 0efad845..d9d3b43d 100644 --- a/lib/kofficecore/KoOpenPane.h +++ b/lib/kofficecore/KoOpenPane.h @@ -29,7 +29,7 @@ class KoTemplateGroup; class KoOpenPanePrivate; class TDEInstance; class TQPixmap; -class KListViewItem; +class TDEListViewItem; class KoTemplatesPane; class KoDetailsPaneBase; diff --git a/lib/kofficecore/KoView.cpp b/lib/kofficecore/KoView.cpp index 7e4045a8..b78b937c 100644 --- a/lib/kofficecore/KoView.cpp +++ b/lib/kofficecore/KoView.cpp @@ -132,11 +132,11 @@ KoView::KoView( KoDocument *document, TQWidget *parent, const char *name ) actionCollection()->setWidget( this ); setupGlobalActions(); - KActionCollection *coll = actionCollection(); + TDEActionCollection *coll = actionCollection(); /**** not needed anymore, according to David (Werner) - TQValueList<KAction*> docActions = document->actionCollection()->actions(); - TQValueList<KAction*>::ConstIterator it = docActions.begin(); - TQValueList<KAction*>::ConstIterator end = docActions.end(); + TQValueList<TDEAction*> docActions = document->actionCollection()->actions(); + TQValueList<TDEAction*>::ConstIterator it = docActions.begin(); + TQValueList<TDEAction*>::ConstIterator end = docActions.end(); for (; it != end; ++it ) coll->insert( *it ); */ @@ -217,12 +217,12 @@ KParts::PartManager *KoView::partManager() const return d->m_manager; } -KAction *KoView::action( const TQDomElement &element ) const +TDEAction *KoView::action( const TQDomElement &element ) const { static const TQString &attrName = TDEGlobal::staticQString( "name" ); TQString name = element.attribute( attrName ); - KAction *act = KXMLGUIClient::action( name.utf8() ); + TDEAction *act = KXMLGUIClient::action( name.utf8() ); if ( !act ) act = d->m_doc->KXMLGUIClient::action( name.utf8() ); @@ -626,7 +626,7 @@ void KoView::slotAutoScroll( ) void KoView::setupGlobalActions() { - actionNewView = new KAction( i18n( "&New View" ), "window_new", 0, + actionNewView = new TDEAction( i18n( "&New View" ), "window_new", 0, TQT_TQOBJECT(this), TQT_SLOT( newView() ), actionCollection(), "view_newview" ); } @@ -674,9 +674,9 @@ KoMainWindow * KoView::shell() const return dynamic_cast<KoMainWindow *>( topLevelWidget() ); } -KMainWindow * KoView::mainWindow() const +TDEMainWindow * KoView::mainWindow() const { - return dynamic_cast<KMainWindow *>( topLevelWidget() ); + return dynamic_cast<TDEMainWindow *>( topLevelWidget() ); } KStatusBar * KoView::statusBar() const diff --git a/lib/kofficecore/KoView.h b/lib/kofficecore/KoView.h index a0113e07..b53c339a 100644 --- a/lib/kofficecore/KoView.h +++ b/lib/kofficecore/KoView.h @@ -27,12 +27,12 @@ #include <KoChild.h> #include <koffice_export.h> -class KAction; -class KActionCollection; +class TDEAction; +class TDEActionCollection; class TQCustomEvent; class KoDocument; class KoMainWindow; -class KMainWindow; +class TDEMainWindow; class KoViewPrivate; class KoViewChild; class KoFrame; @@ -101,7 +101,7 @@ public: /** * Returns the action described action object. In fact only the "name" attribute * of @p element is of interest here. The method searches in the - * KActionCollection of this view. + * TDEActionCollection of this view. * * Please notice that KoView indirectly inherits KXMLGUIClient. * @@ -109,7 +109,7 @@ public: * @see KXMLGUIClient::actionCollection * @see KoDocument::action */ - virtual KAction *action( const TQDomElement &element ) const; + virtual TDEAction *action( const TQDomElement &element ) const; /** * Retrieves the document that is hit. This can be an embedded document. @@ -321,10 +321,10 @@ public: KoMainWindow * shell() const; /** - * @return the KMainWindow in which this view is currently. + * @return the TDEMainWindow in which this view is currently. * This one should never return 0L, in a KDE app. */ - KMainWindow* mainWindow() const; + TDEMainWindow* mainWindow() const; /** * @return the statusbar of the KoMainWindow in which this view is currently. @@ -461,7 +461,7 @@ protected slots: virtual void slotAutoScroll( ); private: - KAction *actionNewView; + TDEAction *actionNewView; virtual void setupGlobalActions( void ); KoViewPrivate *d; int autoScrollAcceleration( int offset ) const; diff --git a/lib/kofficecore/KoViewIface.cc b/lib/kofficecore/KoViewIface.cc index 468a677e..df6eaa31 100644 --- a/lib/kofficecore/KoViewIface.cc +++ b/lib/kofficecore/KoViewIface.cc @@ -61,9 +61,9 @@ DCOPRef KoViewIface::action( const TQCString &name ) QCStringList KoViewIface::actions() { QCStringList res; - TQValueList<KAction *> lst = m_actionProxy->actions(); - TQValueList<KAction *>::ConstIterator it = lst.begin(); - TQValueList<KAction *>::ConstIterator end = lst.end(); + TQValueList<TDEAction *> lst = m_actionProxy->actions(); + TQValueList<TDEAction *>::ConstIterator it = lst.begin(); + TQValueList<TDEAction *>::ConstIterator end = lst.end(); for (; it != end; ++it ) res.append( (*it)->name() ); diff --git a/lib/kofficecore/Koversiondialog.cpp b/lib/kofficecore/Koversiondialog.cpp index 188d5888..eec3c41e 100644 --- a/lib/kofficecore/Koversiondialog.cpp +++ b/lib/kofficecore/Koversiondialog.cpp @@ -46,7 +46,7 @@ KoVersionDialog::KoVersionDialog( TQWidget* parent, const char* name ) TQGridLayout *grid1 = new TQGridLayout( page,10,3,KDialog::marginHint(), KDialog::spacingHint()); - list=new KListView(page, "versionlist"); + list=new TDEListView(page, "versionlist"); list->addColumn(i18n("Date & Time")); list->addColumn(i18n("Saved By")); list->addColumn(i18n("Comment")); diff --git a/lib/kofficecore/Koversiondialog.h b/lib/kofficecore/Koversiondialog.h index 0827b929..9bf930a2 100644 --- a/lib/kofficecore/Koversiondialog.h +++ b/lib/kofficecore/Koversiondialog.h @@ -24,7 +24,7 @@ class TQPushButton; class TQToolButton; -class KListView; +class TDEListView; class TQMultiLineEdit; class KoVersionDialog : public KDialogBase @@ -47,7 +47,7 @@ protected: void init(); void updateButton(); - KListView * list; + TDEListView * list; TQPushButton* m_pRemove; TQPushButton* m_pAdd; TQPushButton* m_pOpen; diff --git a/lib/kofficecore/kkbdaccessextensions.cpp b/lib/kofficecore/kkbdaccessextensions.cpp index 0652b742..407ebe4a 100644 --- a/lib/kofficecore/kkbdaccessextensions.cpp +++ b/lib/kofficecore/kkbdaccessextensions.cpp @@ -122,7 +122,7 @@ class KKbdAccessExtensionsPrivate ~KKbdAccessExtensionsPrivate() { delete icon; - // TODO: This crashes, but should delete in the event that KMainWindow is not deleted. + // TODO: This crashes, but should delete in the event that TDEMainWindow is not deleted. if (accessKeyLabels) { accessKeyLabels->setAutoDelete(false); delete accessKeyLabels; @@ -130,11 +130,11 @@ class KKbdAccessExtensionsPrivate } // Action that starts panel sizing (defaults to F8), forward and reverse; - KAction* fwdAction; - KAction* revAction; + TDEAction* fwdAction; + TDEAction* revAction; // Action that starts access keys. - KAction* accessKeysAction; + TDEAction* accessKeysAction; // The splitter or dockwindow currently being sized. If 0, sizing is not in progress. TQWidget* panel; @@ -153,21 +153,21 @@ class KKbdAccessExtensionsPrivate // List of the access key TQLabels. If not 0, access keys are onscreen. TQPtrList<TQLabel>* accessKeyLabels; - // Pointer to the KMainWindow. - KMainWindow* mainWindow; + // Pointer to the TDEMainWindow. + TDEMainWindow* mainWindow; }; -KKbdAccessExtensions::KKbdAccessExtensions(KMainWindow* parent, const char* name) : +KKbdAccessExtensions::KKbdAccessExtensions(TDEMainWindow* parent, const char* name) : TQObject(parent, name) { // kdDebug() << "KKbdAccessExtensions::KKbdAccessExtensions: running." << endl; d = new KKbdAccessExtensionsPrivate; d->mainWindow = parent; - d->fwdAction = new KAction(i18n("Resize Panel Forward"), KShortcut("F8"), + d->fwdAction = new TDEAction(i18n("Resize Panel Forward"), TDEShortcut("F8"), 0, 0, parent->actionCollection(), "resize_panel_forward"); - d->revAction = new KAction(i18n("Resize Panel Reverse"), KShortcut("Shift+F8"), + d->revAction = new TDEAction(i18n("Resize Panel Reverse"), TDEShortcut("Shift+F8"), 0, 0, parent->actionCollection(), "resize_panel_reverse"); - d->accessKeysAction = new KAction(i18n("Access Keys"), KShortcut("Alt+F8"), + d->accessKeysAction = new TDEAction(i18n("Access Keys"), TDEShortcut("Alt+F8"), 0, 0, parent->actionCollection(), "access_keys"); // "Disable" the shortcuts so we can see them in eventFilter. d->fwdAction->setEnabled(false); @@ -193,15 +193,15 @@ bool KKbdAccessExtensions::eventFilter( TQObject *o, TQEvent *e ) if ( e->type() == TQEvent::KeyPress ) { // TODO: This permits only a single-key shortcut. For example, Alt+S,R would not work. // If user configures a multi-key shortcut, it is undefined what will happen here. - // It would be better to handle these as KShortcut activate() signals, but the problem - // is that once a TQDockWindow is undocked and has focus, the KShortcut activate() signals + // It would be better to handle these as TDEShortcut activate() signals, but the problem + // is that once a TQDockWindow is undocked and has focus, the TDEShortcut activate() signals // don't fire anymore. - KShortcut fwdSc = d->fwdAction->shortcut(); - KShortcut revSc = d->revAction->shortcut(); - KShortcut accessKeysSc = d->accessKeysAction->shortcut(); + TDEShortcut fwdSc = d->fwdAction->shortcut(); + TDEShortcut revSc = d->revAction->shortcut(); + TDEShortcut accessKeysSc = d->accessKeysAction->shortcut(); TQKeyEvent* kev = dynamic_cast<TQKeyEvent *>(e); KKey k = KKey(kev); - KShortcut sc = KShortcut(k); + TDEShortcut sc = TDEShortcut(k); // kdDebug() << "KKbdAccessExtensions::eventFilter: Key press " << sc << endl; if (!d->accessKeyLabels) { if (sc == fwdSc) { @@ -555,10 +555,10 @@ void KKbdAccessExtensions::displayAccessKeys() while( (client=it.current()) !=0 ) { ++it; - KActionPtrList actions = client->actionCollection()->actions(); + TDEActionPtrList actions = client->actionCollection()->actions(); for (int j = 0; j < (int)actions.count(); j++) { - KAction* action = actions[j]; - KShortcut sc = action->shortcut(); + TDEAction* action = actions[j]; + TDEShortcut sc = action->shortcut(); for (int i = 0; i < (int)sc.count(); i++) { KKeySequence seq = sc.seq(i); if (seq.count() == 1) { diff --git a/lib/kofficecore/kkbdaccessextensions.h b/lib/kofficecore/kkbdaccessextensions.h index 46b99b2f..2aa64c74 100644 --- a/lib/kofficecore/kkbdaccessextensions.h +++ b/lib/kofficecore/kkbdaccessextensions.h @@ -32,7 +32,7 @@ class KKbdAccessExtensionsPrivate; class TQWidgetList; -class KMainWindow; +class TDEMainWindow; /** KKbdAccessExtensions is an object that improves accessibility for motor impaired users * who may not be able to easily use a mouse. It adds two new capabilities using the keyboard: @@ -98,7 +98,7 @@ class KMainWindow; * * @section notes Notes * -* The F8, Shift+F8, and Alt+F8 keys are KShortcuts and therefore user may choose different keys in +* The F8, Shift+F8, and Alt+F8 keys are TDEShortcuts and therefore user may choose different keys in * the application's Configure Shortcuts dialog. * * @note At present, these shortcuts may not be multi-key. If user sets multi-key @@ -114,10 +114,10 @@ class KOFFICECORE_EXPORT KKbdAccessExtensions : public TQObject public: /** Constructor. - * @param parent KMainWindow of the application. Required. + * @param parent TDEMainWindow of the application. Required. * @param name (optional) Name of this object. */ - KKbdAccessExtensions(KMainWindow* parent, const char* name = 0); + KKbdAccessExtensions(TDEMainWindow* parent, const char* name = 0); /** Destructor. */ virtual ~KKbdAccessExtensions(); diff --git a/lib/kofficecore/koDetailsPaneBase.ui b/lib/kofficecore/koDetailsPaneBase.ui index 0b64d5eb..a34d3116 100644 --- a/lib/kofficecore/koDetailsPaneBase.ui +++ b/lib/kofficecore/koDetailsPaneBase.ui @@ -29,7 +29,7 @@ <property name="orientation"> <enum>Horizontal</enum> </property> - <widget class="KListView"> + <widget class="TDEListView"> <column> <property name="text"> <string></string> diff --git a/lib/kofficecore/koDocumentInfoUserMetadataWidget.ui b/lib/kofficecore/koDocumentInfoUserMetadataWidget.ui index bc650f10..35cd7b2a 100644 --- a/lib/kofficecore/koDocumentInfoUserMetadataWidget.ui +++ b/lib/kofficecore/koDocumentInfoUserMetadataWidget.ui @@ -19,7 +19,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="KListView" row="0" column="0"> + <widget class="TDEListView" row="0" column="0"> <property name="name"> <cstring>metaListView</cstring> </property> diff --git a/lib/kofficecore/koOpenPaneBase.ui b/lib/kofficecore/koOpenPaneBase.ui index c0076afa..dcc563b1 100644 --- a/lib/kofficecore/koOpenPaneBase.ui +++ b/lib/kofficecore/koOpenPaneBase.ui @@ -34,7 +34,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="KListView"> + <widget class="TDEListView"> <column> <property name="text"> <string></string> diff --git a/lib/kofficeui/KoCommandHistory.cpp b/lib/kofficeui/KoCommandHistory.cpp index 2b5824ed..c0c81596 100644 --- a/lib/kofficeui/KoCommandHistory.cpp +++ b/lib/kofficeui/KoCommandHistory.cpp @@ -84,14 +84,14 @@ KoCommandHistory::KoCommandHistory() : clear(); } -KoCommandHistory::KoCommandHistory(KActionCollection * actionCollection, bool withMenus) : +KoCommandHistory::KoCommandHistory(TDEActionCollection * actionCollection, bool withMenus) : m_undoLimit(50), m_redoLimit(30), m_first(false) { d=new KoCommandHistoryPrivate(); if (withMenus) { - KToolBarPopupAction * undo = new KToolBarPopupAction( i18n("&Undo"), "undo", - KStdAccel::undo(), this, TQT_SLOT( undo() ), + TDEToolBarPopupAction * undo = new TDEToolBarPopupAction( i18n("&Undo"), "undo", + TDEStdAccel::undo(), this, TQT_SLOT( undo() ), actionCollection, /*KStdAction::stdName( KStdAction::Undo )*/"koffice_undo" ); connect( undo->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotUndoAboutToShow() ) ); connect( undo->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotUndoActivated( int ) ) ); @@ -109,8 +109,8 @@ KoCommandHistory::KoCommandHistory(KActionCollection * actionCollection, bool wi connect( d->m_undoListBox, TQT_SIGNAL( changeNumberOfSelectedItem( int )), this, TQT_SLOT( slotChangeUndoNumberOfSelectedItem( int ))); - KToolBarPopupAction * redo = new KToolBarPopupAction( i18n("&Redo"), "redo", - KStdAccel::redo(), this, TQT_SLOT( redo() ), + TDEToolBarPopupAction * redo = new TDEToolBarPopupAction( i18n("&Redo"), "redo", + TDEStdAccel::redo(), this, TQT_SLOT( redo() ), actionCollection, /*KStdAction::stdName( KStdAction::Redo )*/ "koffice_redo"); connect( redo->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotRedoAboutToShow() ) ); diff --git a/lib/kofficeui/KoCommandHistory.h b/lib/kofficeui/KoCommandHistory.h index 554b4b19..02af7c80 100644 --- a/lib/kofficeui/KoCommandHistory.h +++ b/lib/kofficeui/KoCommandHistory.h @@ -26,8 +26,8 @@ #include <tqobject.h> #include <koffice_export.h> -class KAction; -class KActionCollection; +class TDEAction; +class TDEActionCollection; class TQPopupMenu; class KCommand; #include <tqlistbox.h> @@ -76,7 +76,7 @@ public: * @param withMenus if true, the actions will display a menu when plugged * into a toolbar. */ - KoCommandHistory(KActionCollection *actionCollection, bool withMenus = true); + KoCommandHistory(TDEActionCollection *actionCollection, bool withMenus = true); /** * Destructs the command history object. @@ -133,12 +133,12 @@ public: public slots: /** * Undoes the last action. - * Call this if you don't use the builtin KActions. + * Call this if you don't use the builtin TDEActions. */ virtual void undo(); /** * Redoes the last undone action. - * Call this if you don't use the builtin KActions. + * Call this if you don't use the builtin TDEActions. */ virtual void redo(); /** @@ -186,7 +186,7 @@ private: void clipCommands(); // ensures that the limits are kept TQPtrList<KCommand> m_commands; - KAction *m_undo, *m_redo; + TDEAction *m_undo, *m_redo; TQPopupMenu *m_undoPopup, *m_redoPopup; int m_undoLimit, m_redoLimit; bool m_first; // attention: it's the first command in the list! diff --git a/lib/kofficeui/KoContextCelp.cpp b/lib/kofficeui/KoContextCelp.cpp index 8e129f98..e6ae509d 100644 --- a/lib/kofficeui/KoContextCelp.cpp +++ b/lib/kofficeui/KoContextCelp.cpp @@ -507,8 +507,8 @@ void KoContextHelpPopup::keyReleaseEvent( TQKeyEvent* e ) } } // KoContextHelpPopup::keyPressEvent -KoContextHelpAction::KoContextHelpAction( KActionCollection* parent, TQWidget* /*popupParent*/ ) - : KToggleAction( i18n( "Context Help" ), BarIcon( "help" ), KShortcut( "CTRL+SHIFT+F1" ), 0, 0, parent, "help_context" ) +KoContextHelpAction::KoContextHelpAction( TDEActionCollection* parent, TQWidget* /*popupParent*/ ) + : TDEToggleAction( i18n( "Context Help" ), BarIcon( "help" ), TDEShortcut( "CTRL+SHIFT+F1" ), 0, 0, parent, "help_context" ) { m_popup = new KoContextHelpPopup( 0L ); connect( m_popup, TQT_SIGNAL( wantsToBeClosed() ), this, TQT_SLOT( closePopup() ) ); diff --git a/lib/kofficeui/KoContextCelp.h b/lib/kofficeui/KoContextCelp.h index 9e466677..2776d409 100644 --- a/lib/kofficeui/KoContextCelp.h +++ b/lib/kofficeui/KoContextCelp.h @@ -214,13 +214,13 @@ class KoContextHelpPopup : public TQWidget * This action displays on demand a context help in a popup. * The context help is set by the updateHelp slot. */ -class KOFFICEUI_EXPORT KoContextHelpAction : public KToggleAction +class KOFFICEUI_EXPORT KoContextHelpAction : public TDEToggleAction { Q_OBJECT public: - KoContextHelpAction( KActionCollection* parentCollection, TQWidget* parent = 0 ); + KoContextHelpAction( TDEActionCollection* parentCollection, TQWidget* parent = 0 ); virtual ~KoContextHelpAction(); public slots: diff --git a/lib/kofficeui/KoGuides.cpp b/lib/kofficeui/KoGuides.cpp index 870fddc6..61200fbe 100644 --- a/lib/kofficeui/KoGuides.cpp +++ b/lib/kofficeui/KoGuides.cpp @@ -36,7 +36,7 @@ #include "KoGuideLineDia.h" -class KoGuides::Popup : public KPopupMenu +class KoGuides::Popup : public TDEPopupMenu { public: Popup( KoGuides * guides ) diff --git a/lib/kofficeui/KoInsertLink.cpp b/lib/kofficeui/KoInsertLink.cpp index 098a4880..e3fd77cc 100644 --- a/lib/kofficeui/KoInsertLink.cpp +++ b/lib/kofficeui/KoInsertLink.cpp @@ -466,7 +466,7 @@ fileLinkPage::fileLinkPage( TQWidget *parent , char *name ) recentFile->setMaximumWidth( kapp->desktop()->width()*3/4 ); lay2->addWidget(recentFile); - TQStringList fileList = KRecentDocument::recentDocuments(); + TQStringList fileList = TDERecentDocument::recentDocuments(); TQStringList lst; lst <<""; for (TQStringList::ConstIterator it = fileList.begin();it != fileList.end(); ++it) diff --git a/lib/kofficeui/KoPartSelectAction.cpp b/lib/kofficeui/KoPartSelectAction.cpp index 17bda1e3..2077b31d 100644 --- a/lib/kofficeui/KoPartSelectAction.cpp +++ b/lib/kofficeui/KoPartSelectAction.cpp @@ -22,14 +22,14 @@ #include <kdebug.h> KoPartSelectAction::KoPartSelectAction( const TQString& text, TQObject* parent, const char* name ) - : KActionMenu( text, parent, name ) + : TDEActionMenu( text, parent, name ) { init(); } KoPartSelectAction::KoPartSelectAction( const TQString& text, const TQString& icon, TQObject* parent, const char* name ) - : KActionMenu( text, icon, parent, name ) + : TDEActionMenu( text, icon, parent, name ) { init(); } @@ -37,7 +37,7 @@ KoPartSelectAction::KoPartSelectAction( const TQString& text, const TQString& ic KoPartSelectAction::KoPartSelectAction( const TQString& text, const TQString& icon, TQObject* receiver, const char* slot, TQObject* parent, const char* name ) - : KActionMenu( text, icon, parent, name ) + : TDEActionMenu( text, icon, parent, name ) { if (receiver) connect( this, TQT_SIGNAL( activated() ), receiver, slot ); @@ -52,7 +52,7 @@ void KoPartSelectAction::init() for( ; it != m_lstEntries.end(); ++it ) { KService::Ptr serv = (*it).service(); if (!serv->genericName().isEmpty()) { - KAction *action = new KAction( serv->genericName().replace('&',"&&"), serv->icon(), 0, + TDEAction *action = new TDEAction( serv->genericName().replace('&',"&&"), serv->icon(), 0, this, TQT_SLOT( slotActionActivated() ), parentCollection(), serv->name().latin1() ); insert( action ); diff --git a/lib/kofficeui/KoPartSelectAction.h b/lib/kofficeui/KoPartSelectAction.h index 2bfc119e..7f38617d 100644 --- a/lib/kofficeui/KoPartSelectAction.h +++ b/lib/kofficeui/KoPartSelectAction.h @@ -27,7 +27,7 @@ * In a toolbar it presents itself as a button that opens the part-select dialog, * but in a popupmenu it presents itself as a submenu with all available parts. */ -class KOFFICEUI_EXPORT KoPartSelectAction : public KActionMenu +class KOFFICEUI_EXPORT KoPartSelectAction : public TDEActionMenu { Q_OBJECT diff --git a/lib/kofficeui/KoSelectAction.cpp b/lib/kofficeui/KoSelectAction.cpp index 171c455b..eb308452 100644 --- a/lib/kofficeui/KoSelectAction.cpp +++ b/lib/kofficeui/KoSelectAction.cpp @@ -37,7 +37,7 @@ class KoSelectAction::KoSelectActionPrivate public: KoSelectActionPrivate() { - m_popup = new KPopupMenu(0L,"KoLineStyleAction::popup"); + m_popup = new TDEPopupMenu(0L,"KoLineStyleAction::popup"); m_currentSelection = 0; } @@ -47,12 +47,12 @@ class KoSelectAction::KoSelectActionPrivate m_popup = 0; } - KPopupMenu* m_popup; + TDEPopupMenu* m_popup; int m_currentSelection; }; KoSelectAction::KoSelectAction(const TQString &text, const TQString& icon, - TQObject* parent, const char* name) : KAction(text, icon, 0, parent, name) + TQObject* parent, const char* name) : TDEAction(text, icon, 0, parent, name) { d = new KoSelectActionPrivate; setShowCurrentSelection(true); @@ -61,7 +61,7 @@ KoSelectAction::KoSelectAction(const TQString &text, const TQString& icon, } KoSelectAction::KoSelectAction(const TQString &text, const TQString& icon, const TQObject* receiver, - const char* slot, TQObject* parent, const char* name) : KAction(text, icon, 0, parent, name) + const char* slot, TQObject* parent, const char* name) : TDEAction(text, icon, 0, parent, name) { d = new KoSelectActionPrivate; @@ -74,7 +74,7 @@ KoSelectAction::~KoSelectAction() delete d; } -KPopupMenu* KoSelectAction::popupMenu() const +TDEPopupMenu* KoSelectAction::popupMenu() const { return d->m_popup; } @@ -86,10 +86,10 @@ void KoSelectAction::popup(const TQPoint& global) int KoSelectAction::plug(TQWidget* widget, int index) { - // This function is copied from KActionMenu::plug - if (kapp && !kapp->authorizeKAction(name())) + // This function is copied from TDEActionMenu::plug + if (kapp && !kapp->authorizeTDEAction(name())) return -1; - kdDebug(129) << "KAction::plug( " << widget << ", " << index << " )" << endl; // remove -- ellis + kdDebug(129) << "TDEAction::plug( " << widget << ", " << index << " )" << endl; // remove -- ellis if ( widget->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) ) { TQPopupMenu* menu = static_cast<TQPopupMenu*>( widget ); @@ -109,11 +109,11 @@ int KoSelectAction::plug(TQWidget* widget, int index) return containerCount() - 1; } - else if ( widget->inherits( "KToolBar" ) ) + else if ( widget->inherits( "TDEToolBar" ) ) { - KToolBar *bar = static_cast<KToolBar *>( widget ); + TDEToolBar *bar = static_cast<TDEToolBar *>( widget ); - int id_ = KAction::getToolButtonID(); + int id_ = TDEAction::getToolButtonID(); if ( icon().isEmpty() && !iconSet().isNull() ) { bar->insertButton( iconSet().pixmap(), id_, TQT_SIGNAL( clicked() ), this, diff --git a/lib/kofficeui/KoSelectAction.h b/lib/kofficeui/KoSelectAction.h index 4c0f65d3..7c0f5a25 100644 --- a/lib/kofficeui/KoSelectAction.h +++ b/lib/kofficeui/KoSelectAction.h @@ -21,14 +21,14 @@ #include <kaction.h> #include <koffice_export.h> -class KPopupMenu; +class TDEPopupMenu; class TQPoint; /** An action that provides a menu with items that can be selected. - * The main difference between this action and a KSelectAction is that + * The main difference between this action and a TDESelectAction is that * it is plugged into a toolbar as a dropdown menu and not as a combobox. */ -class KOFFICEUI_EXPORT KoSelectAction : public KAction +class KOFFICEUI_EXPORT KoSelectAction : public TDEAction { Q_OBJECT @@ -53,7 +53,7 @@ class KOFFICEUI_EXPORT KoSelectAction : public KAction ~KoSelectAction(); /** Returns a pointer to the popup menu. */ - KPopupMenu* popupMenu() const; + TDEPopupMenu* popupMenu() const; /** Shows the popup menu. * @param global Position at which the popup menu is shown. */ diff --git a/lib/kofficeui/KoTemplateChooseDia.cpp b/lib/kofficeui/KoTemplateChooseDia.cpp index 7fa49228..1bd11b36 100644 --- a/lib/kofficeui/KoTemplateChooseDia.cpp +++ b/lib/kofficeui/KoTemplateChooseDia.cpp @@ -223,7 +223,7 @@ KoTemplateChooseDia::~KoTemplateChooseDia() // Keep in sync with KoMainWindow::chooseNewDocument static bool cancelQuits() { bool onlyDoc = !KoDocument::documentList() || KoDocument::documentList()->count() <= 1; - bool onlyMainWindow = !KMainWindow::memberList || KMainWindow::memberList->count() <= 1; + bool onlyMainWindow = !TDEMainWindow::memberList || TDEMainWindow::memberList->count() <= 1; return onlyDoc && onlyMainWindow && kapp->instanceName() != "koshell"; // hack for koshell } diff --git a/lib/kofficeui/KoTemplateCreateDia.cpp b/lib/kofficeui/KoTemplateCreateDia.cpp index a42b580f..1d0fec2a 100644 --- a/lib/kofficeui/KoTemplateCreateDia.cpp +++ b/lib/kofficeui/KoTemplateCreateDia.cpp @@ -81,7 +81,7 @@ public: TQLabel *m_preview; TQString m_customFile; TQPixmap m_customPixmap; - KListView *m_groups; + TDEListView *m_groups; TQPushButton *m_add, *m_remove; TQCheckBox *m_defaultTemplate; TDEInstance *m_instance; @@ -120,7 +120,7 @@ KoTemplateCreateDia::KoTemplateCreateDia( const TQCString &templateType, TDEInst label=new TQLabel(i18n("Group:"), mainwidget); leftbox->addWidget(label); - d->m_groups=new KListView(mainwidget); + d->m_groups=new TDEListView(mainwidget); leftbox->addWidget(d->m_groups); d->m_groups->addColumn(""); d->m_groups->header()->hide(); diff --git a/lib/kofficeui/KoToolBox.cpp b/lib/kofficeui/KoToolBox.cpp index d266aaaa..12c8b06e 100644 --- a/lib/kofficeui/KoToolBox.cpp +++ b/lib/kofficeui/KoToolBox.cpp @@ -44,8 +44,8 @@ #include <config.h> #endif -KoToolBox::KoToolBox( KMainWindow *mainWin, const char* name, TDEInstance* instance, int numberOfTooltypes ) - : KToolBar( mainWin, TQt::DockLeft, false, name, true, true), m_instance(instance) +KoToolBox::KoToolBox( TDEMainWindow *mainWin, const char* name, TDEInstance* instance, int numberOfTooltypes ) + : TDEToolBar( mainWin, TQt::DockLeft, false, name, true, true), m_instance(instance) { setFullSize( false ); setMargin(2); @@ -83,7 +83,7 @@ void KoToolBox::slotButtonPressed( int id ) } -void KoToolBox::registerTool( KAction *tool, int toolType, TQ_UINT32 priority ) +void KoToolBox::registerTool( TDEAction *tool, int toolType, TQ_UINT32 priority ) { uint prio = priority; ToolList * tl = m_tools.at(toolType); @@ -122,7 +122,7 @@ void KoToolBox::setupTools() ToolList::Iterator it; for ( it = tl->begin(); it != tl->end(); ++it ) { - KAction *tool = it.data(); + TDEAction *tool = it.data(); if(! tool) continue; TQToolButton *bn = createButton(tools->getNextParent(), tool->icon().latin1(), tool->toolTip()); @@ -179,7 +179,7 @@ void KoToolBox::enableTools(bool enable) void KoToolBox::slotSetTool(const TQString & toolname) { for (uint i = 0; i < m_idToActionMap.count(); ++i) { - KAction * a = m_idToActionMap.at(i); + TDEAction * a = m_idToActionMap.at(i); if (!a || a->name() != toolname) continue; m_buttonGroup->setButton(i); diff --git a/lib/kofficeui/KoToolBox.h b/lib/kofficeui/KoToolBox.h index 25c9f1c4..93a82b34 100644 --- a/lib/kofficeui/KoToolBox.h +++ b/lib/kofficeui/KoToolBox.h @@ -26,15 +26,15 @@ #include <ktoolbar.h> class TQWidget; -class KAction; -class KMainWindow; +class TDEAction; +class TDEMainWindow; class KDualColorButton; class TQGridLayout; class ToolArea; /** - * KActionBox is a kind of super-specialized toolbox that can order + * TDEActionBox is a kind of super-specialized toolbox that can order * tools according to type and priority. * * This is to a large extent a port of the Karbon vtoolbox -- with @@ -42,21 +42,21 @@ class ToolArea; * tool-like class, it aggregates actions. */ -class KOFFICEUI_EXPORT KoToolBox : public KToolBar { +class KOFFICEUI_EXPORT KoToolBox : public TDEToolBar { Q_OBJECT public: - KoToolBox( KMainWindow *mainWin, const char* name, TDEInstance* instance, int numberOfTooltypes); + KoToolBox( TDEMainWindow *mainWin, const char* name, TDEInstance* instance, int numberOfTooltypes); virtual ~KoToolBox(); // Called by the toolcontroller for each tool. For every category, // there is a separate list, and the tool is categorized correctly. // The tool is not yet added to the widgets; call setupTools() // to do that. We don't store the tool. - void registerTool(KAction * tool, int toolType, TQ_UINT32 priority); + void registerTool(TDEAction * tool, int toolType, TQ_UINT32 priority); // Called when all tools have been added by the tool controller void setupTools(); @@ -84,10 +84,10 @@ private: TQPtrList<ToolArea> m_toolBoxes; // For every ToolArea - typedef TQMap< int, KAction*> ToolList; // The priority ordered list of tools for a certain tooltype + typedef TQMap< int, TDEAction*> ToolList; // The priority ordered list of tools for a certain tooltype TQPtrList<ToolList> m_tools; - TQPtrList<KAction> m_idToActionMap; // Map the buttongroup id's to actions for easy activating. + TQPtrList<TDEAction> m_idToActionMap; // Map the buttongroup id's to actions for easy activating. TDEInstance* m_instance; }; diff --git a/lib/kofficeui/KoTooluButton.cpp b/lib/kofficeui/KoTooluButton.cpp index cc04c714..ba08e1a1 100644 --- a/lib/kofficeui/KoTooluButton.cpp +++ b/lib/kofficeui/KoTooluButton.cpp @@ -647,14 +647,14 @@ void KoColorPopupProxy::slotMoreColors() KoToolButton::KoToolButton( const TQString& icon, int id, TQWidget* parent, const char* name, const TQString& txt, TDEInstance* _instance ) : - KToolBarButton( icon, id, parent, name, txt, _instance ), m_arrowPressed( false ) + TDEToolBarButton( icon, id, parent, name, txt, _instance ), m_arrowPressed( false ) { init(); } KoToolButton::KoToolButton( const TQPixmap& pixmap, int id, TQWidget* parent, const char* name, const TQString& txt ) : - KToolBarButton( pixmap, id, parent, name, txt ), m_arrowPressed( false ) + TDEToolBarButton( pixmap, id, parent, name, txt ), m_arrowPressed( false ) { init(); } @@ -670,7 +670,7 @@ TQSize KoToolButton::sizeHint() const TQSize KoToolButton::minimumSizeHint() const { - TQSize size = KToolBarButton::minimumSizeHint(); + TQSize size = TDEToolBarButton::minimumSizeHint(); size.setWidth( size.width() + ARROW_WIDTH ); return size; } @@ -695,7 +695,7 @@ void KoToolButton::drawButton(TQPainter *_painter) if ( isEnabled() ) { flags |= TQStyle::Style_Enabled; - if ( KToolBarButton::isRaised() || m_arrowPressed ) + if ( TDEToolBarButton::isRaised() || m_arrowPressed ) flags |= TQStyle::Style_Raised; } if ( isOn() ) @@ -723,7 +723,7 @@ void KoToolButton::drawButton(TQPainter *_painter) style().tqdrawPrimitive( TQStyle::PE_ArrowDown, _painter, TQRect( width() - ARROW_WIDTH - 1, 0, ARROW_WIDTH, height() ), cg, flags, opt ); - if ( KToolBarButton::isRaised() || m_arrowPressed ) + if ( TDEToolBarButton::isRaised() || m_arrowPressed ) qDrawShadeLine( _painter, width() - ARROW_WIDTH - 1, 0, width() - ARROW_WIDTH - 1, height() - 1, colorGroup(), true ); int dx, dy; @@ -732,9 +732,9 @@ void KoToolButton::drawButton(TQPainter *_painter) TQRect textRect; int textFlags = 0; - if ( static_cast<KToolBar::IconText>( iconTextMode() ) == KToolBar::IconOnly ) { // icon only + if ( static_cast<TDEToolBar::IconText>( iconTextMode() ) == TDEToolBar::IconOnly ) { // icon only TQPixmap pixmap = iconSet().pixmap( TQIconSet::Automatic, - isEnabled() ? ( KToolBarButton::isActive() ? TQIconSet::Active : TQIconSet::Normal ) : + isEnabled() ? ( TDEToolBarButton::isActive() ? TQIconSet::Active : TQIconSet::Normal ) : TQIconSet::Disabled, isOn() ? TQIconSet::On : TQIconSet::Off ); if ( !pixmap.isNull() ) { dx = ( width() - ARROW_WIDTH - pixmap.width() ) / 2; @@ -743,9 +743,9 @@ void KoToolButton::drawButton(TQPainter *_painter) _painter->drawPixmap( dx, dy, pixmap ); } } - else if ( static_cast<KToolBar::IconText>( iconTextMode() ) == KToolBar::IconTextRight ) { // icon and text (if any) + else if ( static_cast<TDEToolBar::IconText>( iconTextMode() ) == TDEToolBar::IconTextRight ) { // icon and text (if any) TQPixmap pixmap = iconSet().pixmap( TQIconSet::Automatic, - isEnabled() ? ( KToolBarButton::isActive() ? TQIconSet::Active : TQIconSet::Normal ) : + isEnabled() ? ( TDEToolBarButton::isActive() ? TQIconSet::Active : TQIconSet::Normal ) : TQIconSet::Disabled, isOn() ? TQIconSet::On : TQIconSet::Off ); if( !pixmap.isNull()) { dx = 4; @@ -765,7 +765,7 @@ void KoToolButton::drawButton(TQPainter *_painter) textRect = TQRect( dx, dy, width() - dx, height() ); } } - else if ( static_cast<KToolBar::IconText>( iconTextMode() ) == KToolBar::TextOnly ) { + else if ( static_cast<TDEToolBar::IconText>( iconTextMode() ) == TDEToolBar::TextOnly ) { if ( !textLabel().isNull() ) { textFlags = AlignTop | AlignLeft; dx = ( width() - ARROW_WIDTH - fm.width( textLabel() ) ) / 2; @@ -774,9 +774,9 @@ void KoToolButton::drawButton(TQPainter *_painter) textRect = TQRect( dx, dy, fm.width(textLabel()), fm.lineSpacing() ); } } - else if ( static_cast<KToolBar::IconText>( iconTextMode() ) == KToolBar::IconTextBottom ) { + else if ( static_cast<TDEToolBar::IconText>( iconTextMode() ) == TDEToolBar::IconTextBottom ) { TQPixmap pixmap = iconSet().pixmap( TQIconSet::Automatic, - isEnabled() ? ( KToolBarButton::isActive() ? TQIconSet::Active : TQIconSet::Normal ) : + isEnabled() ? ( TDEToolBarButton::isActive() ? TQIconSet::Active : TQIconSet::Normal ) : TQIconSet::Disabled, isOn() ? TQIconSet::On : TQIconSet::Off ); if( !pixmap.isNull()) { dx = ( width() - ARROW_WIDTH - pixmap.width() ) / 2; @@ -799,7 +799,7 @@ void KoToolButton::drawButton(TQPainter *_painter) _painter->setFont( TDEGlobalSettings::toolBarFont() ); if ( !isEnabled() ) _painter->setPen( palette().disabled().dark() ); - else if( KToolBarButton::isRaised() ) + else if( TDEToolBarButton::isRaised() ) _painter->setPen( TDEGlobalSettings::toolBarHighlightColor() ); else _painter->setPen( colorGroup().buttonText() ); @@ -827,7 +827,7 @@ bool KoToolButton::eventFilter( TQObject* o, TQEvent* e ) } else if ( e->type() == TQEvent::MouseButtonRelease ) m_arrowPressed = false; - return KToolBarButton::eventFilter( o, e ); + return TDEToolBarButton::eventFilter( o, e ); } void KoToolButton::init() diff --git a/lib/kofficeui/KoTooluButton.h b/lib/kofficeui/KoTooluButton.h index 1f2ff03c..31a3d332 100644 --- a/lib/kofficeui/KoTooluButton.h +++ b/lib/kofficeui/KoTooluButton.h @@ -126,8 +126,8 @@ private: }; -// Parts of the code are from KToolBarButton -class KoToolButton : public KToolBarButton +// Parts of the code are from TDEToolBarButton +class KoToolButton : public TDEToolBarButton { Q_OBJECT diff --git a/lib/kofficeui/KoZoomAction.cpp b/lib/kofficeui/KoZoomAction.cpp index df1bac4d..09f7d3e4 100644 --- a/lib/kofficeui/KoZoomAction.cpp +++ b/lib/kofficeui/KoZoomAction.cpp @@ -26,15 +26,15 @@ #include <klocale.h> KoZoomAction::KoZoomAction( const TQString& text, const TQIconSet& pix, - const KShortcut& cut, TQObject* parent, const char* name ): - KSelectAction( text, pix, cut, parent, name ) + const TDEShortcut& cut, TQObject* parent, const char* name ): + TDESelectAction( text, pix, cut, parent, name ) { init(); } KoZoomAction::KoZoomAction( const TQString& text, const TQString& pix, - const KShortcut& cut, TQObject* parent, const char* name ): - KSelectAction( text, pix, cut, parent, name ) + const TDEShortcut& cut, TQObject* parent, const char* name ): + TDESelectAction( text, pix, cut, parent, name ) { init(); diff --git a/lib/kofficeui/KoZoomAction.h b/lib/kofficeui/KoZoomAction.h index 118c7a13..12e38103 100644 --- a/lib/kofficeui/KoZoomAction.h +++ b/lib/kofficeui/KoZoomAction.h @@ -28,7 +28,7 @@ * (must be an integer). The values shown on the list are alwalys * sorted. */ -class KOFFICEUI_EXPORT KoZoomAction : public KSelectAction +class KOFFICEUI_EXPORT KoZoomAction : public TDESelectAction { Q_OBJECT @@ -39,13 +39,13 @@ public: * Creates a new zoom action. */ KoZoomAction( const TQString& text, const TQIconSet& pix, - const KShortcut& cut = KShortcut(), TQObject* parent = 0, const char* name = 0 ); + const TDEShortcut& cut = TDEShortcut(), TQObject* parent = 0, const char* name = 0 ); /** * Creates a new zoom action. */ KoZoomAction( const TQString& text, const TQString& pix, - const KShortcut& cut = KShortcut(), TQObject* parent = 0, const char* name = 0 ); + const TDEShortcut& cut = TDEShortcut(), TQObject* parent = 0, const char* name = 0 ); public slots: diff --git a/lib/kofficeui/Kolinestyleaction.cpp b/lib/kofficeui/Kolinestyleaction.cpp index 5fa296f0..c2405045 100644 --- a/lib/kofficeui/Kolinestyleaction.cpp +++ b/lib/kofficeui/Kolinestyleaction.cpp @@ -65,7 +65,7 @@ KoLineStyleAction::~KoLineStyleAction() void KoLineStyleAction::createMenu() { - KPopupMenu* popup = popupMenu(); + TDEPopupMenu* popup = popupMenu(); TQBitmap mask; TQPixmap pix(70, 21); TQPainter p(&pix, popup); diff --git a/lib/kofficeui/Kolinewidthaction.cpp b/lib/kofficeui/Kolinewidthaction.cpp index c812c1c6..84e770cc 100644 --- a/lib/kofficeui/Kolinewidthaction.cpp +++ b/lib/kofficeui/Kolinewidthaction.cpp @@ -80,7 +80,7 @@ KoLineWidthAction::~KoLineWidthAction() void KoLineWidthAction::createMenu() { - KPopupMenu* popup = popupMenu(); + TDEPopupMenu* popup = popupMenu(); TQBitmap mask; TQPixmap pix(70, 21); TQPainter p(&pix, popup); diff --git a/lib/kofficeui/kcoloractions.cpp b/lib/kofficeui/kcoloractions.cpp index b6dc0408..96e48001 100644 --- a/lib/kofficeui/kcoloractions.cpp +++ b/lib/kofficeui/kcoloractions.cpp @@ -30,7 +30,7 @@ KColorAction::KColorAction( const TQString& text, int accel, TQObject* parent, const char* name ) - : KAction( text, accel, parent, name ) + : TDEAction( text, accel, parent, name ) { typ = TextColor; init(); @@ -39,7 +39,7 @@ KColorAction::KColorAction( const TQString& text, int accel, KColorAction::KColorAction( const TQString& text, int accel, TQObject* receiver, const char* slot, TQObject* parent, const char* name ) - : KAction( text, accel, receiver, slot, parent, name ) + : TDEAction( text, accel, receiver, slot, parent, name ) { typ = TextColor; init(); @@ -47,7 +47,7 @@ KColorAction::KColorAction( const TQString& text, int accel, KColorAction::KColorAction( const TQString& text, Type type, int accel, TQObject* parent, const char* name ) - : KAction( text, accel, parent, name ) + : TDEAction( text, accel, parent, name ) { typ = type; init(); @@ -56,14 +56,14 @@ KColorAction::KColorAction( const TQString& text, Type type, int accel, KColorAction::KColorAction( const TQString& text, Type type, int accel, TQObject* receiver, const char* slot, TQObject* parent, const char* name ) - : KAction( text, accel, receiver, slot, parent, name ) + : TDEAction( text, accel, receiver, slot, parent, name ) { typ = type; init(); } KColorAction::KColorAction( TQObject* parent, const char* name ) - : KAction( parent, name ) + : TDEAction( parent, name ) { typ = TextColor; init(); @@ -216,25 +216,25 @@ void KColorAction::createPixmap() } -KSelectColorAction::KSelectColorAction( const TQString& text, Type type, +TDESelectColorAction::TDESelectColorAction( const TQString& text, Type type, const TQObject* receiver, const char* slot, - KActionCollection* parent, const char* name ) : - KAction( text, KShortcut(), receiver, slot, parent, name ), m_type( type ), + TDEActionCollection* parent, const char* name ) : + TDEAction( text, TDEShortcut(), receiver, slot, parent, name ), m_type( type ), m_color( TQt::black ) { } -KSelectColorAction::~KSelectColorAction() +TDESelectColorAction::~TDESelectColorAction() { } -int KSelectColorAction::plug( TQWidget* w, int index ) +int TDESelectColorAction::plug( TQWidget* w, int index ) { if (w == 0) { - kdWarning() << "KSelectColorAction::plug called with 0 argument\n"; + kdWarning() << "TDESelectColorAction::plug called with 0 argument\n"; return -1; } - if (kapp && !kapp->authorizeKAction(name())) + if (kapp && !kapp->authorizeTDEAction(name())) return -1; if ( w->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) ) @@ -276,9 +276,9 @@ int KSelectColorAction::plug( TQWidget* w, int index ) return containerCount() - 1; } - else if ( w->inherits( "KToolBar" ) ) + else if ( w->inherits( "TDEToolBar" ) ) { - KToolBar *bar = static_cast<KToolBar *>( w ); + TDEToolBar *bar = static_cast<TDEToolBar *>( w ); int id_ = getToolButtonID(); TDEInstance *instance; @@ -319,25 +319,25 @@ int KSelectColorAction::plug( TQWidget* w, int index ) return -1; } -TQColor KSelectColorAction::color() const +TQColor TDESelectColorAction::color() const { return m_color; } -KSelectColorAction::Type KSelectColorAction::type() const +TDESelectColorAction::Type TDESelectColorAction::type() const { return m_type; } -void KSelectColorAction::setColor( const TQColor &/*c*/ ) +void TDESelectColorAction::setColor( const TQColor &/*c*/ ) { } -void KSelectColorAction::setType( Type /*t*/ ) +void TDESelectColorAction::setType( Type /*t*/ ) { } -TQString KSelectColorAction::whatsThisWithIcon() const +TQString TDESelectColorAction::whatsThisWithIcon() const { TQString text = whatsThis(); if (!icon().isEmpty()) diff --git a/lib/kofficeui/kcoloractions.h b/lib/kofficeui/kcoloractions.h index 3ca03c62..db832d8b 100644 --- a/lib/kofficeui/kcoloractions.h +++ b/lib/kofficeui/kcoloractions.h @@ -26,7 +26,7 @@ * An action whose pixmap is automatically generated from a color. * It knows three types of pixmaps: text color, frame color and background color */ -class KColorAction : public KAction +class KColorAction : public TDEAction { Q_OBJECT @@ -65,7 +65,7 @@ private: }; -class KSelectColorAction : public KAction +class TDESelectColorAction : public TDEAction { Q_OBJECT @@ -76,10 +76,10 @@ public: FillColor }; - KSelectColorAction( const TQString& text, Type type, + TDESelectColorAction( const TQString& text, Type type, const TQObject* receiver, const char* slot, - KActionCollection* parent, const char* name ); - virtual ~KSelectColorAction(); + TDEActionCollection* parent, const char* name ); + virtual ~TDESelectColorAction(); virtual int plug( TQWidget* w, int index = -1 ); diff --git a/lib/kofficeui/tests/coloraction_test.cpp b/lib/kofficeui/tests/coloraction_test.cpp index 3e9c146a..d04a31c4 100644 --- a/lib/kofficeui/tests/coloraction_test.cpp +++ b/lib/kofficeui/tests/coloraction_test.cpp @@ -72,7 +72,7 @@ TopLevel::TopLevel( TQWidget* parent, const char* name) : TQMainWindow( parent, file->insertSeparator(); file->insertItem( "&Quit", tqApp, TQT_SLOT( closeAllWindows() ), CTRL+Key_Q ); - KToolBar* toolBar = new KToolBar( this ); + TDEToolBar* toolBar = new TDEToolBar( this ); addDockWindow( toolBar ); ( void ) new KoToolButton( "color_fill", 1, toolBar, "funky button", "Fill Color" ); } diff --git a/lib/kofficeui/tkaction.cpp b/lib/kofficeui/tkaction.cpp index 7ab01d3f..56c626f8 100644 --- a/lib/kofficeui/tkaction.cpp +++ b/lib/kofficeui/tkaction.cpp @@ -30,8 +30,8 @@ #define SET_FOR_ALL_CONTAINER(WIDGET_TYPE,METHOD_NAME,VALUE) \ for( int id = 0; id < containerCount(); ++id ) { \ TQWidget* w = container(id); \ - if ( w->inherits("KToolBar") ) { \ - TQWidget* r = static_cast<KToolBar*>(w)->getWidget(itemId(id)); \ + if ( w->inherits("TDEToolBar") ) { \ + TQWidget* r = static_cast<TDEToolBar*>(w)->getWidget(itemId(id)); \ if (qstrcmp(r->name(),"KTToolBarLayout")==0) \ r = (TQWidget*)r->child("widget"); \ if ( r && r->inherits(#WIDGET_TYPE) ) { \ @@ -41,21 +41,21 @@ } \ } -TKAction::TKAction(TQObject* parent, const char* name) -: KAction( "", 0, parent, name ) +TTDEAction::TTDEAction(TQObject* parent, const char* name) +: TDEAction( "", 0, parent, name ) { m_imode = TK::IconOnly; } -TKAction::~TKAction() +TTDEAction::~TTDEAction() { } -int TKAction::plug(TQWidget* widget, int index) +int TTDEAction::plug(TQWidget* widget, int index) { - if ( widget->inherits("KToolBar") ) { - KToolBar* bar = static_cast<KToolBar*>(widget); - int id_ = KAction::getToolButtonID(); + if ( widget->inherits("TDEToolBar") ) { + TDEToolBar* bar = static_cast<TDEToolBar*>(widget); + int id_ = TDEAction::getToolButtonID(); TDEInstance *instance; if ( parentCollection() ) @@ -63,7 +63,7 @@ int TKAction::plug(TQWidget* widget, int index) else instance = TDEGlobal::instance(); - TKToolBarButton* b = new TKToolBarButton(icon(),plainText(),bar,name(),instance); + TTDEToolBarButton* b = new TTDEToolBarButton(icon(),plainText(),bar,name(),instance); // we don't need clicked() and buttonClicked(), do we? // connect(b,TQT_SIGNAL(clicked()),TQT_SLOT(slotActivated())); b->setIconMode(m_imode); @@ -75,44 +75,44 @@ int TKAction::plug(TQWidget* widget, int index) return containerCount() - 1; } - return KAction::plug(widget,index); + return TDEAction::plug(widget,index); } -void TKAction::initToolBarButton(TKToolBarButton* button) +void TTDEAction::initToolBarButton(TTDEToolBarButton* button) { connect(button,TQT_SIGNAL(buttonClicked()),TQT_SLOT(slotActivated())); } -TK::IconMode TKAction::iconMode() +TK::IconMode TTDEAction::iconMode() { return m_imode; } -void TKAction::setIconMode(TK::IconMode mode) +void TTDEAction::setIconMode(TK::IconMode mode) { m_imode = mode; - SET_FOR_ALL_CONTAINER(TKToolBarButton,setIconMode,mode) + SET_FOR_ALL_CONTAINER(TTDEToolBarButton,setIconMode,mode) } -void TKAction::setText(const TQString& text) +void TTDEAction::setText(const TQString& text) { - KAction::setText(text); + TDEAction::setText(text); updateLayout(); } -void TKAction::setIcon(const TQString& icon) +void TTDEAction::setIcon(const TQString& icon) { - KAction::setIcon(icon); + TDEAction::setIcon(icon); updateLayout(); } -void TKAction::updateLayout() +void TTDEAction::updateLayout() { int len = containerCount(); for( int id = 0; id < len; ++id ) { TQWidget* w = container( id ); - if (w->inherits("KToolBar")) { - TQWidget* r = static_cast<KToolBar*>(w)->getWidget(itemId(id)); + if (w->inherits("TDEToolBar")) { + TQWidget* r = static_cast<TDEToolBar*>(w)->getWidget(itemId(id)); if (qstrcmp(r->name(),"KTToolBarLayout")==0) { updateLayout(r); } @@ -120,7 +120,7 @@ void TKAction::updateLayout() } } -TQWidget* TKAction::createLayout(TQWidget* parent, TQWidget* children) +TQWidget* TTDEAction::createLayout(TQWidget* parent, TQWidget* children) { TQWidget* base = new TQWidget(parent,"KTToolBarLayout"); TQLabel* textLabel = new TQLabel(base,"text"); @@ -138,7 +138,7 @@ TQWidget* TKAction::createLayout(TQWidget* parent, TQWidget* children) return base; } -void TKAction::updateLayout(TQWidget* base) +void TTDEAction::updateLayout(TQWidget* base) { TQLabel* textLabel = (TQLabel*)base->child("text"); TQLabel* pixLabel = (TQLabel*)base->child("pixmap"); @@ -172,7 +172,7 @@ void TKAction::updateLayout(TQWidget* base) } /******************************************************************************/ TKBaseSelectAction::TKBaseSelectAction( TQObject* parent, const char* name ) -: TKAction(parent,name) +: TTDEAction(parent,name) { m_current = 0; m_editable = false; @@ -184,10 +184,10 @@ TKBaseSelectAction::~TKBaseSelectAction() int TKBaseSelectAction::plug(TQWidget* widget, int index) { - if ( widget->inherits("KToolBar") ) + if ( widget->inherits("TDEToolBar") ) { - KToolBar* bar = static_cast<KToolBar*>( widget ); - int id_ = KAction::getToolButtonID(); + TDEToolBar* bar = static_cast<TDEToolBar*>( widget ); + int id_ = TDEAction::getToolButtonID(); TKComboBox* cb = new TKComboBox(m_editable,bar); initComboBox(cb); @@ -248,28 +248,28 @@ void TKBaseSelectAction::activate(int id) emit activated(id); } /******************************************************************************/ -TKSelectAction::TKSelectAction( TQObject* parent, const char* name ) +TTDESelectAction::TTDESelectAction( TQObject* parent, const char* name ) : TKBaseSelectAction(parent,name) { } -TKSelectAction::~TKSelectAction() +TTDESelectAction::~TTDESelectAction() { } -void TKSelectAction::initComboBox(TKComboBox* cb) +void TTDESelectAction::initComboBox(TKComboBox* cb) { TKBaseSelectAction::initComboBox(cb); connect(cb,TQT_SIGNAL(activated(const TQString&)),TQT_SLOT(slotActivated(const TQString&))); cb->insertStringList(items()); } -void TKSelectAction::slotActivated(const TQString& text) +void TTDESelectAction::slotActivated(const TQString& text) { emit activated(text); } -void TKSelectAction::setItems(const TQStringList& lst ) +void TTDESelectAction::setItems(const TQStringList& lst ) { m_list = lst; m_current = -1; @@ -281,17 +281,17 @@ void TKSelectAction::setItems(const TQStringList& lst ) setEnabled ( lst.count() > 0 || m_editable ); } -TQStringList TKSelectAction::items() const +TQStringList TTDESelectAction::items() const { return m_list; } -void TKSelectAction::clear() +void TTDESelectAction::clear() { SET_FOR_ALL_CONTAINER(TKComboBox,clear, ) } -void TKSelectAction::setEditText(const TQString& text) +void TTDESelectAction::setEditText(const TQString& text) { SET_FOR_ALL_CONTAINER(TKComboBox,setEditText,text) } diff --git a/lib/kofficeui/tkaction.h b/lib/kofficeui/tkaction.h index da38f38d..736bb141 100644 --- a/lib/kofficeui/tkaction.h +++ b/lib/kofficeui/tkaction.h @@ -27,22 +27,22 @@ namespace TK { enum IconMode { IconOnly, IconAndText, TextOnly }; } -class TKToolBarButton; +class TTDEToolBarButton; class TKComboBox; -class KOFFICEUI_EXPORT TKAction : public KAction +class KOFFICEUI_EXPORT TTDEAction : public TDEAction { Q_OBJECT public: - TKAction(TQObject* parent, const char* name); - ~TKAction(); + TTDEAction(TQObject* parent, const char* name); + ~TTDEAction(); virtual int plug(TQWidget* widget, int index = -1); TK::IconMode iconMode(); protected: - virtual void initToolBarButton(TKToolBarButton*); + virtual void initToolBarButton(TTDEToolBarButton*); TQWidget* createLayout(TQWidget* parent, TQWidget* children); void updateLayout(); @@ -55,14 +55,14 @@ public slots: private: TK::IconMode m_imode; - class TKActionPrivate; - TKActionPrivate *d; + class TTDEActionPrivate; + TTDEActionPrivate *d; }; /******************************************************************************/ -class KOFFICEUI_EXPORT TKBaseSelectAction : public TKAction +class KOFFICEUI_EXPORT TKBaseSelectAction : public TTDEAction { Q_OBJECT -friend class TKSelectAction; +friend class TTDESelectAction; public: TKBaseSelectAction(TQObject* parent, const char* name); ~TKBaseSelectAction(); @@ -94,12 +94,12 @@ private: TKBaseSelectActionPrivate *d; }; /******************************************************************************/ -class KOFFICEUI_EXPORT TKSelectAction : public TKBaseSelectAction +class KOFFICEUI_EXPORT TTDESelectAction : public TKBaseSelectAction { Q_OBJECT public: - TKSelectAction(TQObject* parent, const char* name); - ~TKSelectAction(); + TTDESelectAction(TQObject* parent, const char* name); + ~TTDESelectAction(); TQStringList items() const; @@ -119,8 +119,8 @@ signals: private: TQStringList m_list; - class TKSelectActionPrivate; - TKSelectActionPrivate *d; + class TTDESelectActionPrivate; + TTDESelectActionPrivate *d; }; /******************************************************************************/ #endif diff --git a/lib/kofficeui/tkcoloractions.cpp b/lib/kofficeui/tkcoloractions.cpp index 11ddbc7f..3e7d6480 100644 --- a/lib/kofficeui/tkcoloractions.cpp +++ b/lib/kofficeui/tkcoloractions.cpp @@ -33,7 +33,7 @@ #include <tqapplication.h> TKColorPopupMenu::TKColorPopupMenu( TQWidget* parent, const char* name ) -: KPopupMenu(parent,name) +: TDEPopupMenu(parent,name) { } @@ -46,10 +46,10 @@ void TKColorPopupMenu::updateItemSize() styleChange(style()); } /****************************************************************************************/ -class TKSelectColorActionPrivate +class TTDESelectColorActionPrivate { public: - TKSelectColorActionPrivate() + TTDESelectColorActionPrivate() { } bool defaultColorMenu; @@ -57,10 +57,10 @@ public: }; -TKSelectColorAction::TKSelectColorAction( const TQString& text, Type type, TQObject* parent, const char* name, bool menuDefaultColor ) -: TKAction(parent,name) +TTDESelectColorAction::TTDESelectColorAction( const TQString& text, Type type, TQObject* parent, const char* name, bool menuDefaultColor ) +: TTDEAction(parent,name) { - d=new TKSelectColorActionPrivate(); + d=new TTDESelectColorActionPrivate(); d->defaultColorMenu=menuDefaultColor; d->defaultColor=TQColor(); setText(text); @@ -68,12 +68,12 @@ TKSelectColorAction::TKSelectColorAction( const TQString& text, Type type, TQObj init(); } -TKSelectColorAction::TKSelectColorAction( const TQString& text, Type type, +TTDESelectColorAction::TTDESelectColorAction( const TQString& text, Type type, TQObject* receiver, const char* slot, TQObject* parent, const char* name, bool menuDefaultColor) -: TKAction(parent,name) +: TTDEAction(parent,name) { - d=new TKSelectColorActionPrivate(); + d=new TTDESelectColorActionPrivate(); d->defaultColorMenu=menuDefaultColor; d->defaultColor=TQColor(); setText(text); @@ -82,7 +82,7 @@ TKSelectColorAction::TKSelectColorAction( const TQString& text, Type type, init(); } -void TKSelectColorAction::init() +void TTDESelectColorAction::init() { m_pStandardColor = new TKColorPanel(); m_pRecentColor = new TKColorPanel(); @@ -129,40 +129,40 @@ void TKSelectColorAction::init() connect(m_pRecentColor,TQT_SIGNAL(sizeChanged()),m_pMenu,TQT_SLOT(updateItemSize())); } -TKSelectColorAction::~TKSelectColorAction() +TTDESelectColorAction::~TTDESelectColorAction() { delete m_pMenu; delete d; } -void TKSelectColorAction::initToolBarButton(TKToolBarButton* b) +void TTDESelectColorAction::initToolBarButton(TTDEToolBarButton* b) { TQWhatsThis::add( b, whatsThis() ); - TKAction::initToolBarButton(b); + TTDEAction::initToolBarButton(b); b->setDelayedPopup( popupMenu() ); updatePixmap(b); updatePixmap(); } -void TKSelectColorAction::defaultColor() +void TTDESelectColorAction::defaultColor() { m_pCurrentColor = d->defaultColor; emit activated(); } -void TKSelectColorAction::setDefaultColor(const TQColor &_col) +void TTDESelectColorAction::setDefaultColor(const TQColor &_col) { d->defaultColor=_col; } -void TKSelectColorAction::updatePixmap() +void TTDESelectColorAction::updatePixmap() { for( int id = 0; id < containerCount(); ++id ) { TQWidget* w = container(id); - if ( w->inherits("KToolBar") ) { - TQWidget* r = static_cast<KToolBar*>(w)->getWidget(itemId(id)); - if ( r->inherits("TKToolBarButton") ) { - updatePixmap(static_cast<TKToolBarButton*>(r)); + if ( w->inherits("TDEToolBar") ) { + TQWidget* r = static_cast<TDEToolBar*>(w)->getWidget(itemId(id)); + if ( r->inherits("TTDEToolBarButton") ) { + updatePixmap(static_cast<TTDEToolBarButton*>(r)); } } else if(w->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) ) { @@ -191,7 +191,7 @@ void TKSelectColorAction::updatePixmap() } } -void TKSelectColorAction::updatePixmap(TKToolBarButton* b) +void TTDESelectColorAction::updatePixmap(TTDEToolBarButton* b) { if (!b) return; @@ -219,7 +219,7 @@ void TKSelectColorAction::updatePixmap(TKToolBarButton* b) b->setPixmap(pix); } -void TKSelectColorAction::setCurrentColor( const TQColor& color ) +void TTDESelectColorAction::setCurrentColor( const TQColor& color ) { if ( color == m_pCurrentColor ) return; @@ -229,12 +229,12 @@ void TKSelectColorAction::setCurrentColor( const TQColor& color ) updatePixmap(); } -void TKSelectColorAction::setActiveColor( const TQColor& color ) +void TTDESelectColorAction::setActiveColor( const TQColor& color ) { m_pStandardColor->setActiveColor(color); } -void TKSelectColorAction::selectColorDialog() +void TTDESelectColorAction::selectColorDialog() { TQColor c = color(); @@ -260,19 +260,19 @@ void TKSelectColorAction::selectColorDialog() } // Called when activating the menu item -void TKSelectColorAction::slotActivated() +void TTDESelectColorAction::slotActivated() { - //kdDebug() << "TKSelectColorAction::slotActivated" << endl; + //kdDebug() << "TTDESelectColorAction::slotActivated" << endl; selectColorDialog(); } -void TKSelectColorAction::activate() +void TTDESelectColorAction::activate() { emit colorSelected(m_pCurrentColor); emit activated(); } -void TKSelectColorAction::panelColorSelected( const TQColor& color ) +void TTDESelectColorAction::panelColorSelected( const TQColor& color ) { m_pMenu->hide(); setCurrentColor(color); @@ -280,7 +280,7 @@ void TKSelectColorAction::panelColorSelected( const TQColor& color ) activate(); } -void TKSelectColorAction::panelReject() +void TTDESelectColorAction::panelReject() { m_pMenu->hide(); } diff --git a/lib/kofficeui/tkcoloractions.h b/lib/kofficeui/tkcoloractions.h index 5ef5d3f4..2b5dcd82 100644 --- a/lib/kofficeui/tkcoloractions.h +++ b/lib/kofficeui/tkcoloractions.h @@ -28,9 +28,9 @@ class TQGridLayout; class TKColorPanel; -class TKSelectColorActionPrivate; +class TTDESelectColorActionPrivate; -class TKColorPopupMenu : public KPopupMenu +class TKColorPopupMenu : public TDEPopupMenu { Q_OBJECT public: @@ -41,7 +41,7 @@ public slots: void updateItemSize(); }; /****************************************************************************************/ -class KOFFICEUI_EXPORT TKSelectColorAction : public TKAction +class KOFFICEUI_EXPORT TTDESelectColorAction : public TTDEAction { Q_OBJECT public: @@ -52,16 +52,16 @@ public: Color }; - TKSelectColorAction( const TQString& text, Type type, TQObject* parent, const char* name, bool menuDefaultColor=false); - TKSelectColorAction( const TQString& text, Type type, + TTDESelectColorAction( const TQString& text, Type type, TQObject* parent, const char* name, bool menuDefaultColor=false); + TTDESelectColorAction( const TQString& text, Type type, TQObject* receiver, const char* slot, TQObject* parent, const char* name,bool menuDefaultColor=false ); - virtual ~TKSelectColorAction(); + virtual ~TTDESelectColorAction(); TQColor color() const { return m_pCurrentColor; } - KPopupMenu* popupMenu() const { return m_pMenu; } + TDEPopupMenu* popupMenu() const { return m_pMenu; } void setDefaultColor(const TQColor &_col); @@ -82,9 +82,9 @@ protected slots: protected: void init(); - virtual void initToolBarButton(TKToolBarButton*); + virtual void initToolBarButton(TTDEToolBarButton*); void updatePixmap(); - void updatePixmap(TKToolBarButton*); + void updatePixmap(TTDEToolBarButton*); protected: TKColorPopupMenu* m_pMenu; @@ -95,7 +95,7 @@ protected: TQColor m_pCurrentColor; private: - TKSelectColorActionPrivate *d; + TTDESelectColorActionPrivate *d; }; /****************************************************************************************/ class TKColorPanelButton : public TQFrame diff --git a/lib/kofficeui/tktoolbarbutton.cpp b/lib/kofficeui/tktoolbarbutton.cpp index 92c42c10..c4c8e27b 100644 --- a/lib/kofficeui/tktoolbarbutton.cpp +++ b/lib/kofficeui/tktoolbarbutton.cpp @@ -36,10 +36,10 @@ // Delay in ms before delayed popup pops up #define POPUP_DELAY 500 -class TKToolBarButton::TKToolBarButtonPrivate +class TTDEToolBarButton::TTDEToolBarButtonPrivate { public: - TKToolBarButtonPrivate() + TTDEToolBarButtonPrivate() { m_iconMode = TK::IconOnly; m_isPopup = false; @@ -61,7 +61,7 @@ public: m_instance = TDEGlobal::instance(); } - ~TKToolBarButtonPrivate() + ~TTDEToolBarButtonPrivate() { delete m_delayTimer; m_delayTimer = 0; @@ -88,12 +88,12 @@ public: TDEInstance *m_instance; }; -TKToolBarButton::TKToolBarButton( const TQString& icon, const TQString& txt, +TTDEToolBarButton::TTDEToolBarButton( const TQString& icon, const TQString& txt, TQWidget* parent, const char* name, TDEInstance *instance ) : TQToolButton(parent,name) { - d = new TKToolBarButtonPrivate; + d = new TTDEToolBarButtonPrivate; d->m_text = txt; d->m_instance = instance; @@ -109,10 +109,10 @@ TKToolBarButton::TKToolBarButton( const TQString& icon, const TQString& txt, modeChange(); } -TKToolBarButton::TKToolBarButton( const TQPixmap& pixmap, const TQString& txt, TQWidget* parent, const char* name ) +TTDEToolBarButton::TTDEToolBarButton( const TQPixmap& pixmap, const TQString& txt, TQWidget* parent, const char* name ) : TQToolButton(parent,name ) { - d = new TKToolBarButtonPrivate; + d = new TTDEToolBarButtonPrivate; d->m_text = txt; setFocusPolicy( TQ_NoFocus ); @@ -127,17 +127,17 @@ TKToolBarButton::TKToolBarButton( const TQPixmap& pixmap, const TQString& txt, T modeChange(); } -TKToolBarButton::~TKToolBarButton() +TTDEToolBarButton::~TTDEToolBarButton() { delete d; } -TQString TKToolBarButton::text() +TQString TTDEToolBarButton::text() { return d->m_text; } -void TKToolBarButton::modeChange() +void TTDEToolBarButton::modeChange() { TQToolTip::add(this,d->m_text); @@ -170,7 +170,7 @@ void TKToolBarButton::modeChange() updateGeometry(); } -void TKToolBarButton::setEnabled( bool enabled ) +void TTDEToolBarButton::setEnabled( bool enabled ) { if (isEnabled()==enabled) return; @@ -179,13 +179,13 @@ void TKToolBarButton::setEnabled( bool enabled ) TQToolButton::setEnabled( enabled ); } -void TKToolBarButton::setText( const TQString& text) +void TTDEToolBarButton::setText( const TQString& text) { d->m_text = text; repaint(false); } -void TKToolBarButton::setIcon( const TQString& icon ) +void TTDEToolBarButton::setIcon( const TQString& icon ) { d->m_iconName = icon; int iconSize = 16; @@ -195,31 +195,31 @@ void TKToolBarButton::setIcon( const TQString& icon ) setDefaultPixmap( BarIcon(icon, iconSize, KIcon::DefaultState, d->m_instance) ); } -void TKToolBarButton::setDisabledIcon( const TQString &icon ) +void TTDEToolBarButton::setDisabledIcon( const TQString &icon ) { d->m_disabledIconName = icon; int iconSize = 16; setDisabledPixmap( BarIcon(icon, iconSize, KIcon::DisabledState, d->m_instance) ); } -void TKToolBarButton::setDefaultIcon( const TQString &icon ) +void TTDEToolBarButton::setDefaultIcon( const TQString &icon ) { d->m_defaultIconName = icon; int iconSize = 16; setDefaultPixmap( BarIcon(icon, iconSize, KIcon::DefaultState, d->m_instance) ); } -TQPixmap TKToolBarButton::getActivePixmap() const +TQPixmap TTDEToolBarButton::getActivePixmap() const { return activePixmap; } -void TKToolBarButton::setPixmap( const TQPixmap &pixmap ) +void TTDEToolBarButton::setPixmap( const TQPixmap &pixmap ) { setPixmap( pixmap, true ); } -void TKToolBarButton::setPixmap( const TQPixmap &pixmap, bool generate ) +void TTDEToolBarButton::setPixmap( const TQPixmap &pixmap, bool generate ) { activePixmap = pixmap; @@ -239,19 +239,19 @@ void TKToolBarButton::setPixmap( const TQPixmap &pixmap, bool generate ) TQToolButton::setPixmap( isEnabled() ? defaultPixmap : disabledPixmap ); } -void TKToolBarButton::setDefaultPixmap( const TQPixmap &pixmap ) +void TTDEToolBarButton::setDefaultPixmap( const TQPixmap &pixmap ) { defaultPixmap = pixmap; TQToolButton::setPixmap( isEnabled() ? defaultPixmap : disabledPixmap ); } -void TKToolBarButton::setDisabledPixmap( const TQPixmap &pixmap ) +void TTDEToolBarButton::setDisabledPixmap( const TQPixmap &pixmap ) { disabledPixmap = pixmap; TQToolButton::setPixmap( isEnabled() ? defaultPixmap : disabledPixmap ); } -void TKToolBarButton::setPopup(TQPopupMenu *p) +void TTDEToolBarButton::setPopup(TQPopupMenu *p) { d->m_popup = p; d->m_popup->setFont(TDEGlobalSettings::toolBarFont()); @@ -260,12 +260,12 @@ void TKToolBarButton::setPopup(TQPopupMenu *p) modeChange(); } -TQPopupMenu *TKToolBarButton::popup() +TQPopupMenu *TTDEToolBarButton::popup() { return d->m_popup; } -void TKToolBarButton::setDelayedPopup (TQPopupMenu *p, bool toggle ) +void TTDEToolBarButton::setDelayedPopup (TQPopupMenu *p, bool toggle ) { d->m_isPopup = true; setToggle(toggle); @@ -278,18 +278,18 @@ void TKToolBarButton::setDelayedPopup (TQPopupMenu *p, bool toggle ) setPopup(p); } -void TKToolBarButton::setRaised(bool f) +void TTDEToolBarButton::setRaised(bool f) { d->m_isRaised = f; repaint(false); } -void TKToolBarButton::setAutoRaised(bool f) +void TTDEToolBarButton::setAutoRaised(bool f) { d->m_autoRaised = f; } -void TKToolBarButton::leaveEvent(TQEvent *) +void TTDEToolBarButton::leaveEvent(TQEvent *) { if (!d->m_isToggle && !(d->m_popup && d->m_popup->isVisible()) ) { TQToolButton::setPixmap(isEnabled() ? defaultPixmap : disabledPixmap); @@ -298,7 +298,7 @@ void TKToolBarButton::leaveEvent(TQEvent *) } } -void TKToolBarButton::enterEvent(TQEvent *) +void TTDEToolBarButton::enterEvent(TQEvent *) { if (!d->m_isToggle) { if (isEnabled()) { @@ -312,7 +312,7 @@ void TKToolBarButton::enterEvent(TQEvent *) } } -bool TKToolBarButton::eventFilter(TQObject *o, TQEvent *ev) +bool TTDEToolBarButton::eventFilter(TQObject *o, TQEvent *ev) { if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) ) if (ev->type() == TQEvent::MouseButtonPress && d->m_popup && d->m_isPopup ) { @@ -348,7 +348,7 @@ bool TKToolBarButton::eventFilter(TQObject *o, TQEvent *ev) return false; } -void TKToolBarButton::drawButton( TQPainter* p ) +void TTDEToolBarButton::drawButton( TQPainter* p ) { #define DRAW_PIXMAP_AND_TEXT \ int x = 3;\ @@ -402,7 +402,7 @@ void TKToolBarButton::drawButton( TQPainter* p ) } } -void TKToolBarButton::paletteChange(const TQPalette &) +void TTDEToolBarButton::paletteChange(const TQPalette &) { makeDisabledPixmap(); if ( !isEnabled() ) @@ -412,7 +412,7 @@ void TKToolBarButton::paletteChange(const TQPalette &) repaint(false); } -void TKToolBarButton::makeDefaultPixmap() +void TTDEToolBarButton::makeDefaultPixmap() { if (activePixmap.isNull()) return; @@ -421,7 +421,7 @@ void TKToolBarButton::makeDefaultPixmap() defaultPixmap = effect.apply(activePixmap, KIcon::Toolbar, KIcon::DefaultState); } -void TKToolBarButton::makeDisabledPixmap() +void TTDEToolBarButton::makeDisabledPixmap() { if (activePixmap.isNull()) return; @@ -430,17 +430,17 @@ void TKToolBarButton::makeDisabledPixmap() disabledPixmap = effect.apply(activePixmap, KIcon::Toolbar, KIcon::DisabledState); } -TQSize TKToolBarButton::sizeHint() const +TQSize TTDEToolBarButton::sizeHint() const { return minimumSize(); } -TQSize TKToolBarButton::minimumSizeHint() const +TQSize TTDEToolBarButton::minimumSizeHint() const { return minimumSize(); } -void TKToolBarButton::showMenu() +void TTDEToolBarButton::showMenu() { TQPoint p ( mapToGlobal( TQPoint( 0, 0 ) ) ); const int deskHeight = TDEGlobalSettings::desktopGeometry(this).height(); @@ -452,13 +452,13 @@ void TKToolBarButton::showMenu() d->m_popup->popup(p); } -void TKToolBarButton::slotDelayTimeout() +void TTDEToolBarButton::slotDelayTimeout() { d->m_delayTimer->stop(); showMenu(); } -void TKToolBarButton::slotClicked() +void TTDEToolBarButton::slotClicked() { if ( d->ignoreNextMousePress ) { d->ignoreNextMousePress=false; @@ -471,7 +471,7 @@ void TKToolBarButton::slotClicked() emit buttonClicked(); } -void TKToolBarButton::slotPressed() +void TTDEToolBarButton::slotPressed() { if ( d->ignoreNextMousePress ) return; @@ -486,7 +486,7 @@ void TKToolBarButton::slotPressed() d->ignoreNextMousePress = false; } -void TKToolBarButton::slotReleased() +void TTDEToolBarButton::slotReleased() { if (d->m_popup && d->m_isPopup) d->m_delayTimer->stop(); @@ -494,23 +494,23 @@ void TKToolBarButton::slotReleased() emit buttonReleased(); } -void TKToolBarButton::slotToggled() +void TTDEToolBarButton::slotToggled() { emit buttonToggled(); } -void TKToolBarButton::on(bool flag) +void TTDEToolBarButton::on(bool flag) { d->m_isOn = flag; repaint(); } -void TKToolBarButton::toggle() +void TTDEToolBarButton::toggle() { on(!d->m_isOn); } -void TKToolBarButton::setToggle(bool flag) +void TTDEToolBarButton::setToggle(bool flag) { d->m_isToggle = flag; if (flag == true) @@ -522,7 +522,7 @@ void TKToolBarButton::setToggle(bool flag) repaint(); } -void TKToolBarButton::setIconMode( TK::IconMode m ) +void TTDEToolBarButton::setIconMode( TK::IconMode m ) { d->m_iconMode = m; modeChange(); diff --git a/lib/kofficeui/tktoolbarbutton.h b/lib/kofficeui/tktoolbarbutton.h index 0e74b7e3..14d3b285 100644 --- a/lib/kofficeui/tktoolbarbutton.h +++ b/lib/kofficeui/tktoolbarbutton.h @@ -26,21 +26,21 @@ #include <tqtoolbutton.h> #include <kglobal.h> -class KToolBar; +class TDEToolBar; class TDEInstance; class TQPopupMenu; class TQPainter; -class TKToolBarButton : public TQToolButton +class TTDEToolBarButton : public TQToolButton { Q_OBJECT public: - TKToolBarButton(const TQString& icon, const TQString& txt, + TTDEToolBarButton(const TQString& icon, const TQString& txt, TQWidget* parent = 0, const char *name=0L, TDEInstance *_instance = TDEGlobal::instance()); - TKToolBarButton(const TQPixmap&, const TQString&, TQWidget* parent=0, const char* name=0); - ~TKToolBarButton(); + TTDEToolBarButton(const TQPixmap&, const TQString&, TQWidget* parent=0, const char* name=0); + ~TTDEToolBarButton(); void setIconMode(TK::IconMode); void setRaised(bool); @@ -213,8 +213,8 @@ private: TQPixmap activePixmap; TQPixmap disabledPixmap; virtual void setIcon(const TQPixmap &p) { TQButton::setIcon(p); } - class TKToolBarButtonPrivate; - TKToolBarButtonPrivate *d; + class TTDEToolBarButtonPrivate; + TTDEToolBarButtonPrivate *d; protected slots: diff --git a/lib/kopalette/kopalette.cc b/lib/kopalette/kopalette.cc index c84d6b5e..e93cae7c 100644 --- a/lib/kopalette/kopalette.cc +++ b/lib/kopalette/kopalette.cc @@ -44,7 +44,7 @@ KoPalette::KoPalette(TQWidget * parent, const char * name) { #if TDE_VERSION >= TDE_MAKE_VERSION(3,3,90) - KAcceleratorManager::setNoAccel(this); + TDEAcceleratorManager::setNoAccel(this); #endif setCloseMode( TQDockWindow::Never); setResizeEnabled(true); diff --git a/lib/kopalette/kopalettemanager.cc b/lib/kopalette/kopalettemanager.cc index 2a9d1f5c..de35054a 100644 --- a/lib/kopalette/kopalettemanager.cc +++ b/lib/kopalette/kopalettemanager.cc @@ -42,7 +42,7 @@ #include <kopalettemanager.h> -KoPaletteManager::KoPaletteManager(KoView * view, KActionCollection *ac, const char * name) +KoPaletteManager::KoPaletteManager(KoView * view, TDEActionCollection *ac, const char * name) : TQObject(view, name) { @@ -50,7 +50,7 @@ KoPaletteManager::KoPaletteManager(KoView * view, KActionCollection *ac, const c m_view->installEventFilter(this); m_actionCollection = ac; - m_actions = new TQDict<KToggleAction>(); + m_actions = new TQDict<TDEToggleAction>(); m_widgets = new TQDict<TQWidget>(); m_palettes = new TQDict<KoPalette>(); m_palettes->setAutoDelete(true); @@ -63,16 +63,16 @@ KoPaletteManager::KoPaletteManager(KoView * view, KActionCollection *ac, const c m_mapper = new TQSignalMapper(this); connect(m_mapper, TQT_SIGNAL(mapped(int)), this, TQT_SLOT(slotTogglePalette(int))); - m_viewActionMenu = new KActionMenu(i18n("Palettes"), m_actionCollection, "view_palette_action_menu"); + m_viewActionMenu = new TDEActionMenu(i18n("Palettes"), m_actionCollection, "view_palette_action_menu"); TDEConfig * cfg = TDEGlobal::config(); cfg->setGroup("palettes"); bool palettesShown = cfg->readBoolEntry("palettesshown", true); - KToggleAction * m_toggleShowHidePalettes; + TDEToggleAction * m_toggleShowHidePalettes; if ( palettesShown) { - m_toggleShowHidePalettes = new KToggleAction(i18n("Hide All Palette Windows"), + m_toggleShowHidePalettes = new TDEToggleAction(i18n("Hide All Palette Windows"), "CTRL+SHIFT+H", this, TQT_SLOT(slotToggleAllPalettes()), m_actionCollection, "toggleAllPaletteWindows"); @@ -80,7 +80,7 @@ KoPaletteManager::KoPaletteManager(KoView * view, KActionCollection *ac, const c m_toggleShowHidePalettes->setCheckedState(i18n("Show Palette Windows Again")); } else { - m_toggleShowHidePalettes = new KToggleAction(i18n("Show Palette Windows Again"), + m_toggleShowHidePalettes = new TDEToggleAction(i18n("Show Palette Windows Again"), "CTRL+SHIFT+H", this, TQT_SLOT(slotToggleAllPalettes()), m_actionCollection, "toggleAllPaletteWindows"); @@ -105,7 +105,7 @@ KoPaletteManager::KoPaletteManager(KoView * view, KActionCollection *ac, const c } /* - KAction * a = new KAction(i18n("Restore Palettes"), + TDEAction * a = new TDEAction(i18n("Restore Palettes"), 0, this, TQT_SLOT(slotReset()), this, "restorePalettes"); @@ -164,8 +164,8 @@ void KoPaletteManager::addWidget(TQWidget * widget, m_defaultPaletteOrder.append(pname+ "," + TQString::number(style)); } - KToggleAction * a; - a = new KToggleAction(i18n("Show %1").arg(widget->caption()), 0, m_mapper, TQT_SLOT(map()), m_actionCollection); + TDEToggleAction * a; + a = new TDEToggleAction(i18n("Show %1").arg(widget->caption()), 0, m_mapper, TQT_SLOT(map()), m_actionCollection); a->setCheckedState(i18n("Hide %1").arg(widget->caption())); m_mapper->setMapping(a, m_widgetNames->count()); // This is the position at which we'll insert the action @@ -285,7 +285,7 @@ void KoPaletteManager::showWidget(const TQString & name) KoPalette * p = m_palettes->find(pname); p->showPage(w); - KToggleAction * a = m_actions->find(name); + TDEToggleAction * a = m_actions->find(name); a->setChecked(true); } @@ -300,7 +300,7 @@ void KoPaletteManager::hideWidget(const TQString & name) KoPalette * p = m_palettes->find(pname); p->hidePage(w); - KToggleAction * a = m_actions->find(name); + TDEToggleAction * a = m_actions->find(name); a->setChecked(false); } @@ -320,7 +320,7 @@ void KoPaletteManager::removeWidget(const TQString & name) m_widgets->remove(name); m_currentMapping->remove(name); - KAction * a = m_actions->take(name); + TDEAction * a = m_actions->take(name); m_viewActionMenu->remove(a); m_actionCollection->remove(a); } @@ -458,7 +458,7 @@ void KoPaletteManager::slotToggleAllPalettes() { TQString name = m_hiddenWidgets.pop(); TQWidget *w = m_widgets->find(name); - KToggleAction * a = m_actions->find(name); + TDEToggleAction * a = m_actions->find(name); a->setChecked(true); TQString pname = *m_currentMapping->find(name); @@ -473,7 +473,7 @@ void KoPaletteManager::slotToggleAllPalettes() TQDictIterator<TQWidget> it(*m_widgets); for (; it.current(); ++it) { - KToggleAction * a = m_actions->find(it.currentKey()); + TDEToggleAction * a = m_actions->find(it.currentKey()); if(a->isChecked()) { a->setChecked(false); diff --git a/lib/kopalette/kopalettemanager.h b/lib/kopalette/kopalettemanager.h index 333a3cb6..090f237d 100644 --- a/lib/kopalette/kopalettemanager.h +++ b/lib/kopalette/kopalettemanager.h @@ -33,10 +33,10 @@ #include <KoView.h> class KoPalette; -class KActionMenu; -class KAction; -class KActionCollection; -class KToggleAction; +class TDEActionMenu; +class TDEAction; +class TDEActionCollection; +class TDEToggleAction; enum enumKoDockability { DOCK_ENABLED = 0, // It's possible to dock the dockers @@ -90,7 +90,7 @@ class KOPALETTE_EXPORT KoPaletteManager : public TQObject { public: - KoPaletteManager(KoView * view, KActionCollection * ac, const char * name); + KoPaletteManager(KoView * view, TDEActionCollection * ac, const char * name); virtual ~KoPaletteManager(); public: @@ -199,9 +199,9 @@ private: private: KoView * m_view; - KActionCollection * m_actionCollection; - KActionMenu * m_viewActionMenu; - KToggleAction * m_toggleShowHidePalettes; + TDEActionCollection * m_actionCollection; + TDEActionMenu * m_viewActionMenu; + TDEToggleAction * m_toggleShowHidePalettes; enumKoDockability m_dockability; TQStringList * m_widgetNames; @@ -209,7 +209,7 @@ private: TQDict<TQWidget> * m_widgets; TQDict<KoPalette> * m_palettes; TQValueStack<TQString> m_hiddenWidgets; // names of widgets actively hidden by hide all - TQDict<KToggleAction> * m_actions; + TQDict<TDEToggleAction> * m_actions; TQSignalMapper * m_mapper; TQMap<TQString, TQString> * m_defaultMapping; // widget to docker diff --git a/lib/koproperty/editor.cpp b/lib/koproperty/editor.cpp index 39c965a5..13638119 100644 --- a/lib/koproperty/editor.cpp +++ b/lib/koproperty/editor.cpp @@ -120,7 +120,7 @@ class EditorPrivate using namespace KoProperty; Editor::Editor(TQWidget *parent, bool autoSync, const char *name) - : KListView(parent, name) + : TDEListView(parent, name) { d = new EditorPrivate(this); d->itemDict.setAutoDelete(false); @@ -189,7 +189,7 @@ Editor::fill() d->itemToSelectLater = 0; tqApp->eventLoop()->processEvents(TQEventLoop::AllEvents); hideEditor(); - KListView::clear(); + TDEListView::clear(); d->itemDict.clear(); clearWidgetCache(); if(!d->set) { @@ -416,7 +416,7 @@ Editor::clear(bool editorOnly) if(d->set) d->set->disconnect(this); clearWidgetCache(); - KListView::clear(); + TDEListView::clear(); d->itemDict.clear(); d->topItem = 0; } @@ -872,7 +872,7 @@ TQSize Editor::sizeHint() const { return TQSize( TQFontMetrics(font()).width(columnText(0)+columnText(1)+" "), - KListView::sizeHint().height()); + TDEListView::sizeHint().height()); } void @@ -897,15 +897,15 @@ Editor::setFocus() d->currentWidget->setFocus(); } else { -// kopropertydbg << "KListView::setFocus()" << endl; - KListView::setFocus(); +// kopropertydbg << "TDEListView::setFocus()" << endl; + TDEListView::setFocus(); } } void Editor::resizeEvent(TQResizeEvent *ev) { - KListView::resizeEvent(ev); + TDEListView::resizeEvent(ev); if(d->undoButton->isVisible()) showUndoButton(true); update(); @@ -919,7 +919,7 @@ Editor::eventFilter( TQObject * watched, TQEvent * e ) if (handleKeyPress(TQT_TQKEYEVENT(e))) return true; } - return KListView::eventFilter(watched, e); + return TDEListView::eventFilter(watched, e); } bool @@ -998,7 +998,7 @@ Editor::event( TQEvent * e ) if (e->type()==TQEvent::ParentFontChange) { updateFont(); } - return KListView::event(e); + return TDEListView::event(e); } void @@ -1009,7 +1009,7 @@ Editor::contentsMousePressEvent( TQMouseEvent * e ) setOpen( item, !isOpen(item) ); return; } - KListView::contentsMousePressEvent(e); + TDEListView::contentsMousePressEvent(e); } void @@ -1017,7 +1017,7 @@ Editor::setSorting( int column, bool ascending ) { if (d->set && d->set->groupNames().count()>1) //do not sort when groups are present (maybe reenable this later?) return; - KListView::setSorting( column, ascending ); + TDEListView::setSorting( column, ascending ); updateEditorGeometry(); updateGroupLabelsPosition(); repaintContents(); diff --git a/lib/koproperty/editor.h b/lib/koproperty/editor.h index 7f8d41fa..0fbcf45f 100644 --- a/lib/koproperty/editor.h +++ b/lib/koproperty/editor.h @@ -60,7 +60,7 @@ class EditorItem; \author Alexander Dymo <[email protected]> \author Jaroslaw Staniek <[email protected]> */ -class KOPROPERTY_EXPORT Editor : public KListView +class KOPROPERTY_EXPORT Editor : public TDEListView { Q_OBJECT diff --git a/lib/koproperty/editoritem.cpp b/lib/koproperty/editoritem.cpp index b378f93a..a22bab55 100644 --- a/lib/koproperty/editoritem.cpp +++ b/lib/koproperty/editoritem.cpp @@ -89,7 +89,7 @@ static void paintListViewExpander(TQPainter* p, TQWidget* w, int height, const T } //! @internal -//! Based on KPopupTitle, see kpopupmenu.cpp +//! Based on TDEPopupTitle, see kpopupmenu.cpp class GroupWidgetBase : public TQWidget { public: @@ -255,7 +255,7 @@ bool GroupContainer::event( TQEvent * e ) { ////////////////////////////////////////////////////// EditorItem::EditorItem(Editor *editor, EditorItem *parent, Property *property, TQListViewItem *after) - : KListViewItem(parent, after, + : TDEListViewItem(parent, after, property->captionForDisplaying().isEmpty() ? property->name() : property->captionForDisplaying()) { d = new EditorItemPrivate(); @@ -280,8 +280,8 @@ EditorItem::EditorItem(Editor *editor, EditorItem *parent, Property *property, T */ } -EditorItem::EditorItem(KListView *parent) - : KListViewItem(parent) +EditorItem::EditorItem(TDEListView *parent) + : TDEListViewItem(parent) { d = new EditorItemPrivate(); d->property = 0; @@ -290,7 +290,7 @@ EditorItem::EditorItem(KListView *parent) } EditorItem::EditorItem(EditorItem *parent, const TQString &text) - : KListViewItem(parent, text) + : TDEListViewItem(parent, text) { d = new EditorItemPrivate(); d->property = 0; @@ -299,7 +299,7 @@ EditorItem::EditorItem(EditorItem *parent, const TQString &text) } EditorItem::EditorItem(EditorItem *parent, EditorItem *after, const TQString &text) - : KListViewItem(parent, after, text) + : TDEListViewItem(parent, after, text) { d = new EditorItemPrivate(); d->property = 0; @@ -333,7 +333,7 @@ EditorItem::paintCell(TQPainter *p, const TQColorGroup & cg, int column, int wid p->setFont(font); p->setBrush(cg.highlight()); p->setPen(cg.highlightedText()); - KListViewItem::paintCell(p, cg, column, width, align); + TDEListViewItem::paintCell(p, cg, column, width, align); p->fillRect(parent() ? 0 : 50, 0, width, height()-1, TQBrush(isSelected() ? cg.highlight() : backgroundColor())); p->setPen(isSelected() ? cg.highlightedText() : cg.text()); @@ -384,7 +384,7 @@ void EditorItem::paintBranches(TQPainter *p, const TQColorGroup &cg, int w, int y, int h) { p->eraseRect(0,0,w,h); - KListViewItem *item = static_cast<KListViewItem*>(firstChild()); + TDEListViewItem *item = static_cast<TDEListViewItem*>(firstChild()); if(!item) return; @@ -475,7 +475,7 @@ EditorItem::paintBranches(TQPainter *p, const TQColorGroup &cg, int w, int y, in } p->translate(0, item->totalHeight()); - item = (KListViewItem*)item->nextSibling(); + item = (TDEListViewItem*)item->nextSibling(); } p->restore(); } @@ -507,7 +507,7 @@ EditorItem::compare( TQListViewItem *i, int col, bool ascending ) const void EditorItem::setHeight( int height ) { - KListViewItem::setHeight(height); + TDEListViewItem::setHeight(height); } ////////////////////////////////////////////////////// @@ -575,7 +575,7 @@ EditorGroupItem::paintCell(TQPainter *p, const TQColorGroup & cg, int column, in p->setFont(font); p->setBrush(cg.highlight()); //p->setPen(cg.highlightedText()); - KListViewItem::paintCell(p, cg, column, width, align); + TDEListViewItem::paintCell(p, cg, column, width, align); p->setPen(cg.text()); p->drawText(TQRect(0,0, totalWidth, height()), TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, text(0));*/ @@ -584,7 +584,7 @@ EditorGroupItem::paintCell(TQPainter *p, const TQColorGroup & cg, int column, in void EditorGroupItem::setup() { - KListViewItem::setup(); + TDEListViewItem::setup(); setHeight( height()+4 ); } @@ -602,7 +602,7 @@ EditorGroupItem::compare( TQListViewItem *i, int col, bool ascending ) const //////////////////////////////////////////////////////// -EditorDummyItem::EditorDummyItem(KListView *listview) +EditorDummyItem::EditorDummyItem(TDEListView *listview) : EditorItem(listview) { setSelectable(false); diff --git a/lib/koproperty/editoritem.h b/lib/koproperty/editoritem.h index fc703239..a1300e5a 100644 --- a/lib/koproperty/editoritem.h +++ b/lib/koproperty/editoritem.h @@ -44,7 +44,7 @@ class GroupWidget; \author Jaroslaw Staniek <[email protected]> @internal */ -class EditorItem : public KListViewItem +class EditorItem : public TDEListViewItem { public: typedef TQAsciiDict<EditorItem> Dict; @@ -56,7 +56,7 @@ class EditorItem : public KListViewItem TQListViewItem *after=0); //! Two helper contructors for subclass - EditorItem(KListView *parent); + EditorItem(TDEListView *parent); EditorItem(EditorItem *parent, const TQString &text); EditorItem(EditorItem *parent, EditorItem *after, const TQString &text); @@ -66,12 +66,12 @@ class EditorItem : public KListViewItem Property* property(); protected: - /*! Reimplemented from KListViewItem to draw custom contents. Properties names are wriiten in bold if + /*! Reimplemented from TDEListViewItem to draw custom contents. Properties names are wriiten in bold if modified. Also takes care of drawing borders around the cells as well as pixmaps or colors if necessary. */ virtual void paintCell(TQPainter *p, const TQColorGroup & cg, int column, int width, int align); - /*! Reimplemented from KListViewItem to draw custom contents. It takes care of drawing the [+] and [-] + /*! Reimplemented from TDEListViewItem to draw custom contents. It takes care of drawing the [+] and [-] signs only if the item has children. */ virtual void paintBranches(TQPainter *p, const TQColorGroup &cg, int w, int y, int h); @@ -102,7 +102,7 @@ class EditorGroupItem : public EditorItem protected: virtual void init(const TQString &icon); - /*! Reimplemented from KListViewItem to draw custom contents. */ + /*! Reimplemented from TDEListViewItem to draw custom contents. */ virtual void paintCell(TQPainter *p, const TQColorGroup & cg, int column, int width, int align); virtual void setup(); virtual int compare( TQListViewItem *i, int col, bool ascending ) const; @@ -115,7 +115,7 @@ class EditorGroupItem : public EditorItem class EditorDummyItem : public EditorItem { public: - EditorDummyItem(KListView *parent); + EditorDummyItem(TDEListView *parent); virtual ~EditorDummyItem(); protected: diff --git a/lib/koproperty/editors/fontedit.cpp b/lib/koproperty/editors/fontedit.cpp index 589e0a3b..84c7c3d2 100644 --- a/lib/koproperty/editors/fontedit.cpp +++ b/lib/koproperty/editors/fontedit.cpp @@ -41,11 +41,11 @@ namespace KoProperty { -class FontEditRequester : public KFontRequester +class FontEditRequester : public TDEFontRequester { public: FontEditRequester(TQWidget* parent) - : KFontRequester(parent) + : TDEFontRequester(parent) { label()->setPaletteBackgroundColor(palette().active().base()); label()->setMinimumWidth(0); @@ -53,7 +53,7 @@ class FontEditRequester : public KFontRequester label()->setIndent(-1); #if TDE_VERSION >= TDE_MAKE_VERSION(3,4,0) label()->setFocusPolicy(TQ_ClickFocus); - KAcceleratorManager::setNoAccel(label()); + TDEAcceleratorManager::setNoAccel(label()); #endif layout()->remove(label()); layout()->remove(button());//->reparent(this, 0, TQPoint(0,0)); @@ -67,7 +67,7 @@ class FontEditRequester : public KFontRequester } virtual void resizeEvent(TQResizeEvent *e) { - KFontRequester::resizeEvent(e); + TDEFontRequester::resizeEvent(e); label()->move(0,0); label()->resize(e->size()-TQSize(button()->width(),-1)); button()->move(label()->width(),0); diff --git a/lib/koproperty/editors/pixmapedit.cpp b/lib/koproperty/editors/pixmapedit.cpp index 30fd5dbd..f803d4c3 100644 --- a/lib/koproperty/editors/pixmapedit.cpp +++ b/lib/koproperty/editors/pixmapedit.cpp @@ -188,7 +188,7 @@ PixmapEdit::selectPixmap() //save last visited path KURL url(fileName); if (url.isLocalFile()) - KRecentDirs::add(":lastVisitedImagePath", url.directory()); + TDERecentDirs::add(":lastVisitedImagePath", url.directory()); #endif } diff --git a/lib/koproperty/test/test.cpp b/lib/koproperty/test/test.cpp index ecf41473..77ceb415 100644 --- a/lib/koproperty/test/test.cpp +++ b/lib/koproperty/test/test.cpp @@ -37,7 +37,7 @@ using namespace KoProperty; Test::Test() - : KMainWindow(0,"koproperty_test") + : TDEMainWindow(0,"koproperty_test") { TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); const bool flat = args->isSet("flat"); diff --git a/lib/koproperty/test/test.h b/lib/koproperty/test/test.h index 8d9dedb2..51ee85f5 100644 --- a/lib/koproperty/test/test.h +++ b/lib/koproperty/test/test.h @@ -33,7 +33,7 @@ * @author Cedric Pasteur <[email protected]> * @version 0.1 */ -class Test : public KMainWindow +class Test : public TDEMainWindow { Q_OBJECT diff --git a/lib/kotext/KoAutoFormatDia.cpp b/lib/kotext/KoAutoFormatDia.cpp index bc582bd5..4f503d17 100644 --- a/lib/kotext/KoAutoFormatDia.cpp +++ b/lib/kotext/KoAutoFormatDia.cpp @@ -584,7 +584,7 @@ void KoAutoFormatDia::setupTab3() connect(pbAdd,TQT_SIGNAL(clicked()),this, TQT_SLOT(slotAddEntry())); - m_pListView = new KListView( tab3 ); + m_pListView = new TDEListView( tab3 ); m_pListView->addColumn( i18n( "Find" ) ); m_pListView->addColumn( i18n( "Replace" ) ); m_pListView->setAllColumnsShowFocus( true ); diff --git a/lib/kotext/KoAutoFormatDia.h b/lib/kotext/KoAutoFormatDia.h index 354febf6..800028df 100644 --- a/lib/kotext/KoAutoFormatDia.h +++ b/lib/kotext/KoAutoFormatDia.h @@ -122,7 +122,7 @@ protected: TQPushButton *pbChangeFormat, *pbClearFormat; KCharSelect *charselect; KoAutoFormatLineEdit *m_find, *m_replace; - KListView *m_pListView; + TDEListView *m_pListView; TQChar oSimpleBegin, oSimpleEnd; TQChar oDoubleBegin, oDoubleEnd; diff --git a/lib/kotext/KoCustomVariablesDia.cpp b/lib/kotext/KoCustomVariablesDia.cpp index f3b84121..dd32a80e 100644 --- a/lib/kotext/KoCustomVariablesDia.cpp +++ b/lib/kotext/KoCustomVariablesDia.cpp @@ -159,7 +159,7 @@ int KoCustomVariablesListItem::width( const TQFontMetrics & fm, const TQListView ******************************************************************/ KoCustomVariablesList::KoCustomVariablesList( TQWidget *parent ) - : KListView( parent ) + : TDEListView( parent ) { header()->setMovingEnabled( FALSE ); addColumn( i18n( "Variable" ) ); diff --git a/lib/kotext/KoCustomVariablesDia.h b/lib/kotext/KoCustomVariablesDia.h index 915d6081..25b826ab 100644 --- a/lib/kotext/KoCustomVariablesDia.h +++ b/lib/kotext/KoCustomVariablesDia.h @@ -90,7 +90,7 @@ protected: * The listview. * Used by KoCustomVariablesDia */ -class KoCustomVariablesList : public KListView +class KoCustomVariablesList : public TDEListView { Q_OBJECT diff --git a/lib/kotext/KoFontDia.cpp b/lib/kotext/KoFontDia.cpp index 258ea98d..1d82214c 100644 --- a/lib/kotext/KoFontDia.cpp +++ b/lib/kotext/KoFontDia.cpp @@ -59,7 +59,7 @@ KoFontDia::KoFontDia( const KoTextFormat& initialFormat, TQTabWidget *fontTabWidget = new TQTabWidget( mainHBox ); // Font tab - fontTab = new KoFontTab( KFontChooser::SmoothScalableFonts, this ); + fontTab = new KoFontTab( TDEFontChooser::SmoothScalableFonts, this ); fontTabWidget->addTab( fontTab, i18n( "Font" ) ); connect( fontTab, TQT_SIGNAL( familyChanged() ), this, TQT_SLOT( slotFontFamilyChanged() ) ); @@ -103,7 +103,7 @@ KoFontDia::KoFontDia( const KoTextFormat& initialFormat, connect( languageTab, TQT_SIGNAL( languageChanged() ), this, TQT_SLOT( slotLanguageChanged() ) ); //Related properties List View - //relatedPropertiesListView = new KListView( mainHBox ); + //relatedPropertiesListView = new TDEListView( mainHBox ); //Preview fontDiaPreview = new KoFontDiaPreview( mainWidget ); diff --git a/lib/kotext/KoFontTab.cpp b/lib/kotext/KoFontTab.cpp index da0b524e..0615a337 100644 --- a/lib/kotext/KoFontTab.cpp +++ b/lib/kotext/KoFontTab.cpp @@ -23,7 +23,7 @@ KoFontTab::KoFontTab( uint fontListCriteria, TQWidget* parent, const char* name, : KoFontTabBase( parent, name, fl ) { TQStringList list; - KFontChooser_local::getFontList(list, fontListCriteria); + TDEFontChooser_local::getFontList(list, fontListCriteria); characterFont->setFamilyList( list ); comparisonFont = characterFont->font(); diff --git a/lib/kotext/KoSearchDia.cpp b/lib/kotext/KoSearchDia.cpp index b022eb72..7bbca041 100644 --- a/lib/kotext/KoSearchDia.cpp +++ b/lib/kotext/KoSearchDia.cpp @@ -589,7 +589,7 @@ KoFormatDia::KoFormatDia( TQWidget* parent, const TQString & _caption, KoSearchC m_checkVertAlign = new TQCheckBox( i18n( "Vertical alignment:" ), page ); - m_familyItem = new KFontCombo(page); + m_familyItem = new TDEFontCombo(page); m_familyItem->setCurrentFont(m_ctx->m_family); m_sizeItem = new TQSpinBox( 4, 100, 1, page ); diff --git a/lib/kotext/KoSearchDia.h b/lib/kotext/KoSearchDia.h index 40b4cb97..3c5ebf0b 100644 --- a/lib/kotext/KoSearchDia.h +++ b/lib/kotext/KoSearchDia.h @@ -47,7 +47,7 @@ class KoTextObject; class KCommand; class KoTextDocument; class KoFindReplace; -class KFontCombo; +class TDEFontCombo; class KoTextCursor; // // This class represents the KWord-specific search extension items, and also the @@ -321,7 +321,7 @@ private: TQCheckBox *m_checkFontAttribute; TQCheckBox *m_checkLanguage; - KFontCombo *m_familyItem; + TDEFontCombo *m_familyItem; TQSpinBox *m_sizeItem; KColorButton *m_colorItem; KColorButton *m_bgColorItem; diff --git a/lib/kotext/KoStyleManager.cpp b/lib/kotext/KoStyleManager.cpp index 5a99c38b..0738f0e3 100644 --- a/lib/kotext/KoStyleManager.cpp +++ b/lib/kotext/KoStyleManager.cpp @@ -683,7 +683,7 @@ KoStyleFontTab::KoStyleFontTab( TQWidget * parent ) ( new TQVBoxLayout( this ) )->setAutoAdd( true ); TQTabWidget *fontTabContainer = new TQTabWidget( this ); - m_fontTab = new KoFontTab( KFontChooser::SmoothScalableFonts, this ); + m_fontTab = new KoFontTab( TDEFontChooser::SmoothScalableFonts, this ); m_decorationTab = new KoDecorationTab( this ); m_highlightingTab = new KoHighlightingTab( this ); m_layoutTab = new KoLayoutTab( true, this ); diff --git a/lib/kotext/KoTextView.cpp b/lib/kotext/KoTextView.cpp index 47d7004b..55c54e9d 100644 --- a/lib/kotext/KoTextView.cpp +++ b/lib/kotext/KoTextView.cpp @@ -175,14 +175,14 @@ void KoTextView::handleKeyPressEvent( TQKeyEvent * e, TQWidget *widget, const TQ }*/ bool clearUndoRedoInfo = TRUE; - if ( KShortcut( KKey( e ) ) == KStdAccel::deleteWordBack() ) + if ( TDEShortcut( KKey( e ) ) == TDEStdAccel::deleteWordBack() ) { if ( m_cursor->parag()->string()->isRightToLeft() ) deleteWordRight(); else deleteWordLeft(); clearUndoRedoInfo = TRUE; - } else if ( KShortcut( KKey( e ) ) == KStdAccel::deleteWordForward() ) + } else if ( TDEShortcut( KKey( e ) ) == TDEStdAccel::deleteWordForward() ) { if ( m_cursor->parag()->string()->isRightToLeft() ) deleteWordLeft(); @@ -355,7 +355,7 @@ void KoTextView::handleKeyPressEvent( TQKeyEvent * e, TQWidget *widget, const TQ removeToolTipCompletion(); } - // We should use KAccel instead, to make this configurable ! + // We should use TDEAccel instead, to make this configurable ! // Well, those are all alternate keys, for keys already configurable (KDE-wide) // and a kaccel makes it hard to else @@ -1087,7 +1087,7 @@ KoLinkVariable * KoTextView::linkVariable() return dynamic_cast<KoLinkVariable *>(variable()); } -TQPtrList<KAction> KoTextView::dataToolActionList(TDEInstance * instance, const TQString& word, bool & _singleWord ) +TQPtrList<TDEAction> KoTextView::dataToolActionList(TDEInstance * instance, const TQString& word, bool & _singleWord ) { m_singleWord = false; m_wordUnderCursor = TQString(); @@ -1118,7 +1118,7 @@ TQPtrList<KAction> KoTextView::dataToolActionList(TDEInstance * instance, const } if ( text.isEmpty() || textObject()->protectContent()) // Nothing to apply a tool to - return TQPtrList<KAction>(); + return TQPtrList<TDEAction>(); // Any tool that works on plain text is relevant TQValueList<KDataToolInfo> tools; diff --git a/lib/kotext/KoTextView.h b/lib/kotext/KoTextView.h index 0954192b..20013ad7 100644 --- a/lib/kotext/KoTextView.h +++ b/lib/kotext/KoTextView.h @@ -35,7 +35,7 @@ class KoTextFormat; class KoParagCounter; class KCommand; class TQTimer; -class KAction; +class TDEAction; class TDEInstance; class KDataToolInfo; class KoLinkVariable; @@ -134,7 +134,7 @@ public: TQString wordUnderCursor( const KoTextCursor& cursor ); /** Return the list of actions from data-tools. Used to populate a RMB popupmenu usually. */ - TQPtrList<KAction> dataToolActionList( TDEInstance * instance, const TQString& word, bool & _singleWord ); + TQPtrList<TDEAction> dataToolActionList( TDEInstance * instance, const TQString& word, bool & _singleWord ); void insertSoftHyphen(); void insertLineBreak(); diff --git a/lib/kotext/KoVariable.cpp b/lib/kotext/KoVariable.cpp index 8ee25c19..856c05f1 100644 --- a/lib/kotext/KoVariable.cpp +++ b/lib/kotext/KoVariable.cpp @@ -569,10 +569,10 @@ void KoVariableCollection::setVariableSelected(KoVariable * var) m_varSelected=var; } -// TODO change to TQValueList<KAction *>, but only once plugActionList takes that -TQPtrList<KAction> KoVariableCollection::popupActionList() const +// TODO change to TQValueList<TDEAction *>, but only once plugActionList takes that +TQPtrList<TDEAction> KoVariableCollection::popupActionList() const { - TQPtrList<KAction> listAction; + TQPtrList<TDEAction> listAction; // Insert list of actions that change the subtype const TQStringList subTypeList = m_varSelected->subTypeList(); kdDebug() << k_funcinfo << "current subtype=" << m_varSelected->subType() << endl; @@ -583,7 +583,7 @@ TQPtrList<KAction> KoVariableCollection::popupActionList() const { // We store the subtype number as the action name TQCString name; name.setNum(i); - KToggleAction * act = new KToggleAction( *it, KShortcut(), 0, name ); + TDEToggleAction * act = new TDEToggleAction( *it, TDEShortcut(), 0, name ); connect( act, TQT_SIGNAL(activated()), this, TQT_SLOT(slotChangeSubType()) ); if ( i == m_varSelected->subType() ) act->setChecked( true ); @@ -600,14 +600,14 @@ TQPtrList<KAction> KoVariableCollection::popupActionList() const for ( int i = 0; it != list.end() ; ++it, ++i ) { if( i == 0 ) // first item, and list not empty - listAction.append( new KActionSeparator() ); + listAction.append( new TDEActionSeparator() ); if ( !(*it).isEmpty() ) // in case of removed subtypes or placeholders { format->setFormatProperties( *it ); // temporary change TQString text = format->convert( m_varSelected->varValue() ); // We store the raw format as the action name - KToggleAction * act = new KToggleAction(text, KShortcut(), 0, (*it).utf8()); + TDEToggleAction * act = new TDEToggleAction(text, TDEShortcut(), 0, (*it).utf8()); connect( act, TQT_SIGNAL(activated()), this, TQT_SLOT(slotChangeFormat()) ); if ( (*it) == currentFormat ) act->setChecked( true ); @@ -622,7 +622,7 @@ TQPtrList<KAction> KoVariableCollection::popupActionList() const void KoVariableCollection::slotChangeSubType() { - KAction * act = (KAction *)(sender()); + TDEAction * act = (TDEAction *)(sender()); int menuNumber = TQCString(act->name()).toInt(); int newSubType = m_varSelected->variableSubType(menuNumber); kdDebug(32500) << "slotChangeSubType: menuNumber=" << menuNumber << " newSubType=" << newSubType << endl; @@ -637,7 +637,7 @@ void KoVariableCollection::slotChangeSubType() void KoVariableCollection::slotChangeFormat() { - KAction * act = (KAction *)(sender()); + TDEAction * act = (TDEAction *)(sender()); TQString newFormat = TQString::fromUtf8(act->name()); TQString oldFormat = m_varSelected->variableFormat()->formatProperties(); if (oldFormat != newFormat ) diff --git a/lib/kotext/KoVariable.h b/lib/kotext/KoVariable.h index 5cadc5e9..8a066456 100644 --- a/lib/kotext/KoVariable.h +++ b/lib/kotext/KoVariable.h @@ -326,8 +326,8 @@ public: void setVariableSelected(KoVariable * var); KoVariable *selectedVariable()const {return m_varSelected;} - /// List of KActions to put into the popupmenu on a variable - TQPtrList<KAction> popupActionList() const; + /// List of TDEActions to put into the popupmenu on a variable + TQPtrList<TDEAction> popupActionList() const; protected slots: // This is here because variables and formats are not TQObjects @@ -335,7 +335,7 @@ public: void slotChangeFormat(); private: - //typedef TQMap<KAction *, int> VariableSubTextMap; + //typedef TQMap<TDEAction *, int> VariableSubTextMap; //VariableSubTextMap m_variableSubTextMap; TQPtrList<KoVariable> variables; @@ -446,7 +446,7 @@ protected: TQVariant m_varValue; int m_ascent; - //typedef TQMap<KAction *, int> SubTextMap; + //typedef TQMap<TDEAction *, int> SubTextMap; //SubTextMap m_subTextMap; class Private; Private *d; diff --git a/lib/kotext/Makefile.am b/lib/kotext/Makefile.am index 160c689c..fc2a2734 100644 --- a/lib/kotext/Makefile.am +++ b/lib/kotext/Makefile.am @@ -12,7 +12,7 @@ libkotext_la_SOURCES = KoComplexText.cpp KoRichText.cpp \ KoParagDia.cpp KoVariable.cpp KoCustomVariablesDia.cpp \ KoChangeCaseDia.cpp KoStyleManager.cpp KoSearchDia.cpp \ timedateformatwidget.ui TimeFormatWidget.cpp DateFormatWidget.cpp \ - KFontDialog_local.cpp kofonttabbase.ui KoFontTab.cpp kohighlightingtabbase.ui KoHighlightingTab.cpp \ + TDEFontDialog_local.cpp kofonttabbase.ui KoFontTab.cpp kohighlightingtabbase.ui KoHighlightingTab.cpp \ kodecorationtabbase.ui KoDecorationTab.cpp kolayouttabbase.ui KoLayoutTab.cpp kolanguagetabbase.ui KoLanguageTab.cpp \ KoFontDiaPreview.cpp KoCompletionDia.cpp KoCompletionBase.ui \ KoTextViewIface.skel KoTextViewIface.cc KoFontDia.cpp KoBgSpellCheck.cpp \ diff --git a/lib/kotext/KFontDialog_local.cpp b/lib/kotext/TDEFontDialog_local.cpp index 95bc2553..7103821b 100644 --- a/lib/kotext/KFontDialog_local.cpp +++ b/lib/kotext/TDEFontDialog_local.cpp @@ -56,8 +56,8 @@ #include <koffice_export.h> -#include "KFontDialog_local.h" -#include "KFontDialog_local.moc" +#include "TDEFontDialog_local.h" +#include "TDEFontDialog_local.moc" static int minimumListWidth( const TQListBox *list ) { @@ -83,16 +83,16 @@ static int minimumListHeight( const TQListBox *list, int numVisibleEntry ) return ( w * numVisibleEntry + 2 * list->frameWidth() ); } -class KFontChooser_local::KFontChooser_localPrivate +class TDEFontChooser_local::TDEFontChooser_localPrivate { public: - KFontChooser_localPrivate() + TDEFontChooser_localPrivate() { m_palette.setColor(TQPalette::Active, TQColorGroup::Text, TQt::black); m_palette.setColor(TQPalette::Active, TQColorGroup::Base, TQt::white); } TQPalette m_palette; }; -KFontChooser_local::KFontChooser_local(TQWidget *parent, const char *name, +TDEFontChooser_local::TDEFontChooser_local(TQWidget *parent, const char *name, bool onlyFixed, const TQStringList &fontList, bool makeFrame, int visibleListSize, bool diff, TQButton::ToggleState *sizeIsRelativeState ) @@ -104,7 +104,7 @@ KFontChooser_local::KFontChooser_local(TQWidget *parent, const char *name, i18n( "Here you can choose the font to be used." ); TQWhatsThis::add( this, mainWhatsThisText ); - d = new KFontChooser_localPrivate; + d = new TDEFontChooser_localPrivate; TQVBoxLayout *topLayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); int checkBoxGap = KDialog::spacingHint() / 2; @@ -195,7 +195,7 @@ KFontChooser_local::KFontChooser_local(TQWidget *parent, const char *name, // // now create the actual boxes that hold the info // - familyListBox = new KListBox( page, "familyListBox"); + familyListBox = new TDEListBox( page, "familyListBox"); familyListBox->setEnabled( !diff ); gridLayout->addWidget( familyListBox, row, 0 ); TQString fontFamilyWhatsThisText = @@ -217,7 +217,7 @@ KFontChooser_local::KFontChooser_local(TQWidget *parent, const char *name, familyListBox->setMinimumHeight( minimumListHeight( familyListBox, visibleListSize ) ); - styleListBox = new KListBox( page, "styleListBox"); + styleListBox = new TDEListBox( page, "styleListBox"); styleListBox->setEnabled( !diff ); gridLayout->addWidget(styleListBox, row, 1); TQString fontStyleWhatsThisText = @@ -236,7 +236,7 @@ KFontChooser_local::KFontChooser_local(TQWidget *parent, const char *name, TQT_SLOT(style_chosen_slot(const TQString &))); - sizeListBox = new KListBox( page, "sizeListBox"); + sizeListBox = new TDEListBox( page, "sizeListBox"); sizeOfFont = new KIntNumInput( page, "sizeOfFont"); sizeOfFont->setMinValue(4); @@ -337,12 +337,12 @@ KFontChooser_local::KFontChooser_local(TQWidget *parent, const char *name, showXLFDArea(config->readBoolEntry(TQString::fromLatin1("fontSelectorShowXLFD"), false)); } -KFontChooser_local::~KFontChooser_local() +TDEFontChooser_local::~TDEFontChooser_local() { delete d; } -void KFontChooser_local::fillSizeList() { +void TDEFontChooser_local::fillSizeList() { if(! sizeListBox) return; //assertion. static const int c[] = @@ -361,7 +361,7 @@ void KFontChooser_local::fillSizeList() { } } -void KFontChooser_local::setColor( const TQColor & col ) +void TDEFontChooser_local::setColor( const TQColor & col ) { d->m_palette.setColor( TQPalette::Active, TQColorGroup::Text, col ); TQPalette pal = sampleEdit->palette(); @@ -369,12 +369,12 @@ void KFontChooser_local::setColor( const TQColor & col ) sampleEdit->setPalette( pal ); } -TQColor KFontChooser_local::color() const +TQColor TDEFontChooser_local::color() const { return d->m_palette.color( TQPalette::Active, TQColorGroup::Text ); } -void KFontChooser_local::setBackgroundColor( const TQColor & col ) +void TDEFontChooser_local::setBackgroundColor( const TQColor & col ) { d->m_palette.setColor( TQPalette::Active, TQColorGroup::Base, col ); TQPalette pal = sampleEdit->palette(); @@ -382,12 +382,12 @@ void KFontChooser_local::setBackgroundColor( const TQColor & col ) sampleEdit->setPalette( pal ); } -TQColor KFontChooser_local::backgroundColor() const +TQColor TDEFontChooser_local::backgroundColor() const { return d->m_palette.color( TQPalette::Active, TQColorGroup::Base ); } -void KFontChooser_local::setSizeIsRelative( TQButton::ToggleState relative ) +void TDEFontChooser_local::setSizeIsRelative( TQButton::ToggleState relative ) { // check or uncheck or gray out the "relative" checkbox if( sizeIsRelativeCheckBox ) { @@ -398,20 +398,20 @@ void KFontChooser_local::setSizeIsRelative( TQButton::ToggleState relative ) } } -TQButton::ToggleState KFontChooser_local::sizeIsRelative() const +TQButton::ToggleState TDEFontChooser_local::sizeIsRelative() const { return sizeIsRelativeCheckBox ? sizeIsRelativeCheckBox->state() : TQButton::NoChange; } -TQSize KFontChooser_local::sizeHint( void ) const +TQSize TDEFontChooser_local::sizeHint( void ) const { return minimumSizeHint(); } -void KFontChooser_local::enableColumn( int column, bool state ) +void TDEFontChooser_local::enableColumn( int column, bool state ) { if( column & FamilyList ) { @@ -428,7 +428,7 @@ void KFontChooser_local::enableColumn( int column, bool state ) } -void KFontChooser_local::setFont( const TQFont& aFont, bool onlyFixed ) +void TDEFontChooser_local::setFont( const TQFont& aFont, bool onlyFixed ) { selFont = aFont; selectedSize=aFont.pointSize(); @@ -445,7 +445,7 @@ void KFontChooser_local::setFont( const TQFont& aFont, bool onlyFixed ) } -int KFontChooser_local::fontDiffFlags() { +int TDEFontChooser_local::fontDiffFlags() { int diffFlags = 0; if (familyCheckbox && styleCheckbox && sizeCheckbox) { diffFlags = (int)(familyCheckbox->isChecked() ? FontDiffFamily : 0) @@ -455,7 +455,7 @@ int KFontChooser_local::fontDiffFlags() { return diffFlags; } -void KFontChooser_local::toggled_checkbox() +void TDEFontChooser_local::toggled_checkbox() { familyListBox->setEnabled( familyCheckbox->isChecked() ); styleListBox->setEnabled( styleCheckbox->isChecked() ); @@ -463,7 +463,7 @@ void KFontChooser_local::toggled_checkbox() sizeOfFont->setEnabled( sizeCheckbox->isChecked() ); } -void KFontChooser_local::family_chosen_slot(const TQString& family) +void TDEFontChooser_local::family_chosen_slot(const TQString& family) { TQString currentFamily; if (family.isEmpty()) @@ -509,7 +509,7 @@ void KFontChooser_local::family_chosen_slot(const TQString& family) } -void KFontChooser_local::size_chosen_slot(const TQString& size){ +void TDEFontChooser_local::size_chosen_slot(const TQString& size){ selectedSize=size.toInt(); sizeOfFont->setValue(selectedSize); @@ -517,12 +517,12 @@ void KFontChooser_local::size_chosen_slot(const TQString& size){ emit fontSelected(selFont); } -void KFontChooser_local::size_value_slot(int val) { +void TDEFontChooser_local::size_value_slot(int val) { selFont.setPointSize(val); emit fontSelected(selFont); } -void KFontChooser_local::style_chosen_slot(const TQString& style) +void TDEFontChooser_local::style_chosen_slot(const TQString& style) { TQString currentStyle; if (style.isEmpty()) @@ -562,7 +562,7 @@ void KFontChooser_local::style_chosen_slot(const TQString& style) selectedStyle = style; } -void KFontChooser_local::displaySample(const TQFont& font) +void TDEFontChooser_local::displaySample(const TQFont& font) { sampleEdit->setFont(font); sampleEdit->setCursorPosition(0); @@ -574,7 +574,7 @@ void KFontChooser_local::displaySample(const TQFont& font) //kdDebug() << " (" << font.toString() << ")\n"; } -void KFontChooser_local::setupDisplay() +void TDEFontChooser_local::setupDisplay() { // Calling familyListBox->setCurrentItem() causes the value of selFont // to change, so we save the family, style and size beforehand. @@ -651,7 +651,7 @@ void KFontChooser_local::setupDisplay() } -void KFontChooser_local::getFontList( TQStringList &list, uint fontListCriteria) +void TDEFontChooser_local::getFontList( TQStringList &list, uint fontListCriteria) { TQFontDatabase dbase; TQStringList lstSys(dbase.families()); @@ -684,7 +684,7 @@ void KFontChooser_local::getFontList( TQStringList &list, uint fontListCriteria) list = lstSys; } -void KFontChooser_local::addFont( TQStringList &list, const char *xfont ) +void TDEFontChooser_local::addFont( TQStringList &list, const char *xfont ) { const char *ptr = strchr( xfont, '-' ); if ( !ptr ) @@ -712,7 +712,7 @@ void KFontChooser_local::addFont( TQStringList &list, const char *xfont ) } } -void KFontChooser_local::fillFamilyListBox(bool onlyFixedFonts) +void TDEFontChooser_local::fillFamilyListBox(bool onlyFixedFonts) { TQStringList fontList; getFontList(fontList, onlyFixedFonts?FixedWidthFonts:0); @@ -720,7 +720,7 @@ void KFontChooser_local::fillFamilyListBox(bool onlyFixedFonts) familyListBox->insertStringList(fontList); } -void KFontChooser_local::setFamilyList( TQStringList list ) +void TDEFontChooser_local::setFamilyList( TQStringList list ) { familyListBox->blockSignals( true ); familyListBox->clear(); @@ -729,7 +729,7 @@ void KFontChooser_local::setFamilyList( TQStringList list ) familyListBox->blockSignals( false ); } -void KFontChooser_local::showXLFDArea(bool show) +void TDEFontChooser_local::showXLFDArea(bool show) { if( show ) { @@ -743,24 +743,24 @@ void KFontChooser_local::showXLFDArea(bool show) /////////////////////////////////////////////////////////////////////////////// -KFontDialog_local::KFontDialog_local( TQWidget *parent, const char* name, +TDEFontDialog_local::TDEFontDialog_local( TQWidget *parent, const char* name, bool onlyFixed, bool modal, const TQStringList &fontList, bool makeFrame, bool diff, TQButton::ToggleState *sizeIsRelativeState ) : KDialogBase( parent, name, modal, i18n("Select Font"), Ok|Cancel, Ok ) { - chooser = new KFontChooser_local( this, "fontChooser", + chooser = new TDEFontChooser_local( this, "fontChooser", onlyFixed, fontList, makeFrame, 8, diff, sizeIsRelativeState ); setMainWidget(chooser); } -int KFontDialog_local::getFontDiff( TQFont &theFont, int &diffFlags, bool onlyFixed, +int TDEFontDialog_local::getFontDiff( TQFont &theFont, int &diffFlags, bool onlyFixed, TQWidget *parent, bool makeFrame, TQButton::ToggleState *sizeIsRelativeState ) { - KFontDialog_local dlg( parent, "Font Selector", onlyFixed, true, TQStringList(), + TDEFontDialog_local dlg( parent, "Font Selector", onlyFixed, true, TQStringList(), makeFrame, true, sizeIsRelativeState ); dlg.setFont( theFont, onlyFixed ); @@ -775,11 +775,11 @@ int KFontDialog_local::getFontDiff( TQFont &theFont, int &diffFlags, bool onlyFi return result; } -int KFontDialog_local::getFont( TQFont &theFont, bool onlyFixed, +int TDEFontDialog_local::getFont( TQFont &theFont, bool onlyFixed, TQWidget *parent, bool makeFrame, TQButton::ToggleState *sizeIsRelativeState ) { - KFontDialog_local dlg( parent, "Font Selector", onlyFixed, true, TQStringList(), + TDEFontDialog_local dlg( parent, "Font Selector", onlyFixed, true, TQStringList(), makeFrame, false, sizeIsRelativeState ); dlg.setFont( theFont, onlyFixed ); @@ -794,12 +794,12 @@ int KFontDialog_local::getFont( TQFont &theFont, bool onlyFixed, } -int KFontDialog_local::getFontAndText( TQFont &theFont, TQString &theString, +int TDEFontDialog_local::getFontAndText( TQFont &theFont, TQString &theString, bool onlyFixed, TQWidget *parent, bool makeFrame, TQButton::ToggleState *sizeIsRelativeState ) { - KFontDialog_local dlg( parent, "Font and Text Selector", onlyFixed, true, + TDEFontDialog_local dlg( parent, "Font and Text Selector", onlyFixed, true, TQStringList(), makeFrame, false, sizeIsRelativeState ); dlg.setFont( theFont, onlyFixed ); @@ -814,8 +814,8 @@ int KFontDialog_local::getFontAndText( TQFont &theFont, TQString &theString, return result; } -void KFontChooser_local::virtual_hook( int, void* ) +void TDEFontChooser_local::virtual_hook( int, void* ) { /*BASE::virtual_hook( id, data );*/ } -void KFontDialog_local::virtual_hook( int id, void* data ) +void TDEFontDialog_local::virtual_hook( int id, void* data ) { KDialogBase::virtual_hook( id, data ); } diff --git a/lib/kotext/KFontDialog_local.h b/lib/kotext/TDEFontDialog_local.h index 3ed6ff08..4c238874 100644 --- a/lib/kotext/KFontDialog_local.h +++ b/lib/kotext/TDEFontDialog_local.h @@ -41,20 +41,20 @@ class TQFont; class TQGroupBox; class TQLabel; class TQStringList; -class KListBox; +class TDEListBox; class KIntNumInput; /** * @short A font selection widget. * - * While KFontChooser_local as an ordinary widget can be embedded in + * While TDEFontChooser_local as an ordinary widget can be embedded in * custom dialogs and therefore is very flexible, in most cases * it is preferable to use the convenience functions in - * KFontDialog_local. + * TDEFontDialog_local. * * @author Preston Brown <[email protected]>, Bernd Wuebben <[email protected]> * @version $Id: kfontdialog.h,v 1.71 2004/10/10 10:27:49 bhards Exp $ */ -class KOTEXT_EXPORT KFontChooser_local : public TQWidget +class KOTEXT_EXPORT TDEFontChooser_local : public TQWidget { Q_OBJECT @@ -83,8 +83,8 @@ public: * <p>Consider the following code snippet; * \code * TQStringList list; - * KFontChooser_local::getFontList(list,SmoothScalableFonts); - * KFontChooser_local chooseFont = new KFontChooser_local(0, "FontList", false, list); + * TDEFontChooser_local::getFontList(list,SmoothScalableFonts); + * TDEFontChooser_local chooseFont = new TDEFontChooser_local(0, "FontList", false, list); * \endcode * <p> * The above creates a font chooser dialog with only SmoothScaleble fonts. @@ -98,7 +98,7 @@ public: * If that has not been created, X is queried, and all fonts * available on the system are displayed. * @param diff Display the difference version dialog. - * See KFontDialog_local::getFontDiff(). + * See TDEFontDialog_local::getFontDiff(). * @param makeFrame Draws a frame with titles around the contents. * @param visibleListSize The minimum number of visible entries in the * fontlists. @@ -109,7 +109,7 @@ public: * *sizeIsRelativeState, user choice may be retrieved by * calling sizeIsRelative(). */ - KFontChooser_local(TQWidget *parent = 0L, const char *name = 0L, + TDEFontChooser_local(TQWidget *parent = 0L, const char *name = 0L, bool onlyFixed = false, const TQStringList &fontList = TQStringList(), bool makeFrame = true, int visibleListSize=8, @@ -118,7 +118,7 @@ public: /** * Destructs the font chooser. */ - virtual ~KFontChooser_local(); + virtual ~TDEFontChooser_local(); /** * Enables or disable a font column in the chooser. @@ -248,13 +248,13 @@ public: * * @param list The list is returned here. * @param fontListCriteria should contain all the restrictions for font selection as OR-ed values - * @see KFontChooser_local::FontListCriteria for the individual values + * @see TDEFontChooser_local::FontListCriteria for the individual values */ static void getFontList( TQStringList &list, uint fontListCriteria); /** * - * Fill the font family list of the KFontChooser + * Fill the font family list of the TDEFontChooser * * @param list The font list. */ @@ -302,9 +302,9 @@ private: TQCheckBox *styleCheckbox; TQCheckBox *sizeCheckbox; TQLabel *sizeLabel; - KListBox *familyListBox; - KListBox *styleListBox; - KListBox *sizeListBox; + TDEListBox *familyListBox; + TDEListBox *styleListBox; + TDEListBox *sizeListBox; TQComboBox *charsetsCombo; // BIC: remove in KDE4 TQCheckBox *sizeIsRelativeCheckBox; @@ -320,17 +320,17 @@ private: protected: virtual void virtual_hook( int id, void* data ); private: - class KFontChooser_localPrivate; - KFontChooser_localPrivate *d; + class TDEFontChooser_localPrivate; + TDEFontChooser_localPrivate *d; }; /** * @short A font selection dialog. * - * The KFontDialog_local provides a dialog for interactive font selection. - * It is basically a thin wrapper around the KFontChooser_local widget, + * The TDEFontDialog_local provides a dialog for interactive font selection. + * It is basically a thin wrapper around the TDEFontChooser_local widget, * which can also be used standalone. In most cases, the simplest - * use of this class is the static method KFontDialog_local::getFont(), + * use of this class is the static method TDEFontDialog_local::getFont(), * which pops up the dialog, allows the user to select a font, and * returns when the dialog is closed. * @@ -338,8 +338,8 @@ private: * * \code * TQFont myFont; - * int result = KFontDialog_local::getFont( myFont ); - * if ( result == KFontDialog_local::Accepted ) + * int result = TDEFontDialog_local::getFont( myFont ); + * if ( result == TDEFontDialog_local::Accepted ) * ... * \endcode * @@ -348,7 +348,7 @@ private: * @author Preston Brown <[email protected]>, Bernd Wuebben <[email protected]> * @version $Id: kfontdialog.h,v 1.71 2004/10/10 10:27:49 bhards Exp $ */ -class KOTEXT_EXPORT KFontDialog_local : public KDialogBase { +class KOTEXT_EXPORT TDEFontDialog_local : public KDialogBase { Q_OBJECT @@ -375,7 +375,7 @@ public: * calling sizeIsRelative(). * */ - KFontDialog_local( TQWidget *parent = 0L, const char *name = 0, + TDEFontDialog_local( TQWidget *parent = 0L, const char *name = 0, bool onlyFixed = false, bool modal = false, const TQStringList &fontlist = TQStringList(), bool makeFrame = true, bool diff = false, @@ -447,11 +447,11 @@ public: * difference selection bitmask should be written. * Check the returned bitmask like: * \code - * if ( diffFlags & KFontChooser_local::FontDiffFamily ) + * if ( diffFlags & TDEFontChooser_local::FontDiffFamily ) * [...] - * if ( diffFlags & KFontChooser_local::FontDiffStyle ) + * if ( diffFlags & TDEFontChooser_local::FontDiffStyle ) * [...] - * if ( diffFlags & KFontChooser_local::FontDiffSize ) + * if ( diffFlags & TDEFontChooser_local::FontDiffSize ) * [...] * \endcode * @param onlyFixed if true, only select from fixed-width fonts. @@ -504,13 +504,13 @@ signals: void fontSelected( const TQFont &font ); protected: - KFontChooser_local *chooser; + TDEFontChooser_local *chooser; protected: virtual void virtual_hook( int id, void* data ); private: - class KFontDialog_localPrivate; - KFontDialog_localPrivate *d; + class TDEFontDialog_localPrivate; + TDEFontDialog_localPrivate *d; }; diff --git a/lib/kotext/kofonttabbase.ui b/lib/kotext/kofonttabbase.ui index fa8b9ba4..d6d0a2f6 100644 --- a/lib/kotext/kofonttabbase.ui +++ b/lib/kotext/kofonttabbase.ui @@ -11,7 +11,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="KFontChooser_local"> + <widget class="TDEFontChooser_local"> <property name="name"> <cstring>characterFont</cstring> </property> @@ -20,9 +20,9 @@ </widget> <layoutdefaults spacing="6" margin="11"/> <includes> - <include location="local" impldecl="in declaration">KFontDialog_local.h</include> + <include location="local" impldecl="in declaration">TDEFontDialog_local.h</include> </includes> <includehints> - <includehint>KFontDialog_local.h</includehint> + <includehint>TDEFontDialog_local.h</includehint> </includehints> </UI> diff --git a/lib/kross/api/eventaction.cpp b/lib/kross/api/eventaction.cpp index 4210fb0e..7578eb30 100644 --- a/lib/kross/api/eventaction.cpp +++ b/lib/kross/api/eventaction.cpp @@ -25,7 +25,7 @@ using namespace Kross::Api; -EventAction::EventAction(const TQString& name, KAction* action) +EventAction::EventAction(const TQString& name, TDEAction* action) : Event<EventAction>(name.isEmpty() ? TQString(action->name()) : name) , m_action(action) { diff --git a/lib/kross/api/eventaction.h b/lib/kross/api/eventaction.h index e20656df..602a697f 100644 --- a/lib/kross/api/eventaction.h +++ b/lib/kross/api/eventaction.h @@ -33,7 +33,7 @@ namespace Kross { namespace Api { class ScriptContainer; /** - * The EventAction class is used to wrap KAction instances + * The EventAction class is used to wrap TDEAction instances * into the Kross object hierachy and provide access to * them. */ @@ -50,7 +50,7 @@ namespace Kross { namespace Api { /** * Constructor. */ - EventAction(const TQString& name, KAction* action); + EventAction(const TQString& name, TDEAction* action); /** * Destructor. @@ -64,7 +64,7 @@ namespace Kross { namespace Api { //virtual Object::Ptr call(const TQString& name, TDESharedPtr<List> arguments); private: - KAction* m_action; + TDEAction* m_action; /// \return the text associated with this action. Kross::Api::Object::Ptr getText(Kross::Api::List::Ptr); diff --git a/lib/kross/main/mainmodule.cpp b/lib/kross/main/mainmodule.cpp index 8c29180f..bd5a9aab 100644 --- a/lib/kross/main/mainmodule.cpp +++ b/lib/kross/main/mainmodule.cpp @@ -105,11 +105,11 @@ QtObject::Ptr MainModule::addTQObject(TQObject* object, const TQString& name) return qtobject; } -EventAction::Ptr MainModule::addKAction(KAction* action, const TQString& name) +EventAction::Ptr MainModule::addTDEAction(TDEAction* action, const TQString& name) { EventAction* event = new EventAction(name, action); if(! addChild(name, event)) { - krosswarning( TQString("Failed to add KAction name='%1'").arg(action->name()) ); + krosswarning( TQString("Failed to add TDEAction name='%1'").arg(action->name()) ); return 0; } return event; diff --git a/lib/kross/main/mainmodule.h b/lib/kross/main/mainmodule.h index 96abd06d..06a4836d 100644 --- a/lib/kross/main/mainmodule.h +++ b/lib/kross/main/mainmodule.h @@ -151,19 +151,19 @@ namespace Kross { namespace Api { QtObject::Ptr addTQObject(TQObject* object, const TQString& name = TQString()); /** - * Add a \a KAction to the eventcollection. The - * KAction will be wrapped by a \a EventAction + * Add a \a TDEAction to the eventcollection. The + * TDEAction will be wrapped by a \a EventAction * and will be added to this collection. * * \param name name to identify the \a action by - * \param action the KAction instance that should + * \param action the TDEAction instance that should * be added to this \a MainModule * \return the newly added \a EventAction instance * which is now a child of this \a MainModule * * \todo check \a name dox. */ - EventAction::Ptr addKAction(KAction* action, const TQString& name = TQString()); + EventAction::Ptr addTDEAction(TDEAction* action, const TQString& name = TQString()); //typedef TQValueList<Callable::Ptr> EventList; //EventList getEvents(); diff --git a/lib/kross/main/scriptaction.cpp b/lib/kross/main/scriptaction.cpp index f7e11618..2e775fcb 100644 --- a/lib/kross/main/scriptaction.cpp +++ b/lib/kross/main/scriptaction.cpp @@ -83,7 +83,7 @@ namespace Kross { namespace Api { }} ScriptAction::ScriptAction(const TQString& file) - : KAction(0, file.latin1()) + : TDEAction(0, file.latin1()) , Kross::Api::ScriptContainer(file) , d( new ScriptActionPrivate() ) // initialize d-pointer class { @@ -102,7 +102,7 @@ ScriptAction::ScriptAction(const TQString& file) } ScriptAction::ScriptAction(const TQString& scriptconfigfile, const TQDomElement& element) - : KAction() + : TDEAction() , Kross::Api::ScriptContainer() , d( new ScriptActionPrivate() ) // initialize d-pointer class { @@ -158,10 +158,10 @@ ScriptAction::ScriptAction(const TQString& scriptconfigfile, const TQDomElement& ScriptContainer::setName(file); } - KAction::setName(name.latin1()); - KAction::setText(text); + TDEAction::setName(name.latin1()); + TDEAction::setText(text); setDescription(description); - KAction::setIcon(icon); + TDEAction::setIcon(icon); // connect signal connect(this, TQT_SIGNAL(activated()), this, TQT_SLOT(activate())); diff --git a/lib/kross/main/scriptaction.h b/lib/kross/main/scriptaction.h index 3d6e890b..4d60d4dc 100644 --- a/lib/kross/main/scriptaction.h +++ b/lib/kross/main/scriptaction.h @@ -33,11 +33,11 @@ namespace Kross { namespace Api { class ScriptActionPrivate; /** - * A ScriptAction extends a KAction by providing a wrapper around + * A ScriptAction extends a TDEAction by providing a wrapper around * a \a ScriptContainer to execute scripting code on activation. */ class ScriptAction - : public KAction + : public TDEAction , public Kross::Api::ScriptContainer { Q_OBJECT @@ -206,10 +206,10 @@ namespace Kross { namespace Api { TQMap<TQCString, ScriptAction::Ptr> m_actions; /** - * A KActionMenu which could be used to display the + * A TDEActionMenu which could be used to display the * content of this \a ScriptActionCollection instance. */ - KActionMenu* m_actionmenu; + TDEActionMenu* m_actionmenu; /** * Boolean value used to represent the modified-state. Will @@ -234,12 +234,12 @@ namespace Kross { namespace Api { * Constructor. * * \param text The text used to display some describing caption. - * \param ac The KActionCollection which should be used to as - * initial content for the KActionMenu \a m_actionmenu . + * \param ac The TDEActionCollection which should be used to as + * initial content for the TDEActionMenu \a m_actionmenu . * \param name The internal name. */ - ScriptActionCollection(const TQString& text, KActionCollection* ac, const char* name) - : m_actionmenu( new KActionMenu(text, ac, name) ) + ScriptActionCollection(const TQString& text, TDEActionCollection* ac, const char* name) + : m_actionmenu( new TDEActionMenu(text, ac, name) ) , m_dirty(true) {} @@ -263,9 +263,9 @@ namespace Kross { namespace Api { TQValueList<ScriptAction::Ptr> actions() { return m_list; } /** - * \return the KActionMenu \a m_actionmenu . + * \return the TDEActionMenu \a m_actionmenu . */ - KActionMenu* actionMenu() { return m_actionmenu; } + TDEActionMenu* actionMenu() { return m_actionmenu; } /** * Attach a \a ScriptAction instance to this \a ScriptActionCollection . diff --git a/lib/kross/main/scriptguiclient.cpp b/lib/kross/main/scriptguiclient.cpp index eaf31101..9dd304ae 100644 --- a/lib/kross/main/scriptguiclient.cpp +++ b/lib/kross/main/scriptguiclient.cpp @@ -76,10 +76,10 @@ ScriptGUIClient::ScriptGUIClient(KXMLGUIClient* guiclient, TQWidget* parent) setInstance( ScriptGUIClient::instance() ); // action to execute a scriptfile. - new KAction(i18n("Execute Script File..."), 0, 0, this, TQT_SLOT(executeScriptFile()), actionCollection(), "executescriptfile"); + new TDEAction(i18n("Execute Script File..."), 0, 0, this, TQT_SLOT(executeScriptFile()), actionCollection(), "executescriptfile"); // acion to show the ScriptManagerGUI dialog. - new KAction(i18n("Scripts Manager..."), 0, 0, this, TQT_SLOT(showScriptManager()), actionCollection(), "configurescripts"); + new TDEAction(i18n("Scripts Manager..."), 0, 0, this, TQT_SLOT(showScriptManager()), actionCollection(), "configurescripts"); // The predefined ScriptActionCollection's this ScriptGUIClient provides. d->collections.replace("installedscripts", diff --git a/lib/kross/main/scriptguiclient.h b/lib/kross/main/scriptguiclient.h index c8ebf912..01a9b22e 100644 --- a/lib/kross/main/scriptguiclient.h +++ b/lib/kross/main/scriptguiclient.h @@ -50,8 +50,8 @@ namespace Kross { namespace Api { public: - /// List of KAction instances. - typedef TQPtrList<KAction> List; + /// List of TDEAction instances. + typedef TQPtrList<TDEAction> List; /** * Constructor. diff --git a/lib/kross/main/wdgscriptsmanager.cpp b/lib/kross/main/wdgscriptsmanager.cpp index c63b7603..de653fbd 100644 --- a/lib/kross/main/wdgscriptsmanager.cpp +++ b/lib/kross/main/wdgscriptsmanager.cpp @@ -87,7 +87,7 @@ class ListItem : public TQListViewItem class ToolTip : public TQToolTip { public: - ToolTip(KListView* parent) : TQToolTip(parent->viewport()), m_parent(parent) {} + ToolTip(TDEListView* parent) : TQToolTip(parent->viewport()), m_parent(parent) {} virtual ~ToolTip () { remove(m_parent->viewport()); } protected: virtual void maybeTip(const TQPoint& p) { @@ -100,7 +100,7 @@ class ToolTip : public TQToolTip } } private: - KListView* m_parent; + TDEListView* m_parent; }; class WdgScriptsManagerPrivate @@ -152,7 +152,7 @@ WdgScriptsManager::WdgScriptsManager(ScriptGUIClient* scr, TQWidget* parent, con connect(btnNewStuff, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotGetNewScript())); #endif /* - toolBar->setIconText( KToolBar::IconTextRight ); + toolBar->setIconText( TDEToolBar::IconTextRight ); toolBar->insertButton("exec", WdgScriptsManagerPrivate::ExecBtn, false, i18n("Execute")); toolBar->addConnection(WdgScriptsManagerPrivate::ExecBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotExecuteScript())); diff --git a/lib/kross/main/wdgscriptsmanagerbase.ui b/lib/kross/main/wdgscriptsmanagerbase.ui index 1140e848..116b1ca3 100644 --- a/lib/kross/main/wdgscriptsmanagerbase.ui +++ b/lib/kross/main/wdgscriptsmanagerbase.ui @@ -36,7 +36,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="KListView"> + <widget class="TDEListView"> <property name="name"> <cstring>scriptsList</cstring> </property> @@ -49,7 +49,7 @@ </sizepolicy> </property> </widget> - <widget class="KToolBar"> + <widget class="TDEToolBar"> <property name="name"> <cstring>toolBar</cstring> </property> @@ -212,7 +212,7 @@ </widget> <customwidgets> <customwidget> - <class>KToolBar</class> + <class>TDEToolBar</class> <header location="local">ktoolbar.h</header> <sizehint> <width>20</width> diff --git a/lib/kross/test/testaction.cpp b/lib/kross/test/testaction.cpp index 481de0cf..42963904 100644 --- a/lib/kross/test/testaction.cpp +++ b/lib/kross/test/testaction.cpp @@ -22,15 +22,15 @@ TestAction::TestAction(Kross::Api::ScriptContainer::Ptr scriptcontainer) : TQWidget() { - m_actioncollection = new KActionCollection(this, this); + m_actioncollection = new TDEActionCollection(this, this); - m_action1 = new KAction("Action1_Text", 0, this, TQT_SLOT(activatedAction1()), m_actioncollection, "Action1"); + m_action1 = new TDEAction("Action1_Text", 0, this, TQT_SLOT(activatedAction1()), m_actioncollection, "Action1"); m_actionlist.append(m_action1); - scriptcontainer->addKAction(m_action1); + scriptcontainer->addTDEAction(m_action1); - m_action2 = new KAction("Action2_Text", 0, this, TQT_SLOT(activatedAction2()), m_actioncollection, "Action2"); + m_action2 = new TDEAction("Action2_Text", 0, this, TQT_SLOT(activatedAction2()), m_actioncollection, "Action2"); m_actionlist.append(m_action2); - scriptcontainer->addKAction(m_action2); + scriptcontainer->addTDEAction(m_action2); } TestAction::~TestAction() diff --git a/lib/kross/test/testaction.h b/lib/kross/test/testaction.h index 7f4dd79c..32e6cdcd 100644 --- a/lib/kross/test/testaction.h +++ b/lib/kross/test/testaction.h @@ -42,10 +42,10 @@ class TestAction : public TQWidget void activatedAction2(); private: - KAction* m_action1; - KAction* m_action2; - KActionCollection* m_actioncollection; - KActionPtrList m_actionlist; + TDEAction* m_action1; + TDEAction* m_action2; + TDEActionCollection* m_actioncollection; + TDEActionPtrList m_actionlist; }; #endif diff --git a/lib/kross/test/testwindow.cpp b/lib/kross/test/testwindow.cpp index ec0090b6..f83d7ace 100644 --- a/lib/kross/test/testwindow.cpp +++ b/lib/kross/test/testwindow.cpp @@ -35,7 +35,7 @@ #include <kstandarddirs.h> TestWindow::TestWindow(const TQString& interpretername, const TQString& scriptcode) - : KMainWindow() + : TDEMainWindow() , m_interpretername(interpretername) , m_scriptcode(scriptcode) { @@ -43,7 +43,7 @@ TestWindow::TestWindow(const TQString& interpretername, const TQString& scriptco manager->addModule( new TestPluginModule("krosstestpluginmodule") ); m_scriptcontainer = manager->getScriptContainer("test"); - KPopupMenu *menuFile = new KPopupMenu( this ); + TDEPopupMenu *menuFile = new TDEPopupMenu( this ); menuBar()->insertItem( "&File", menuFile ); m_scriptextension = new Kross::Api::ScriptGUIClient(this, this); @@ -58,15 +58,15 @@ TestWindow::TestWindow(const TQString& interpretername, const TQString& scriptco //menuFile->insertSeparator(); - KAction* execaction = m_scriptextension->action("executescriptfile"); + TDEAction* execaction = m_scriptextension->action("executescriptfile"); if(execaction) execaction->plug(menuFile); - KAction* configaction = m_scriptextension->action("configurescripts"); + TDEAction* configaction = m_scriptextension->action("configurescripts"); if(configaction) configaction->plug(menuFile); - KAction* scriptsaction = m_scriptextension->action("installedscripts"); + TDEAction* scriptsaction = m_scriptextension->action("installedscripts"); if(scriptsaction) scriptsaction->plug(menuFile); - //menuFile->insertItem( ( (KActionMenu*)m_scriptextension->action("scripts") )->popupMenu() ); + //menuFile->insertItem( ( (TDEActionMenu*)m_scriptextension->action("scripts") )->popupMenu() ); TQVBox* mainbox = new TQVBox(this); diff --git a/lib/kross/test/testwindow.h b/lib/kross/test/testwindow.h index 9a10104c..c3da5cc5 100644 --- a/lib/kross/test/testwindow.h +++ b/lib/kross/test/testwindow.h @@ -33,7 +33,7 @@ class TQComboBox; class KTextEdit; -class TestWindow : public KMainWindow +class TestWindow : public TDEMainWindow { Q_OBJECT |