diff options
Diffstat (limited to 'kate/part/kateschema.cpp')
| -rw-r--r-- | kate/part/kateschema.cpp | 129 |
1 files changed, 63 insertions, 66 deletions
diff --git a/kate/part/kateschema.cpp b/kate/part/kateschema.cpp index f7977fac6..a055a00e5 100644 --- a/kate/part/kateschema.cpp +++ b/kate/part/kateschema.cpp @@ -155,12 +155,12 @@ class KateStyleListCaption : public TQListViewItem //BEGIN KateSchemaManager TQString KateSchemaManager::normalSchema () { - return TDEApplication::kApplication()->aboutData()->appName () + TQString (" - Normal"); + return tdeApp->aboutData()->appName () + TQString (" - Normal"); } TQString KateSchemaManager::printingSchema () { - return TDEApplication::kApplication()->aboutData()->appName () + TQString (" - Printing"); + return tdeApp->aboutData()->appName () + TQString (" - Printing"); } KateSchemaManager::KateSchemaManager () @@ -310,7 +310,7 @@ KateSchemaConfigColorTab::KateSchemaConfigColorTab( TQWidget *parent, const char m_combobox->insertItem(i18n("Error")); // markType07 m_combobox->setCurrentItem(0); m_markers = new KColorButton(b, "marker_color_button"); - connect( m_combobox, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotComboBoxChanged( int ) ) ); + connect( m_combobox, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotComboBoxChanged( int ) ) ); blay->addWidget(gbTextArea); @@ -351,7 +351,7 @@ KateSchemaConfigColorTab::KateSchemaConfigColorTab( TQWidget *parent, const char blay->addStretch(); // connect signal changed(); changed is emitted by a ColorButton change! - connect( this, TQT_SIGNAL( changed() ), parent->parentWidget(), TQT_SLOT( slotChanged() ) ); + connect( this, TQ_SIGNAL( changed() ), parent->parentWidget(), TQ_SLOT( slotChanged() ) ); // TQWhatsThis help TQWhatsThis::add(m_back, i18n("<p>Sets the background color of the editing area.</p>")); @@ -405,15 +405,15 @@ void KateSchemaConfigColorTab::schemaChanged ( int newSchema ) m_schema = newSchema; // first disconnect all signals otherwise setColor emits changed - m_back ->disconnect( TQT_SIGNAL( changed( const TQColor & ) ) ); - m_selected ->disconnect( TQT_SIGNAL( changed( const TQColor & ) ) ); - m_current ->disconnect( TQT_SIGNAL( changed( const TQColor & ) ) ); - m_bracket ->disconnect( TQT_SIGNAL( changed( const TQColor & ) ) ); - m_wwmarker ->disconnect( TQT_SIGNAL( changed( const TQColor & ) ) ); - m_iconborder->disconnect( TQT_SIGNAL( changed( const TQColor & ) ) ); - m_tmarker ->disconnect( TQT_SIGNAL( changed( const TQColor & ) ) ); - m_markers ->disconnect( TQT_SIGNAL( changed( const TQColor & ) ) ); - m_linenumber->disconnect( TQT_SIGNAL( changed( const TQColor & ) ) ); + m_back ->disconnect( TQ_SIGNAL( changed( const TQColor & ) ) ); + m_selected ->disconnect( TQ_SIGNAL( changed( const TQColor & ) ) ); + m_current ->disconnect( TQ_SIGNAL( changed( const TQColor & ) ) ); + m_bracket ->disconnect( TQ_SIGNAL( changed( const TQColor & ) ) ); + m_wwmarker ->disconnect( TQ_SIGNAL( changed( const TQColor & ) ) ); + m_iconborder->disconnect( TQ_SIGNAL( changed( const TQColor & ) ) ); + m_tmarker ->disconnect( TQ_SIGNAL( changed( const TQColor & ) ) ); + m_markers ->disconnect( TQ_SIGNAL( changed( const TQColor & ) ) ); + m_linenumber->disconnect( TQ_SIGNAL( changed( const TQColor & ) ) ); // If we havent this schema, read in from config file if ( ! m_schemas.contains( newSchema ) ) @@ -431,13 +431,13 @@ void KateSchemaConfigColorTab::schemaChanged ( int newSchema ) // same std colors like in KateDocument::markColor TQValueVector <TQColor> mark(KTextEditor::MarkInterface::reservedMarkersCount()); Q_ASSERT(mark.size() > 6); - mark[0] = Qt::blue; - mark[1] = Qt::red; - mark[2] = Qt::yellow; - mark[3] = Qt::magenta; - mark[4] = Qt::gray; - mark[5] = Qt::green; - mark[6] = Qt::red; + mark[0] = TQt::blue; + mark[1] = TQt::red; + mark[2] = TQt::yellow; + mark[3] = TQt::magenta; + mark[4] = TQt::gray; + mark[5] = TQt::green; + mark[6] = TQt::red; SchemaColors c; TDEConfig *config = KateFactory::self()->schemaManager()->schema(newSchema); @@ -475,15 +475,15 @@ void KateSchemaConfigColorTab::schemaChanged ( int newSchema ) } m_markers->setColor( m_schemas [ newSchema ].markerColors[ m_combobox->currentItem() ] ); - connect( m_back , TQT_SIGNAL( changed( const TQColor& ) ), TQT_SIGNAL( changed() ) ); - connect( m_selected , TQT_SIGNAL( changed( const TQColor& ) ), TQT_SIGNAL( changed() ) ); - connect( m_current , TQT_SIGNAL( changed( const TQColor& ) ), TQT_SIGNAL( changed() ) ); - connect( m_bracket , TQT_SIGNAL( changed( const TQColor& ) ), TQT_SIGNAL( changed() ) ); - connect( m_wwmarker , TQT_SIGNAL( changed( const TQColor& ) ), TQT_SIGNAL( changed() ) ); - connect( m_iconborder, TQT_SIGNAL( changed( const TQColor& ) ), TQT_SIGNAL( changed() ) ); - connect( m_tmarker , TQT_SIGNAL( changed( const TQColor& ) ), TQT_SIGNAL( changed() ) ); - connect( m_linenumber, TQT_SIGNAL( changed( const TQColor& ) ), TQT_SIGNAL( changed() ) ); - connect( m_markers , TQT_SIGNAL( changed( const TQColor& ) ), TQT_SLOT( slotMarkerColorChanged( const TQColor& ) ) ); + connect( m_back , TQ_SIGNAL( changed( const TQColor& ) ), TQ_SIGNAL( changed() ) ); + connect( m_selected , TQ_SIGNAL( changed( const TQColor& ) ), TQ_SIGNAL( changed() ) ); + connect( m_current , TQ_SIGNAL( changed( const TQColor& ) ), TQ_SIGNAL( changed() ) ); + connect( m_bracket , TQ_SIGNAL( changed( const TQColor& ) ), TQ_SIGNAL( changed() ) ); + connect( m_wwmarker , TQ_SIGNAL( changed( const TQColor& ) ), TQ_SIGNAL( changed() ) ); + connect( m_iconborder, TQ_SIGNAL( changed( const TQColor& ) ), TQ_SIGNAL( changed() ) ); + connect( m_tmarker , TQ_SIGNAL( changed( const TQColor& ) ), TQ_SIGNAL( changed() ) ); + connect( m_linenumber, TQ_SIGNAL( changed( const TQColor& ) ), TQ_SIGNAL( changed() ) ); + connect( m_markers , TQ_SIGNAL( changed( const TQColor& ) ), TQ_SLOT( slotMarkerColorChanged( const TQColor& ) ) ); } void KateSchemaConfigColorTab::apply () @@ -527,9 +527,9 @@ void KateSchemaConfigColorTab::slotMarkerColorChanged( const TQColor& color) void KateSchemaConfigColorTab::slotComboBoxChanged(int index) { // temporarily disconnect the changed-signal because setColor emits changed as well - m_markers->disconnect( TQT_SIGNAL( changed( const TQColor& ) ) ); + m_markers->disconnect( TQ_SIGNAL( changed( const TQColor& ) ) ); m_markers->setColor( m_schemas[m_schema].markerColors[index] ); - connect( m_markers, TQT_SIGNAL( changed( const TQColor& ) ), TQT_SLOT( slotMarkerColorChanged( const TQColor& ) ) ); + connect( m_markers, TQ_SIGNAL( changed( const TQColor& ) ), TQ_SLOT( slotMarkerColorChanged( const TQColor& ) ) ); } //END KateSchemaConfigColorTab @@ -542,10 +542,9 @@ KateSchemaConfigFontTab::KateSchemaConfigFontTab( TQWidget *parent, const char * TQGridLayout *grid = new TQGridLayout( this, 1, 1 ); m_fontchooser = new TDEFontChooser ( this, 0L, false, TQStringList(), false ); - m_fontchooser->enableColumn(TDEFontChooser::StyleList, false); grid->addWidget( m_fontchooser, 0, 0); - connect (this, TQT_SIGNAL( changed()), parent->parentWidget(), TQT_SLOT (slotChanged())); + connect (this, TQ_SIGNAL( changed()), parent->parentWidget(), TQ_SLOT (slotChanged())); m_schema = -1; } @@ -583,7 +582,7 @@ void KateSchemaConfigFontTab::schemaChanged( int newSchema ) m_fontchooser->disconnect ( this ); m_fontchooser->setFont ( KateFactory::self()->schemaManager()->schema( newSchema )->readFontEntry("Font", &f) ); m_fonts[ newSchema ] = m_fontchooser->font(); - connect (m_fontchooser, TQT_SIGNAL (fontSelected( const TQFont & )), this, TQT_SLOT (slotFontSelected( const TQFont & ))); + connect (m_fontchooser, TQ_SIGNAL (fontSelected( const TQFont & )), this, TQ_SLOT (slotFontSelected( const TQFont & ))); } //END FontConfig @@ -599,7 +598,7 @@ KateSchemaConfigFontColorTab::KateSchemaConfigFontColorTab( TQWidget *parent, co m_defaultStyles = new KateStyleListView( this, false ); grid->addWidget( m_defaultStyles, 0, 0); - connect (m_defaultStyles, TQT_SIGNAL (changed()), parent->parentWidget(), TQT_SLOT (slotChanged())); + connect (m_defaultStyles, TQ_SIGNAL (changed()), parent->parentWidget(), TQ_SLOT (slotChanged())); TQWhatsThis::add( m_defaultStyles, i18n( "This list displays the default styles for the current schema and " @@ -689,8 +688,8 @@ KateSchemaConfigHighlightTab::KateSchemaConfigHighlightTab( TQWidget *parent, co TQLabel *lHl = new TQLabel( i18n("H&ighlight:"), hbHl ); hlCombo = new TQComboBox( false, hbHl ); lHl->setBuddy( hlCombo ); - connect( hlCombo, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(hlChanged(int)) ); + connect( hlCombo, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(hlChanged(int)) ); for( int i = 0; i < KateHlManager::self()->highlights(); i++) { if (KateHlManager::self()->hlSection(i).length() > 0) @@ -716,7 +715,7 @@ KateSchemaConfigHighlightTab::KateSchemaConfigHighlightTab( TQWidget *parent, co "to edit from the popup menu.<p>You can unset the Background and Selected " "Background colors from the context menu when appropriate.") ); - connect (m_styles, TQT_SIGNAL (changed()), parent->parentWidget(), TQT_SLOT (slotChanged())); + connect (m_styles, TQ_SIGNAL (changed()), parent->parentWidget(), TQ_SLOT (slotChanged())); } KateSchemaConfigHighlightTab::~KateSchemaConfigHighlightTab() @@ -834,20 +833,20 @@ KateSchemaConfigPage::KateSchemaConfigPage( TQWidget *parent, KateDocument *doc TQLabel *lHl = new TQLabel( i18n("&Schema:"), hbHl ); schemaCombo = new TQComboBox( false, hbHl ); lHl->setBuddy( schemaCombo ); - connect( schemaCombo, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(schemaChanged(int)) ); + connect( schemaCombo, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(schemaChanged(int)) ); TQPushButton *btnnew = new TQPushButton( i18n("&New..."), hbHl ); - connect( btnnew, TQT_SIGNAL(clicked()), this, TQT_SLOT(newSchema()) ); + connect( btnnew, TQ_SIGNAL(clicked()), this, TQ_SLOT(newSchema()) ); btndel = new TQPushButton( i18n("&Delete"), hbHl ); - connect( btndel, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteSchema()) ); + connect( btndel, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteSchema()) ); m_tabWidget = new TQTabWidget ( this ); m_tabWidget->setMargin (KDialog::marginHint()); layout->add (m_tabWidget); - connect (m_tabWidget, TQT_SIGNAL (currentChanged (TQWidget *)), this, TQT_SLOT (newCurrentPage (TQWidget *))); + connect (m_tabWidget, TQ_SIGNAL (currentChanged (TQWidget *)), this, TQ_SLOT (newCurrentPage (TQWidget *))); m_colorTab = new KateSchemaConfigColorTab (m_tabWidget); m_tabWidget->addTab (m_colorTab, i18n("Colors")); @@ -865,7 +864,7 @@ KateSchemaConfigPage::KateSchemaConfigPage( TQWidget *parent, KateDocument *doc hbHl = new TQHBox( this ); layout->add (hbHl); hbHl->setSpacing( KDialog::spacingHint() ); - lHl = new TQLabel( i18n("&Default schema for %1:").arg(TDEApplication::kApplication()->aboutData()->programName ()), hbHl ); + lHl = new TQLabel( i18n("&Default schema for %1:").arg(tdeApp->aboutData()->programName ()), hbHl ); defaultSchemaCombo = new TQComboBox( false, hbHl ); lHl->setBuddy( defaultSchemaCombo ); @@ -874,8 +873,8 @@ KateSchemaConfigPage::KateSchemaConfigPage( TQWidget *parent, KateDocument *doc reload(); - connect( defaultSchemaCombo, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotChanged()) ); + connect( defaultSchemaCombo, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotChanged()) ); } KateSchemaConfigPage::~KateSchemaConfigPage () @@ -1004,7 +1003,7 @@ void KateViewSchemaAction::init() m_view = 0; last = 0; - connect(popupMenu(),TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(slotAboutToShow())); + connect(popupMenu(),TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(slotAboutToShow())); } void KateViewSchemaAction::updateMenu (KateView *view) @@ -1024,7 +1023,7 @@ void KateViewSchemaAction::slotAboutToShow() if (names.contains(hlName) < 1) { names << hlName; - popupMenu()->insertItem ( hlName, this, TQT_SLOT(setSchema(int)), 0, z+1); + popupMenu()->insertItem ( hlName, this, TQ_SLOT(setSchema(int)), 0, z+1); } } @@ -1061,10 +1060,10 @@ KateStyleListView::KateStyleListView( TQWidget *parent, bool showUseDefaults ) addColumn( i18n("Background Selected") ); if ( showUseDefaults ) addColumn( i18n("Use Default Style") ); - connect( this, TQT_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT(slotMousePressed(int, TQListViewItem*, const TQPoint&, int)) ); - connect( this, TQT_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint&, int)), - this, TQT_SLOT(showPopupMenu(TQListViewItem*, const TQPoint&)) ); + connect( this, TQ_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT(slotMousePressed(int, TQListViewItem*, const TQPoint&, int)) ); + connect( this, TQ_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint&, int)), + this, TQ_SLOT(showPopupMenu(TQListViewItem*, const TQPoint&)) ); // grap the bg color, selected color and default font normalcol = TDEGlobalSettings::textColor(); bgcol = KateRendererConfig::global()->backgroundColor(); @@ -1094,21 +1093,21 @@ void KateStyleListView::showPopupMenu( KateStyleListItem *i, const TQPoint &glob if ( showtitle ) m.insertTitle( i->contextName(), KateStyleListItem::ContextName ); - id = m.insertItem( i18n("&Bold"), this, TQT_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::Bold ); + id = m.insertItem( i18n("&Bold"), this, TQ_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::Bold ); m.setItemChecked( id, is->bold() ); - id = m.insertItem( i18n("&Italic"), this, TQT_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::Italic ); + id = m.insertItem( i18n("&Italic"), this, TQ_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::Italic ); m.setItemChecked( id, is->italic() ); - id = m.insertItem( i18n("&Underline"), this, TQT_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::Underline ); + id = m.insertItem( i18n("&Underline"), this, TQ_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::Underline ); m.setItemChecked( id, is->underline() ); - id = m.insertItem( i18n("S&trikeout"), this, TQT_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::Strikeout ); + id = m.insertItem( i18n("S&trikeout"), this, TQ_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::Strikeout ); m.setItemChecked( id, is->strikeOut() ); m.insertSeparator(); - m.insertItem( TQIconSet(cl), i18n("Normal &Color..."), this, TQT_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::Color ); - m.insertItem( TQIconSet(scl), i18n("&Selected Color..."), this, TQT_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::SelColor ); - m.insertItem( TQIconSet(bgcl), i18n("&Background Color..."), this, TQT_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::BgColor ); - m.insertItem( TQIconSet(sbgcl), i18n("S&elected Background Color..."), this, TQT_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::SelBgColor ); + m.insertItem( TQIconSet(cl), i18n("Normal &Color..."), this, TQ_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::Color ); + m.insertItem( TQIconSet(scl), i18n("&Selected Color..."), this, TQ_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::SelColor ); + m.insertItem( TQIconSet(bgcl), i18n("&Background Color..."), this, TQ_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::BgColor ); + m.insertItem( TQIconSet(sbgcl), i18n("S&elected Background Color..."), this, TQ_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::SelBgColor ); // Unset [some] colors. I could show one only if that button was clicked, but that // would disable setting this with the keyboard (how many aren't doing just @@ -1119,14 +1118,14 @@ void KateStyleListView::showPopupMenu( KateStyleListItem *i, const TQPoint &glob { m.insertSeparator(); if ( style->itemSet( KateAttribute::BGColor) ) - m.insertItem( i18n("Unset Background Color"), this, TQT_SLOT(unsetColor(int)), 0, 100 ); + m.insertItem( i18n("Unset Background Color"), this, TQ_SLOT(unsetColor(int)), 0, 100 ); if ( style->itemSet( KateAttribute::SelectedBGColor ) ) - m.insertItem( i18n("Unset Selected Background Color"), this, TQT_SLOT(unsetColor(int)), 0, 101 ); + m.insertItem( i18n("Unset Selected Background Color"), this, TQ_SLOT(unsetColor(int)), 0, 101 ); } if ( ! i->isDefault() && ! i->defStyle() ) { m.insertSeparator(); - id = m.insertItem( i18n("Use &Default Style"), this, TQT_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::UseDefStyle ); + id = m.insertItem( i18n("Use &Default Style"), this, TQ_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::UseDefStyle ); m.setItemChecked( id, i->defStyle() ); } m.exec( globalPos ); @@ -1154,7 +1153,7 @@ void KateStyleListView::unsetColor( int c ) void KateStyleListView::slotMousePressed(int btn, TQListViewItem* i, const TQPoint& pos, int c) { if ( dynamic_cast<KateStyleListItem*>(i) ) { - if ( btn == Qt::LeftButton && c > 0 ) { + if ( btn == TQt::LeftButton && c > 0 ) { // map pos to item/column and call KateStyleListItem::activate(col, pos) ((KateStyleListItem*)i)->activate( c, viewport()->mapFromGlobal( pos ) - TQPoint( 0, itemRect(i).top() ) ); } @@ -1607,5 +1606,3 @@ void KateStyleListCaption::paintCell( TQPainter *p, const TQColorGroup& /*cg*/, TQListViewItem::paintCell( p, mcg, col, width, align ); } //END - -// kate: space-indent on; indent-width 2; replace-tabs on; |
