TDE
/
kvirc
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kvirc
0
0
Fork 0
Code Issues Releases Wiki Activity

Replace TQ_*Focus* and TQ_Scale* defines

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit ee077affc0)
r14.1.x
Michele Calgaro 1 year ago
parent 33c7bc399d
commit 84057ea26e
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
19 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File

2
src/kvirc/kernel/kvi_theme.cpp
Unescape View File

@ -36,7 +36,7 @@
#define KVI_THEME_MEDIUM_SCREENSHOT_NAME "screenshot_medium.png" #define KVI_THEME_MEDIUM_SCREENSHOT_NAME "screenshot_medium.png"
#define KVI_THEME_LARGE_SCREENSHOT_NAME "screenshot.png" #define KVI_THEME_LARGE_SCREENSHOT_NAME "screenshot.png"
#define TQIMAGE_SCALE_MIN TQ_ScaleMin #define TQIMAGE_SCALE_MIN TQImage::ScaleMin
KviThemeInfo::KviThemeInfo() KviThemeInfo::KviThemeInfo()
: KviHeapObject() : KviHeapObject()

2
src/kvirc/ui/kvi_colorwin.cpp
Unescape View File

@ -38,7 +38,7 @@
KviColorWindow::KviColorWindow() KviColorWindow::KviColorWindow()
:TQWidget(0,"toplevel_color_window",TQt::WType_Popup) :TQWidget(0,"toplevel_color_window",TQt::WType_Popup)
{ {
setFocusPolicy(TQ_NoFocus); setFocusPolicy(TQWidget::NoFocus);
setBackgroundMode(TQt::NoBackground); setBackgroundMode(TQt::NoBackground);
setFixedSize(146,38); setFixedSize(146,38);
m_pOwner = 0; m_pOwner = 0;

2
src/kvirc/ui/kvi_cryptcontroller.cpp
Unescape View File

@ -78,7 +78,7 @@
m_pWindow = wnd; m_pWindow = wnd;
setFocusPolicy(TQ_ClickFocus); setFocusPolicy(TQWidget::ClickFocus);
TQGridLayout *g = new TQGridLayout(this,10,4,2,2); TQGridLayout *g = new TQGridLayout(this,10,4,2,2);

2
src/kvirc/ui/kvi_frame.cpp
Unescape View File

@ -1137,7 +1137,7 @@ bool KviFrame::focusNextPrevChild(bool next)
TQWidget * w = focusWidget(); TQWidget * w = focusWidget();
if(w) if(w)
{ {
if(w->focusPolicy() == TQ_StrongFocus)return false; if(w->focusPolicy() == TQWidget::StrongFocus)return false;
//TQVariant v = w->property("KviProperty_FocusOwner"); //TQVariant v = w->property("KviProperty_FocusOwner");
//if(v.isValid())return false; // Do NOT change the focus widget! //if(v.isValid())return false; // Do NOT change the focus widget!

2
src/kvirc/ui/kvi_imagedialog.cpp
Unescape View File

@ -281,7 +281,7 @@ void KviImageDialog::heartbeat()
TQImage i(szPath); TQImage i(szPath);
if(i.isNull())continue; if(i.isNull())continue;
TQPixmap pix; TQPixmap pix;
if((i.width() > 80) || (i.height() > 80))pix = i.scale(80,80,TQ_ScaleMin); if((i.width() > 80) || (i.height() > 80))pix = i.scale(80,80,TQImage::ScaleMin);
else pix = i; else pix = i;
TQString tip = szFile; TQString tip = szFile;

2
src/kvirc/ui/kvi_input.cpp
Unescape View File

@ -195,7 +195,7 @@ KviInputEditor::KviInputEditor(TQWidget * par,KviWindow *wnd,KviUserListView * v
setInputMethodEnabled(true); setInputMethodEnabled(true);
setBackgroundMode(TQt::NoBackground); setBackgroundMode(TQt::NoBackground);
setFocusPolicy(TQ_StrongFocus); setFocusPolicy(TQWidget::StrongFocus);
setAcceptDrops(true); setAcceptDrops(true);
setFrameStyle( LineEditPanel ); setFrameStyle( LineEditPanel );
setFrameShadow( Plain ); setFrameShadow( Plain );

8
src/kvirc/ui/kvi_maskeditor.cpp
Unescape View File

@ -136,7 +136,7 @@ KviMaskEditor::KviMaskEditor(TQWidget * par,KviWindowToolPageButton* button,KviP
w = w->parent(); w = w->parent();
} }
setFocusPolicy(TQ_ClickFocus); setFocusPolicy(TQWidget::ClickFocus);
TQGridLayout *g = new TQGridLayout(this,4,2,2,2); TQGridLayout *g = new TQGridLayout(this,4,2,2,2);
@ -182,7 +182,7 @@ KviMaskEditor::KviMaskEditor(TQWidget * par,KviWindowToolPageButton* button,KviP
g->addMultiCellWidget(l,2,2,0,1); g->addMultiCellWidget(l,2,2,0,1);
m_pMaskBox = new KviTalListView(this); m_pMaskBox = new KviTalListView(this);
m_pMaskBox->setFocusPolicy(TQ_ClickFocus); m_pMaskBox->setFocusPolicy(TQWidget::ClickFocus);
m_pMaskBox->setFocusProxy(this); m_pMaskBox->setFocusProxy(this);
m_pMaskBox->setFrameStyle(TQFrame::StyledPanel|TQFrame::Sunken); m_pMaskBox->setFrameStyle(TQFrame::StyledPanel|TQFrame::Sunken);
m_pMaskBox->addColumn(__tr2qs("Mask")); m_pMaskBox->addColumn(__tr2qs("Mask"));
@ -197,7 +197,7 @@ KviMaskEditor::KviMaskEditor(TQWidget * par,KviWindowToolPageButton* button,KviP
m_pRemoveMask = new TQPushButton(__tr2qs("Re&move"),this); m_pRemoveMask = new TQPushButton(__tr2qs("Re&move"),this);
m_pRemoveMask->setEnabled(isEnabled); m_pRemoveMask->setEnabled(isEnabled);
m_pRemoveMask->setFocusPolicy(TQ_ClickFocus); m_pRemoveMask->setFocusPolicy(TQWidget::ClickFocus);
m_pRemoveMask->setFocusProxy(this); m_pRemoveMask->setFocusProxy(this);
g->addWidget(m_pRemoveMask,4,1); g->addWidget(m_pRemoveMask,4,1);
connect(m_pRemoveMask,TQT_SIGNAL(clicked()),this,TQT_SLOT(removeClicked())); connect(m_pRemoveMask,TQT_SIGNAL(clicked()),this,TQT_SLOT(removeClicked()));
@ -205,7 +205,7 @@ KviMaskEditor::KviMaskEditor(TQWidget * par,KviWindowToolPageButton* button,KviP
m_pAddButton = new TQPushButton(__tr2qs("Add"),this); m_pAddButton = new TQPushButton(__tr2qs("Add"),this);
m_pAddButton->setEnabled(isEnabled); m_pAddButton->setEnabled(isEnabled);
m_pAddButton->setFocusPolicy(TQ_ClickFocus); m_pAddButton->setFocusPolicy(TQWidget::ClickFocus);
m_pAddButton->setFocusProxy(this); m_pAddButton->setFocusProxy(this);
g->addWidget(m_pAddButton,4,0); g->addWidget(m_pAddButton,4,0);
connect(m_pAddButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(addClicked())); connect(m_pAddButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(addClicked()));

4
src/kvirc/ui/kvi_mdimanager.cpp
Unescape View File

@ -82,8 +82,8 @@ KviMdiManager::KviMdiManager(TQWidget * parent,KviFrame * pFrm,const char * name
setStaticBackground(true); setStaticBackground(true);
resizeContents(width(),height()); resizeContents(width(),height());
setFocusPolicy(TQ_NoFocus); setFocusPolicy(TQWidget::NoFocus);
viewport()->setFocusPolicy(TQ_NoFocus); viewport()->setFocusPolicy(TQWidget::NoFocus);
connect(g_pApp,TQT_SIGNAL(reloadImages()),this,TQT_SLOT(reloadImages())); connect(g_pApp,TQT_SIGNAL(reloadImages()),this,TQT_SLOT(reloadImages()));
} }

2
src/kvirc/ui/kvi_modeeditor.cpp
Unescape View File

@ -68,7 +68,7 @@ KviModeEditor::KviModeEditor(TQWidget * par,KviWindowToolPageButton* button,cons
TQGridLayout *pMasterLayout = new TQGridLayout(this,2,1,2,2); TQGridLayout *pMasterLayout = new TQGridLayout(this,2,1,2,2);
setFocusPolicy(TQ_ClickFocus); setFocusPolicy(TQWidget::ClickFocus);
KviTalScrollView *pScrollView = new KviTalScrollView(this); KviTalScrollView *pScrollView = new KviTalScrollView(this);
pScrollView->viewport()->setBackgroundMode(TQWidget::PaletteBackground); pScrollView->viewport()->setBackgroundMode(TQWidget::PaletteBackground);

2
src/kvirc/ui/kvi_taskbar.cpp
Unescape View File

@ -1159,7 +1159,7 @@ KviTreeTaskBar::KviTreeTaskBar()
//setMaximumWidth(KVI_OPTION_UINT(KviOption_uintTreeTaskBarMaximumWidth)); //setMaximumWidth(KVI_OPTION_UINT(KviOption_uintTreeTaskBarMaximumWidth));
//m_pListView->setMinimumWidth(KVI_OPTION_UINT(KviOption_uintTreeTaskBarMinimumWidth)); //m_pListView->setMinimumWidth(KVI_OPTION_UINT(KviOption_uintTreeTaskBarMinimumWidth));
//m_pListView->setMaximumWidth(KVI_OPTION_UINT(KviOption_uintTreeTaskBarMaximumWidth)); //m_pListView->setMaximumWidth(KVI_OPTION_UINT(KviOption_uintTreeTaskBarMaximumWidth));
m_pListView->setFocusPolicy(TQ_NoFocus); m_pListView->setFocusPolicy(TQWidget::NoFocus);
m_pListView->setStaticBackground(true); m_pListView->setStaticBackground(true);
m_pListView->viewport()->setBackgroundMode(TQWidget::NoBackground); m_pListView->viewport()->setBackgroundMode(TQWidget::NoBackground);
if(!KVI_OPTION_BOOL(KviOption_boolShowTreeTaskbarHeader)) if(!KVI_OPTION_BOOL(KviOption_boolShowTreeTaskbarHeader))

10
src/kvirc/ui/kvi_window.cpp
Unescape View File

@ -140,7 +140,7 @@ KviWindow::KviWindow(int type,KviFrame * lpFrm,const TQString &name,KviConsole *
setMinimumSize(KVI_WINDOW_MIN_WIDTH,KVI_WINDOW_MIN_HEIGHT); setMinimumSize(KVI_WINDOW_MIN_WIDTH,KVI_WINDOW_MIN_HEIGHT);
setBackgroundMode(NoBackground); setBackgroundMode(NoBackground);
setFocusPolicy(TQ_StrongFocus); setFocusPolicy(TQWidget::StrongFocus);
connect(g_pApp,TQT_SIGNAL(reloadImages()),this,TQT_SLOT(reloadImages())); connect(g_pApp,TQT_SIGNAL(reloadImages()),this,TQT_SLOT(reloadImages()));
} }
@ -278,7 +278,7 @@ bool KviWindow::focusNextPrevChild(bool next)
TQWidget * w = focusWidget(); TQWidget * w = focusWidget();
if(w) if(w)
{ {
if(w->focusPolicy() == TQ_StrongFocus)return false; if(w->focusPolicy() == TQWidget::StrongFocus)return false;
//TQVariant v = w->property("KviProperty_FocusOwner"); //TQVariant v = w->property("KviProperty_FocusOwner");
//if(v.isValid())return false; // Do NOT change the focus widget! //if(v.isValid())return false; // Do NOT change the focus widget!
@ -1023,8 +1023,8 @@ bool KviWindow::eventFilter(TQObject *o,TQEvent *e)
TQApplication::restoreOverrideCursor(); TQApplication::restoreOverrideCursor();
break; break;
case TQEvent::MouseButtonPress: case TQEvent::MouseButtonPress:
if( (((TQWidget *)o)->focusPolicy() == TQ_NoFocus) || if( (((TQWidget *)o)->focusPolicy() == TQWidget::NoFocus) ||
(((TQWidget *)o)->focusPolicy() == TQ_TabFocus)) (((TQWidget *)o)->focusPolicy() == TQWidget::TabFocus))
{ {
// this will not focus our window // this will not focus our window
// set the focus to the focus handler // set the focus to the focus handler
@ -1066,7 +1066,7 @@ void KviWindow::childInserted(TQWidget * o)
m_pFocusHandler = o; m_pFocusHandler = o;
else else
{ {
if(!m_pFocusHandler && (o->focusPolicy() == TQ_StrongFocus)) if(!m_pFocusHandler && (o->focusPolicy() == TQWidget::StrongFocus))
{ {
m_pFocusHandler = o; m_pFocusHandler = o;
} }

2
src/modules/actioneditor/actioneditor.cpp
Unescape View File

@ -659,7 +659,7 @@ KviActionEditor::KviActionEditor(TQWidget * par)
m_pListView = new KviActionEditorListView(box); m_pListView = new KviActionEditorListView(box);
//m_pListView->setMultiSelection(false); //m_pListView->setMultiSelection(false);
m_pListView->setShowSortIndicator(true); m_pListView->setShowSortIndicator(true);
m_pListView->setFocusPolicy(TQ_StrongFocus); m_pListView->setFocusPolicy(TQWidget::StrongFocus);
connect(m_pListView,TQT_SIGNAL(currentChanged(KviTalListViewItem *)),this,TQT_SLOT(currentChanged(KviTalListViewItem *))); connect(m_pListView,TQT_SIGNAL(currentChanged(KviTalListViewItem *)),this,TQT_SLOT(currentChanged(KviTalListViewItem *)));

2
src/modules/help/helpwidget.cpp
Unescape View File

@ -52,7 +52,7 @@ KviHelpWidget::KviHelpWidget(TQWidget * par,KviFrame * lpFrm,bool bIsStandalone)
//#warning "Re enable this when using TQt 3.0 : TQProcess " //#warning "Re enable this when using TQt 3.0 : TQProcess "
m_pTextBrowser = new TQTextBrowser(this,"text_browser"); m_pTextBrowser = new TQTextBrowser(this,"text_browser");
m_pTextBrowser->setFrameStyle(TQFrame::StyledPanel|TQFrame::Sunken); m_pTextBrowser->setFrameStyle(TQFrame::StyledPanel|TQFrame::Sunken);
m_pTextBrowser->setFocusPolicy(TQ_NoFocus); m_pTextBrowser->setFocusPolicy(TQWidget::NoFocus);
m_pToolBar = new KviTalHBox(this); m_pToolBar = new KviTalHBox(this);
m_pBtnIndex = new KviStyledToolButton(m_pToolBar); m_pBtnIndex = new KviStyledToolButton(m_pToolBar);

2
src/modules/logview/logviewmdiwindow.cpp
Unescape View File

@ -145,7 +145,7 @@ KviLogViewMDIWindow::KviLogViewMDIWindow(KviModuleExtensionDescriptor * d,KviFra
layout->addWidget(w,11,1); layout->addWidget(w,11,1);
m_pIrcView = new KviIrcView(m_pSplitter,g_pFrame,this); m_pIrcView = new KviIrcView(m_pSplitter,g_pFrame,this);
m_pIrcView->setFocusPolicy(TQ_ClickFocus); m_pIrcView->setFocusPolicy(TQWidget::ClickFocus);
KviValueList<int> li; KviValueList<int> li;
li.append(110); li.append(110);
li.append(width()-110); li.append(width()-110);

2
src/modules/notifier/notifierwindow.cpp
Unescape View File

@ -119,7 +119,7 @@ KviNotifierWindow::KviNotifierWindow()
if(m_iInputHeight < 10)m_iInputHeight = 10; if(m_iInputHeight < 10)m_iInputHeight = 10;
setBackgroundMode(TQt::NoBackground); setBackgroundMode(TQt::NoBackground);
setFocusPolicy(TQ_NoFocus); setFocusPolicy(TQWidget::NoFocus);
setMouseTracking(true); setMouseTracking(true);
//setCursor(m_cursor); //setCursor(m_cursor);

8
src/modules/objects/class_widget.cpp
Unescape View File

@ -78,10 +78,10 @@ const int widgettypes_cod[] = {
}; };
#define TQT_WIDGET_TABFOCUS TQ_TabFocus #define TQT_WIDGET_TABFOCUS TQWidget::TabFocus
#define TQT_WIDGET_CLICKFOCUS TQ_ClickFocus #define TQT_WIDGET_CLICKFOCUS TQWidget::ClickFocus
#define TQT_WIDGET_STRONGFOCUS TQ_StrongFocus #define TQT_WIDGET_STRONGFOCUS TQWidget::StrongFocus
#define TQT_WIDGET_NOFOCUS TQ_NoFocus #define TQT_WIDGET_NOFOCUS TQWidget::NoFocus
#define widgettypes_num (sizeof(widgettypes_tbl) / sizeof(widgettypes_tbl[0])) #define widgettypes_num (sizeof(widgettypes_tbl) / sizeof(widgettypes_tbl[0]))

4
src/modules/theme/packthemedialog.cpp
Unescape View File

@ -328,7 +328,7 @@ void KviPackThemeDialog::imageSelectionChanged(const TQString &szImagePath)
{ {
TQPixmap out; TQPixmap out;
if(pix.width() > 300 || pix.height() > 225) if(pix.width() > 300 || pix.height() > 225)
out.convertFromImage(pix.smoothScale(300,225,TQ_ScaleMin)); out.convertFromImage(pix.smoothScale(300,225,TQImage::ScaleMin));
else else
out.convertFromImage(pix); out.convertFromImage(pix);
m_pImageLabel->setPixmap(out); m_pImageLabel->setPixmap(out);
@ -365,7 +365,7 @@ bool KviPackThemeDialog::packTheme()
if(!pix.isNull()) if(!pix.isNull())
{ {
if(pix.width() > 300 || pix.height() > 225) if(pix.width() > 300 || pix.height() > 225)
out.convertFromImage(pix.smoothScale(300,225,TQ_ScaleMin)); out.convertFromImage(pix.smoothScale(300,225,TQImage::ScaleMin));
else else
out.convertFromImage(pix); out.convertFromImage(pix);
} else { } else {

2
src/modules/theme/savethemedialog.cpp
Unescape View File

@ -187,7 +187,7 @@ void KviSaveThemeDialog::imageSelectionChanged(const TQString &szImagePath)
{ {
TQPixmap out; TQPixmap out;
if(pix.width() > 300 || pix.height() > 225) if(pix.width() > 300 || pix.height() > 225)
out.convertFromImage(pix.smoothScale(300,225,TQ_ScaleMin)); out.convertFromImage(pix.smoothScale(300,225,TQImage::ScaleMin));
else else
out.convertFromImage(pix); out.convertFromImage(pix);
m_pImageLabel->setPixmap(out); m_pImageLabel->setPixmap(out);

2
src/modules/url/libkviurl.cpp
Unescape View File

@ -144,7 +144,7 @@ UrlDialog::UrlDialog(KviPointerList<KviUrl> *g_pList)
connect(m_pUrlList,TQT_SIGNAL(rightButtonPressed(KviTalListViewItem *, const TQPoint &, int)),TQT_SLOT(popup(KviTalListViewItem *, const TQPoint &, int))); connect(m_pUrlList,TQT_SIGNAL(rightButtonPressed(KviTalListViewItem *, const TQPoint &, int)),TQT_SLOT(popup(KviTalListViewItem *, const TQPoint &, int)));
// setFocusHandlerNoChildren(m_pUrlList); // setFocusHandlerNoChildren(m_pUrlList);
m_pUrlList->setFocusPolicy(TQ_StrongFocus); m_pUrlList->setFocusPolicy(TQWidget::StrongFocus);
m_pUrlList->setFocus(); m_pUrlList->setFocus();
} }

Write Preview
Loading…
Cancel
Save