From b5e89dd08b51b46ea43e036ac11dba55ea80fc72 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:55:58 -0600 Subject: [PATCH] Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit f61f056943a68ecc5fa7e7789a7b9c82901a9157. --- configdialog/kbfxconfigapp.h | 4 +- configdialog/kbfxconfigdlgabout.ui | 56 +++++++++--------- configdialog/kbfxconfigdlgbutton.ui | 80 +++++++++++++------------- configdialog/kbfxconfigdlgfonts-old.ui | 46 +++++++-------- configdialog/kbfxconfigdlglayout.ui | 68 +++++++++++----------- configdialog/kbfxconfigdlglayout.ui.h | 6 +- configdialog/kbfxconfigdlgmain.ui | 34 +++++------ configdialog/kbfxconfigdlgplugins.ui | 16 +++--- configdialog/kbfxconfigdlgstyle.ui | 34 +++++------ configdialog/kbfxconfigdlgthemes.ui | 64 ++++++++++----------- configdialog/kbfxconfigdlgtooltip.ui | 58 +++++++++---------- configdialog/kbfxthemeinfo.ui | 36 ++++++------ kbfxlib/common/kbfxconfig.cpp | 16 +++--- kbfxlib/common/kbfxconfig.h | 2 +- kbfxlib/common/kbfxfontchooser.cpp | 14 ++--- kbfxlib/common/kbfxfontchooser.h | 2 +- kbfxlib/common/kbfxpixmaplabel.cpp | 4 +- kbfxlib/data/kbfxplugin.h | 2 +- src/kbfxbutton.cpp | 4 +- src/kbfxplasmacanvasview.cpp | 8 +-- src/kbfxplasmaindexview.cpp | 2 +- src/kbfxspinx.cpp | 8 +-- src/kbfxspinxmenu.h | 2 +- src/kbfxspinxtoolbutton.cpp | 2 +- src/kbfxspinxtop.cpp | 2 +- src/kbfxtooltip.cpp | 6 +- 26 files changed, 288 insertions(+), 288 deletions(-) diff --git a/configdialog/kbfxconfigapp.h b/configdialog/kbfxconfigapp.h index 68ba7fa..3b64e45 100644 --- a/configdialog/kbfxconfigapp.h +++ b/configdialog/kbfxconfigapp.h @@ -28,11 +28,11 @@ #include #include #include -#include +#include #include #include #include -#include +#include #include #include #include diff --git a/configdialog/kbfxconfigdlgabout.ui b/configdialog/kbfxconfigdlgabout.ui index 48d40f5..33c9e49 100644 --- a/configdialog/kbfxconfigdlgabout.ui +++ b/configdialog/kbfxconfigdlgabout.ui @@ -45,13 +45,13 @@ 0 - + 0 29 - + 32767 29 @@ -82,7 +82,7 @@ - layout4 + tqlayout4 @@ -90,7 +90,7 @@ - layout5 + tqlayout5 @@ -114,13 +114,13 @@ 0 - + 629 20 - + 629 20 @@ -160,13 +160,13 @@ 0 - + 0 20 - + 32767 20 @@ -198,7 +198,7 @@ We would like to thank all people who have helped with KBFX or have donated money to our project! THANKS A LOT ALL OF YOU OUT THERE!!! - + AlignVCenter @@ -220,7 +220,7 @@ THANKS A LOT ALL OF YOU OUT THERE!!! - layout6 + tqlayout6 @@ -256,7 +256,7 @@ THANKS A LOT ALL OF YOU OUT THERE!!! - layout5 + tqlayout5 @@ -264,7 +264,7 @@ THANKS A LOT ALL OF YOU OUT THERE!!! - layout8 + tqlayout8 @@ -285,13 +285,13 @@ THANKS A LOT ALL OF YOU OUT THERE!!! 0 - + 90 90 - + 90 90 @@ -328,13 +328,13 @@ THANKS A LOT ALL OF YOU OUT THERE!!! 0 - + 90 90 - + 90 90 @@ -371,13 +371,13 @@ THANKS A LOT ALL OF YOU OUT THERE!!! 0 - + 90 90 - + 90 90 @@ -414,13 +414,13 @@ THANKS A LOT ALL OF YOU OUT THERE!!! 0 - + 90 90 - + 90 90 @@ -457,13 +457,13 @@ THANKS A LOT ALL OF YOU OUT THERE!!! 0 - + 90 90 - + 90 90 @@ -500,13 +500,13 @@ THANKS A LOT ALL OF YOU OUT THERE!!! 0 - + 90 90 - + 90 90 @@ -557,7 +557,7 @@ THANKS A LOT ALL OF YOU OUT THERE!!! <b>Tip!</b> Hover over the contact images to see each personal contact information. - + WordBreak|AlignVCenter @@ -571,7 +571,7 @@ THANKS A LOT ALL OF YOU OUT THERE!!! MinimumExpanding - + 24 1 @@ -601,7 +601,7 @@ THANKS A LOT ALL OF YOU OUT THERE!!! SPONSORS! - + AlignVCenter @@ -626,7 +626,7 @@ THANKS A LOT ALL OF YOU OUT THERE!!! We would like to thank swedish computer company <b>PC Agenten</b> for sponsoring us with a server and bandwidth. - + WordBreak|AlignVCenter diff --git a/configdialog/kbfxconfigdlgbutton.ui b/configdialog/kbfxconfigdlgbutton.ui index 30b5af6..221d9ba 100644 --- a/configdialog/kbfxconfigdlgbutton.ui +++ b/configdialog/kbfxconfigdlgbutton.ui @@ -50,7 +50,7 @@ - layout6 + tqlayout6 @@ -68,7 +68,7 @@ 0 - + 32767 150 @@ -80,7 +80,7 @@ "PRESSED" IMAGE SELECTION - + AlignVCenter @@ -154,7 +154,7 @@ 0 - + 322 150 @@ -166,7 +166,7 @@ Preview - + AlignVCenter @@ -191,13 +191,13 @@ 0 - + 150 50 - + 150 50 @@ -222,7 +222,7 @@ - layout7 + tqlayout7 @@ -240,7 +240,7 @@ 0 - + 32767 150 @@ -252,7 +252,7 @@ "NORMAL" IMAGE SELECTION - + AlignVCenter @@ -320,7 +320,7 @@ 0 - + 322 150 @@ -332,7 +332,7 @@ Preview - + AlignVCenter @@ -360,13 +360,13 @@ 0 - + 150 50 - + 150 50 @@ -391,7 +391,7 @@ - layout8 + tqlayout8 @@ -409,7 +409,7 @@ 0 - + 32767 150 @@ -421,7 +421,7 @@ "HOVER" IMAGE SELECTION - + AlignVCenter @@ -498,7 +498,7 @@ 0 - + 322 150 @@ -510,7 +510,7 @@ Preview - + AlignVCenter @@ -535,13 +535,13 @@ 0 - + 150 50 - + 150 50 @@ -576,13 +576,13 @@ 0 - + 0 29 - + 32767 29 @@ -638,7 +638,7 @@ Resize Panel - + AlignVCenter @@ -669,13 +669,13 @@ RichText - + WordBreak|AlignTop|AlignLeft - layout8 + tqlayout8 @@ -691,7 +691,7 @@ Minimum - + 1 1 @@ -710,7 +710,7 @@ 0 - + 270 58 @@ -745,7 +745,7 @@ Minimum - + 1 1 @@ -764,7 +764,7 @@ Minimum - + 16 1 @@ -785,13 +785,13 @@ 0 - + 0 29 - + 32767 29 @@ -847,7 +847,7 @@ Livepreview - + AlignVCenter @@ -878,7 +878,7 @@ RichText - + WordBreak|AlignTop|AlignLeft @@ -892,7 +892,7 @@ Minimum - + 20 1 @@ -914,13 +914,13 @@ 0 - + 150 50 - + 150 50 @@ -1027,7 +1027,7 @@ StyledPanel - + AlignHCenter @@ -1047,7 +1047,7 @@ MinimumExpanding - + 16 16 @@ -1066,7 +1066,7 @@ MinimumExpanding - + 16 1 diff --git a/configdialog/kbfxconfigdlgfonts-old.ui b/configdialog/kbfxconfigdlgfonts-old.ui index 9a33dba..835739d 100644 --- a/configdialog/kbfxconfigdlgfonts-old.ui +++ b/configdialog/kbfxconfigdlgfonts-old.ui @@ -51,13 +51,13 @@ 0 - + 0 29 - + 32767 29 @@ -85,7 +85,7 @@ - layout14 + tqlayout14 @@ -101,7 +101,7 @@ Expanding - + 436 1 @@ -167,7 +167,7 @@ MinimumExpanding - + 16 1 @@ -176,7 +176,7 @@ - layout17 + tqlayout17 @@ -184,7 +184,7 @@ - layout15 + tqlayout15 @@ -200,7 +200,7 @@ MinimumExpanding - + 1 1 @@ -209,7 +209,7 @@ - layout22 + tqlayout22 @@ -263,7 +263,7 @@ - layout21 + tqlayout21 @@ -317,7 +317,7 @@ - layout20 + tqlayout20 @@ -371,7 +371,7 @@ - layout19 + tqlayout19 @@ -425,7 +425,7 @@ - layout23 + tqlayout23 @@ -473,7 +473,7 @@ - layout17 + tqlayout17 @@ -527,7 +527,7 @@ - layout18 + tqlayout18 @@ -581,7 +581,7 @@ - layout18_2 + tqlayout18_2 @@ -651,7 +651,7 @@ - layout16 + tqlayout16 @@ -667,7 +667,7 @@ MinimumExpanding - + 22 1 @@ -821,7 +821,7 @@ Minimum - + 16 1 @@ -844,7 +844,7 @@ - layout15 + tqlayout15 @@ -868,7 +868,7 @@ 0 - + 32767 32767 @@ -896,7 +896,7 @@ 0 - + 32767 32767 @@ -965,7 +965,7 @@ Minimum - + 16 1 diff --git a/configdialog/kbfxconfigdlglayout.ui b/configdialog/kbfxconfigdlglayout.ui index e707cea..e1d5f2d 100644 --- a/configdialog/kbfxconfigdlglayout.ui +++ b/configdialog/kbfxconfigdlglayout.ui @@ -51,13 +51,13 @@ 0 - + 0 29 - + 32767 29 @@ -85,7 +85,7 @@ - layout14_2 + tqlayout14_2 @@ -101,7 +101,7 @@ Expanding - + 408 1 @@ -167,7 +167,7 @@ Minimum - + 23 1 @@ -176,7 +176,7 @@ - layout30 + tqlayout30 @@ -279,7 +279,7 @@ Minimum - + 16 1 @@ -288,7 +288,7 @@ - layout17 + tqlayout17 @@ -304,7 +304,7 @@ Expanding - + 1 1 @@ -369,7 +369,7 @@ Expanding - + 1 1 @@ -388,7 +388,7 @@ MinimumExpanding - + 16 1 @@ -397,7 +397,7 @@ - layout33 + tqlayout33 @@ -405,7 +405,7 @@ - layout28 + tqlayout28 @@ -419,7 +419,7 @@ - layout21 + tqlayout21 @@ -433,7 +433,7 @@ - layout16 + tqlayout16 @@ -479,7 +479,7 @@ StyledPanel - + AlignHCenter @@ -487,7 +487,7 @@ - layout16_2 + tqlayout16_2 @@ -533,7 +533,7 @@ StyledPanel - + AlignHCenter @@ -541,7 +541,7 @@ - layout16_3 + tqlayout16_3 @@ -587,7 +587,7 @@ StyledPanel - + AlignHCenter @@ -595,7 +595,7 @@ - layout16_4 + tqlayout16_4 @@ -641,7 +641,7 @@ StyledPanel - + AlignHCenter @@ -691,7 +691,7 @@ - layout29 + tqlayout29 @@ -705,7 +705,7 @@ - layout21_2 + tqlayout21_2 @@ -719,7 +719,7 @@ - layout16_5 + tqlayout16_5 @@ -765,7 +765,7 @@ StyledPanel - + AlignHCenter @@ -773,7 +773,7 @@ - layout16_2_2 + tqlayout16_2_2 @@ -819,7 +819,7 @@ StyledPanel - + AlignHCenter @@ -827,7 +827,7 @@ - layout16_3_2 + tqlayout16_3_2 @@ -873,7 +873,7 @@ StyledPanel - + AlignHCenter @@ -881,7 +881,7 @@ - layout16_4_2 + tqlayout16_4_2 @@ -927,7 +927,7 @@ StyledPanel - + AlignHCenter @@ -968,7 +968,7 @@ Minimum - + 23 1 @@ -1054,7 +1054,7 @@ kstandarddirs.h kmessagebox.h kfiledialog.h - kbfxconfigdlglayout.ui.h + kbfxconfigdlgtqlayout.ui.h int previous_state; diff --git a/configdialog/kbfxconfigdlglayout.ui.h b/configdialog/kbfxconfigdlglayout.ui.h index b8a4d55..d57e9e0 100644 --- a/configdialog/kbfxconfigdlglayout.ui.h +++ b/configdialog/kbfxconfigdlglayout.ui.h @@ -187,7 +187,7 @@ void KbfxConfigDlgLayout::KbfxLayoutProperty_activated( int index ) break; } default: /* default action switch does nothing */ - kdDebug() << "Default action switch for saving layout changed..." << endl; + kdDebug() << "Default action switch for saving tqlayout changed..." << endl; } KbfxShowAll (); @@ -426,7 +426,7 @@ void KbfxConfigDlgLayout::KbfxLayoutProperty_activated( int index ) break; } default: /* default action switch should never be reached */ - kdDebug() << "Default action switch for layout changed..." << endl; + kdDebug() << "Default action switch for tqlayout changed..." << endl; } } @@ -465,7 +465,7 @@ void KbfxConfigDlgLayout::KbfxExportFileAction() << KbfxExportLayoutRcDialogURL << endl; - /* write layout theme configuration file */ + /* write tqlayout theme configuration file */ KConfig *layoutconfig = new KConfig ( KbfxExportLayoutRcDialogURL ); layoutconfig->setGroup ( "KbfxButton" ); diff --git a/configdialog/kbfxconfigdlgmain.ui b/configdialog/kbfxconfigdlgmain.ui index 6ef0358..d87e019 100644 --- a/configdialog/kbfxconfigdlgmain.ui +++ b/configdialog/kbfxconfigdlgmain.ui @@ -44,7 +44,7 @@ - layout4 + tqlayout4 @@ -126,13 +126,13 @@ 0 - + 150 265 - + 32767 32767 @@ -160,13 +160,13 @@ 0 - + 150 280 - + 32767 32767 @@ -196,7 +196,7 @@ - layout12 + tqlayout12 @@ -277,7 +277,7 @@ Expanding - + 160 1 @@ -350,7 +350,7 @@ - layout5 + tqlayout5 @@ -358,7 +358,7 @@ - layout3 + tqlayout3 @@ -390,13 +390,13 @@ 0 - + 507 100 - + 32767 100 @@ -436,7 +436,7 @@ Minimum - + 61 25 @@ -453,7 +453,7 @@ Minimum - + 16 16 @@ -470,7 +470,7 @@ Expanding - + 56 7 @@ -513,13 +513,13 @@ 0 - + 114 100 - + 114 100 @@ -549,7 +549,7 @@ 0 - + 32767 32767 diff --git a/configdialog/kbfxconfigdlgplugins.ui b/configdialog/kbfxconfigdlgplugins.ui index ff5bfe5..201e2f0 100644 --- a/configdialog/kbfxconfigdlgplugins.ui +++ b/configdialog/kbfxconfigdlgplugins.ui @@ -48,13 +48,13 @@ 0 - + 0 29 - + 32767 29 @@ -114,7 +114,7 @@ 0 - + 32767 44 @@ -142,7 +142,7 @@ 0 - + 32767 44 @@ -181,7 +181,7 @@ - layout3 + tqlayout3 @@ -197,7 +197,7 @@ MinimumExpanding - + 1 1 @@ -270,7 +270,7 @@ MinimumExpanding - + 1 1 @@ -289,7 +289,7 @@ Minimum - + 1 1 diff --git a/configdialog/kbfxconfigdlgstyle.ui b/configdialog/kbfxconfigdlgstyle.ui index 572a4eb..40220c0 100644 --- a/configdialog/kbfxconfigdlgstyle.ui +++ b/configdialog/kbfxconfigdlgstyle.ui @@ -45,13 +45,13 @@ 0 - + 0 29 - + 32767 29 @@ -112,7 +112,7 @@ Minimum - + 53 1 @@ -129,7 +129,7 @@ Expanding - + 1 1 @@ -146,7 +146,7 @@ Minimum - + 38 1 @@ -242,13 +242,13 @@ 0 - + 293 334 - + 293 334 @@ -274,7 +274,7 @@ MinimumExpanding - + 1 1 @@ -291,7 +291,7 @@ MinimumExpanding - + 1 1 @@ -308,7 +308,7 @@ MinimumExpanding - + 1 1 @@ -325,7 +325,7 @@ MinimumExpanding - + 1 1 @@ -374,13 +374,13 @@ 0 - + 293 334 - + 293 334 @@ -406,7 +406,7 @@ MinimumExpanding - + 1 1 @@ -423,7 +423,7 @@ MinimumExpanding - + 1 1 @@ -440,7 +440,7 @@ MinimumExpanding - + 1 1 @@ -457,7 +457,7 @@ MinimumExpanding - + 1 1 diff --git a/configdialog/kbfxconfigdlgthemes.ui b/configdialog/kbfxconfigdlgthemes.ui index 4826f0c..9e1a646 100644 --- a/configdialog/kbfxconfigdlgthemes.ui +++ b/configdialog/kbfxconfigdlgthemes.ui @@ -105,7 +105,7 @@ MinimumExpanding - + 28 16 @@ -114,7 +114,7 @@ - layout7 + tqlayout7 @@ -137,7 +137,7 @@ 0 - + 200 0 @@ -155,7 +155,7 @@ - layout6 + tqlayout6 @@ -179,7 +179,7 @@ Selected Theme Preview - + AlignVCenter @@ -196,7 +196,7 @@ Minimum - + 17 21 @@ -213,7 +213,7 @@ MinimumExpanding - + 1 1 @@ -230,7 +230,7 @@ MinimumExpanding - + 1 1 @@ -249,13 +249,13 @@ 0 - + 270 210 - + 270 210 @@ -267,7 +267,7 @@ false - + AlignCenter @@ -281,7 +281,7 @@ Minimum - + 17 21 @@ -292,7 +292,7 @@ - layout14 + tqlayout14 @@ -300,7 +300,7 @@ - layout12 + tqlayout12 @@ -360,7 +360,7 @@ - layout13 + tqlayout13 @@ -424,7 +424,7 @@ - layout10 + tqlayout10 @@ -462,7 +462,7 @@ Minimum - + 16 7 @@ -509,7 +509,7 @@ Maxsize 48 x 48 - + AlignCenter @@ -548,7 +548,7 @@ Minimum - + 18 54 @@ -565,7 +565,7 @@ Minimum - + 17 62 @@ -613,13 +613,13 @@ 0 - + 48 48 - + 48 48 @@ -644,7 +644,7 @@ Minimum - + 16 16 @@ -661,7 +661,7 @@ Minimum - + 16 16 @@ -683,7 +683,7 @@ This is your personal image displayed at the KBFX menu. - + WordBreak|AlignCenter @@ -697,7 +697,7 @@ Minimum - + 16 10 @@ -724,7 +724,7 @@ Misc Options - + AlignVCenter @@ -741,7 +741,7 @@ MinimumExpanding - + 1 1 @@ -807,13 +807,13 @@ 0 - + 0 29 - + 32767 29 @@ -854,13 +854,13 @@ 0 - + 0 29 - + 32767 29 diff --git a/configdialog/kbfxconfigdlgtooltip.ui b/configdialog/kbfxconfigdlgtooltip.ui index 3b0b6e4..98215d6 100644 --- a/configdialog/kbfxconfigdlgtooltip.ui +++ b/configdialog/kbfxconfigdlgtooltip.ui @@ -48,13 +48,13 @@ 0 - + 0 29 - + 32767 29 @@ -98,7 +98,7 @@ Turn off or on the tooltip - + AlignVCenter @@ -110,7 +110,7 @@ - layout21 + tqlayout21 @@ -118,7 +118,7 @@ - layout6 + tqlayout6 @@ -142,7 +142,7 @@ - layout4 + tqlayout4 @@ -158,7 +158,7 @@ Minimum - + 24 1 @@ -200,7 +200,7 @@ Expanding - + 1 1 @@ -223,13 +223,13 @@ 0 - + 120 80 - + 120 80 @@ -267,7 +267,7 @@ Tooltip Text - + AlignVCenter @@ -279,7 +279,7 @@ - layout19 + tqlayout19 @@ -311,7 +311,7 @@ Minimum - + 1 19 @@ -332,13 +332,13 @@ 0 - + 0 100 - + 32767 100 @@ -374,13 +374,13 @@ 0 - + 0 29 - + 32767 29 @@ -424,7 +424,7 @@ Tooltip animation - + AlignVCenter @@ -439,7 +439,7 @@ - layout20 + tqlayout20 @@ -447,7 +447,7 @@ - layout9 + tqlayout9 @@ -471,7 +471,7 @@ - layout8 + tqlayout8 @@ -487,7 +487,7 @@ Minimum - + 26 1 @@ -526,7 +526,7 @@ Expanding - + 1 1 @@ -549,13 +549,13 @@ 0 - + 120 80 - + 120 80 @@ -585,7 +585,7 @@ MinimumExpanding - + 1 1 @@ -604,13 +604,13 @@ 0 - + 0 29 - + 32767 29 @@ -646,7 +646,7 @@ MinimumExpanding - + 1 1 diff --git a/configdialog/kbfxthemeinfo.ui b/configdialog/kbfxthemeinfo.ui index 190a4d4..c52b7ea 100644 --- a/configdialog/kbfxthemeinfo.ui +++ b/configdialog/kbfxthemeinfo.ui @@ -44,7 +44,7 @@ - layout10 + tqlayout10 @@ -63,7 +63,7 @@ MinimumExpanding - + 54 6 @@ -99,7 +99,7 @@ MinimumExpanding - + 54 6 @@ -118,7 +118,7 @@ MinimumExpanding - + 16 16 @@ -135,7 +135,7 @@ MinimumExpanding - + 16 16 @@ -144,7 +144,7 @@ - layout7 + tqlayout7 @@ -158,7 +158,7 @@ - layout11 + tqlayout11 @@ -174,7 +174,7 @@ MinimumExpanding - + 10 49 @@ -193,13 +193,13 @@ 0 - + 100 100 - + 100 100 @@ -211,7 +211,7 @@ true - + AlignCenter @@ -225,7 +225,7 @@ MinimumExpanding - + 10 49 @@ -244,7 +244,7 @@ MinimumExpanding - + 16 16 @@ -253,7 +253,7 @@ - layout21 + tqlayout21 @@ -264,7 +264,7 @@ - layout19 + tqlayout19 @@ -354,7 +354,7 @@ - layout20 + tqlayout20 @@ -534,7 +534,7 @@ MinimumExpanding - + 16 16 @@ -551,7 +551,7 @@ MinimumExpanding - + 16 16 diff --git a/kbfxlib/common/kbfxconfig.cpp b/kbfxlib/common/kbfxconfig.cpp index 0e1c8ee..942a173 100644 --- a/kbfxlib/common/kbfxconfig.cpp +++ b/kbfxlib/common/kbfxconfig.cpp @@ -208,7 +208,7 @@ void KbfxConfig::setThemeInfoDefault() void KbfxConfig::setThemeDefault() { - /* set default theme layout configuration */ + /* set default theme tqlayout configuration */ m_KbfxNormalButtonPath = m_KbfxNormalButtonPathDefault; m_KbfxHoverButtonPath = m_KbfxHoverButtonPathDefault; m_KbfxPressedButtonPath = m_KbfxPressedButtonPathDefault; @@ -325,7 +325,7 @@ void KbfxConfig::readThemeInfo ( TQString &themePath, TQString &themeName ) void KbfxConfig::read() { /* read general configuration */ - KConfigSkeleton *confskel = new KConfigSkeleton ( TQString::fromLatin1 ( "kbfxrc" ) ); + KConfigSkeleton *confskel = new KConfigSkeleton ( TQString::tqfromLatin1 ( "kbfxrc" ) ); KConfig *conf = confskel->config(); @@ -487,7 +487,7 @@ void KbfxConfig::readFontrc ( TQString & themePath, TQString & themeName, bool u void KbfxConfig::readThemerc ( TQString &themePath, TQString &themeName, bool user_rc ) { - /* if a new version use default theme layout */ + /* if a new version use default theme tqlayout */ if ( m_KbfxGeneralVersion < m_KbfxGeneralVersionDefault ) { themePath = m_SpinxThemeBasePathDefault; @@ -499,7 +499,7 @@ void KbfxConfig::readThemerc ( TQString &themePath, TQString &themeName, bool us KbfxOffImg = TQPixmap ( KbfxPlasmaPixmapProvider::PixmapPath ( "off", themePath, themeName ) ); /* use theme's default dude image if any */ - KConfigSkeleton *confskel = new KConfigSkeleton ( TQString::fromLatin1 ( "kbfxrc" ) ); + KConfigSkeleton *confskel = new KConfigSkeleton ( TQString::tqfromLatin1 ( "kbfxrc" ) ); KConfig *conf = confskel->config(); TQString __default = KGlobal::iconLoader()->iconPath ( "kbfx", ( int ) KIcon::Desktop, FALSE ); @@ -525,7 +525,7 @@ void KbfxConfig::readThemerc ( TQString &themePath, TQString &themeName, bool us setThemeDefault(); - /* get some theme layout settings from theme file or from theme section */ + /* get some theme tqlayout settings from theme file or from theme section */ TQString _abs_path = ""; TQFileInfo * info = new TQFileInfo ( themePath + themeName + "/kbfxlayoutrc" ); TQFileInfo * info_theme = new TQFileInfo ( KbfxThemeRcDestination + "/" + themeName + "_layoutrc" ); @@ -618,7 +618,7 @@ void KbfxConfig::readThemerc ( TQString &themePath, TQString &themeName, bool us m_commentMargine = layoutconfig->readNumEntry ( "CommentMargin",m_commentMargineDefault ); m_iconSize = layoutconfig->readNumEntry ( "IconSize",m_iconSizeDefault ); - kdDebug() << "Read default layout settings for theme: " + kdDebug() << "Read default tqlayout settings for theme: " << themeName << " from file: " << _abs_path @@ -702,7 +702,7 @@ void KbfxConfig::write() kdDebug() << "Deleting general RC file: " << KbfxRcPath << endl; } - KConfigSkeleton *confskel = new KConfigSkeleton ( TQString::fromLatin1 ( "kbfxrc" ) ); + KConfigSkeleton *confskel = new KConfigSkeleton ( TQString::tqfromLatin1 ( "kbfxrc" ) ); /* write general KBFX configuration options */ KConfig *conf = confskel->config(); @@ -774,7 +774,7 @@ void KbfxConfig::writeThemerc ( TQString & themeName ) { checkValues(); - /* write layout theme configuration from theme name */ + /* write tqlayout theme configuration from theme name */ KConfig *layoutconfig = new KConfig ( KbfxThemeRcDestination + "/" + themeName + "_layoutrc" ); layoutconfig->setGroup ( "KbfxButton" ); diff --git a/kbfxlib/common/kbfxconfig.h b/kbfxlib/common/kbfxconfig.h index 8de6886..edfc66d 100644 --- a/kbfxlib/common/kbfxconfig.h +++ b/kbfxlib/common/kbfxconfig.h @@ -178,7 +178,7 @@ class KbfxConfig TQStringList m_pluginsRight; TQStringList m_pluginsRightDefault; - /* layout */ + /* tqlayout */ int m_facePos_x; int m_facePos_xDefault; int m_facePos_y; diff --git a/kbfxlib/common/kbfxfontchooser.cpp b/kbfxlib/common/kbfxfontchooser.cpp index 2ebf7d9..2a445d6 100644 --- a/kbfxlib/common/kbfxfontchooser.cpp +++ b/kbfxlib/common/kbfxfontchooser.cpp @@ -23,27 +23,27 @@ KBFXFontChooser::KBFXFontChooser ( TQWidget *parent, const char *name ) : TQWidget ( parent, name ) { - TQHBoxLayout* layout = new TQHBoxLayout ( this, 0, KDialog::spacingHint() ); + TQHBoxLayout* tqlayout = new TQHBoxLayout ( this, 0, KDialog::spacingHint() ); m_label = new TQLabel ( this, "fontLabel" ); - m_label->setSizePolicy ( TQSizePolicy::Expanding, TQSizePolicy::Fixed, TRUE); + m_label->tqsetSizePolicy ( TQSizePolicy::Expanding, TQSizePolicy::Fixed, TRUE); // m_label->setFrameShape ( TQFrame::StyledPanel ); // m_label->setFrameShadow ( TQFrame::Sunken ); - layout->addWidget ( m_label ); + tqlayout->addWidget ( m_label ); m_button = new TQPushButton ( this, "fontButton" ); m_label->setMaximumHeight ( m_button -> height() ); m_label->setMinimumHeight ( m_button -> height() ); TQString fontText = i18n ( "Font..." ); -// m_button->setSizePolicy ( TQSizePolicy::Minimum, TQSizePolicy::Minimum, TRUE); +// m_button->tqsetSizePolicy ( TQSizePolicy::Minimum, TQSizePolicy::Minimum, TRUE); m_button->setText ( fontText ); - TQIconSet iconSet = SmallIconSet ( TQString::fromLatin1 ( "fonts" ) ); + TQIconSet iconSet = SmallIconSet ( TQString::tqfromLatin1 ( "fonts" ) ); TQPixmap pixmap = iconSet.pixmap ( TQIconSet::Small, TQIconSet::Normal ); m_button->setIconSet ( iconSet ); m_button->setFixedWidth ( m_button->fontMetrics().width ( fontText ) + 3 * KDialog::spacingHint() + pixmap.width() ); - layout->addWidget ( m_button ); + tqlayout->addWidget ( m_button ); connect ( m_button, TQT_SIGNAL ( clicked() ), this, TQT_SLOT ( buttonClicked() ) ); @@ -66,7 +66,7 @@ void KBFXFontChooser::updateFontLabel() TQString s = TQString ( "%1 (%2pt) " ).arg ( m_font.family() ).arg ( m_font.pointSize() ); m_label->setFont ( m_font ); m_label->setText ( s ); - m_label->setAlignment ( TQt::AlignLeft | TQt::AlignVCenter ); + m_label->tqsetAlignment ( TQt::AlignLeft | TQt::AlignVCenter ); emit FontChanged(); } diff --git a/kbfxlib/common/kbfxfontchooser.h b/kbfxlib/common/kbfxfontchooser.h index 486fa49..8d0191d 100644 --- a/kbfxlib/common/kbfxfontchooser.h +++ b/kbfxlib/common/kbfxfontchooser.h @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include diff --git a/kbfxlib/common/kbfxpixmaplabel.cpp b/kbfxlib/common/kbfxpixmaplabel.cpp index b563f91..25f43bc 100644 --- a/kbfxlib/common/kbfxpixmaplabel.cpp +++ b/kbfxlib/common/kbfxpixmaplabel.cpp @@ -29,7 +29,7 @@ KbfxPixmapLabel::KbfxPixmapLabel ( TQWidget *parent, const char *name, WFlags fl setFrameShape ( TQLabel::LineEditPanel ); setFrameShadow ( TQLabel::Plain ); setScaledContents ( FALSE ); - setAlignment ( int ( TQLabel::WordBreak | TQLabel::AlignCenter ) ); + tqsetAlignment ( int ( TQLabel::WordBreak | TQLabel::AlignCenter ) ); setMouseTracking ( TRUE ); } @@ -43,7 +43,7 @@ void KbfxPixmapLabel::normalize () setFrameShape ( TQLabel::NoFrame ); setFrameShadow ( TQLabel::Plain ); setScaledContents ( FALSE ); - setAlignment ( int ( TQLabel::WordBreak | TQLabel::AlignCenter ) ); + tqsetAlignment ( int ( TQLabel::WordBreak | TQLabel::AlignCenter ) ); } /* processing drag events over label */ diff --git a/kbfxlib/data/kbfxplugin.h b/kbfxlib/data/kbfxplugin.h index 72031a0..f657d8a 100644 --- a/kbfxlib/data/kbfxplugin.h +++ b/kbfxlib/data/kbfxplugin.h @@ -45,7 +45,7 @@ class KbfxPlugin:public TQObject KbfxPlugin ( TQString Name,TQString lib,uint id ); ~KbfxPlugin(); - void setStatus ( bool ); + void settqStatus ( bool ); TQString name(); TQString libName(); diff --git a/src/kbfxbutton.cpp b/src/kbfxbutton.cpp index d4903d7..a3a0f87 100644 --- a/src/kbfxbutton.cpp +++ b/src/kbfxbutton.cpp @@ -93,7 +93,7 @@ void KbfxButton::loadSkins() m_pressed_skin = TQPixmap ( _tmpPressed ); m_current_skin = m_normal_skin; this->resize ( m_current_skin.width(),m_current_skin.height() ); - this->repaint(); + this->tqrepaint(); } TQCString KbfxButton::findPanel() @@ -344,7 +344,7 @@ void KbfxButton::paintEvent ( TQPaintEvent * pe ) m_buffer->resize ( r.size() ); m_buffer->fill ( this, r.topLeft() ); - p.begin ( m_buffer,this ); + p.tqbegin ( m_buffer,this ); p.translate ( -r.x(), -r.y() ); p.drawPixmap ( r,m_current_skin ); p.end (); diff --git a/src/kbfxplasmacanvasview.cpp b/src/kbfxplasmacanvasview.cpp index 10dde65..57b3106 100644 --- a/src/kbfxplasmacanvasview.cpp +++ b/src/kbfxplasmacanvasview.cpp @@ -331,7 +331,7 @@ KbfxPlasmaCanvasView::setKbfxCanvas ( TQCanvas * cnv ) TQImage img = pixmap->convertToImage(); img = img.smoothScale ( this->width(),pixmap->height(),TQ_ScaleFree ); pixmap->convertFromImage ( img ); - this->canvas ()->setBackgroundPixmap ( *pixmap ); + this->canvas ()->tqsetBackgroundPixmap ( *pixmap ); } } @@ -393,7 +393,7 @@ KbfxPlasmaCanvasView::handleLoadRequest ( KbfxSignal signal ) else canvas ()->resize ( v_stack->width (), this->visibleHeight () ); canvas()->update(); - repaint(); + tqrepaint(); // return; } else @@ -410,7 +410,7 @@ KbfxPlasmaCanvasView::handleLoadRequest ( KbfxSignal signal ) canvas ()->resize ( m_appletMap[signal.name () ]->width (), this->visibleHeight () ); canvas()->update(); - repaint(); + tqrepaint(); } } @@ -465,7 +465,7 @@ KbfxPlasmaCanvasView::search_R ( const TQString name ) TQImage img = pixmap->convertToImage(); img = img.smoothScale ( this->width(),pixmap->height(),TQ_ScaleFree ); pixmap->convertFromImage ( img ); - this->canvas ()->setBackgroundPixmap ( *pixmap ); + this->canvas ()->tqsetBackgroundPixmap ( *pixmap ); } this->setCursor ( TQCursor ( TQt::BusyCursor ) ); diff --git a/src/kbfxplasmaindexview.cpp b/src/kbfxplasmaindexview.cpp index becf108..d7f8d12 100644 --- a/src/kbfxplasmaindexview.cpp +++ b/src/kbfxplasmaindexview.cpp @@ -262,7 +262,7 @@ KbfxPlasmaIndexView::setKbfxCanvas ( TQCanvas * cnv ) { setCanvas ( cnv ); - canvas ()->setBackgroundPixmap ( ( *KbfxPlasmaPixmapProvider::pixmap ( "listboxbg" )) ); + canvas ()->tqsetBackgroundPixmap ( ( *KbfxPlasmaPixmapProvider::pixmap ( "listboxbg" )) ); canvas ()->update (); } diff --git a/src/kbfxspinx.cpp b/src/kbfxspinx.cpp index e69a980..4510f38 100644 --- a/src/kbfxspinx.cpp +++ b/src/kbfxspinx.cpp @@ -55,7 +55,7 @@ void KbfxSpinx::createKbfx() if ( ConfigInit ().m_KbfxMenuType == "kmenu" ) { kbfxBtn->show(); - kbfxBtn->repaint(); + kbfxBtn->tqrepaint(); } else { @@ -128,7 +128,7 @@ void KbfxSpinx::createRMenu() m_menuWidget = new KbfxSpinxMenuWidget ( m_menu,"KbfxSpinxMenu" ); m_menu->addItem ( m_menuWidget,0 ); kbfxBtn->show(); - kbfxBtn->repaint(); + kbfxBtn->tqrepaint(); menuPosition(); } @@ -201,7 +201,7 @@ void KbfxSpinx::showKmenu() } else { - TQCursor::setPos ( this->mapToGlobal ( this->geometry ().bottomLeft () ) ); + TQCursor::setPos ( this->mapToGlobal ( this->tqgeometry ().bottomLeft () ) ); } } else @@ -212,7 +212,7 @@ void KbfxSpinx::showKmenu() } else { - TQCursor::setPos ( this->mapToGlobal ( this->geometry ().topRight () ) ); + TQCursor::setPos ( this->mapToGlobal ( this->tqgeometry ().topRight () ) ); } } diff --git a/src/kbfxspinxmenu.h b/src/kbfxspinxmenu.h index 6029b23..93dcada 100644 --- a/src/kbfxspinxmenu.h +++ b/src/kbfxspinxmenu.h @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/kbfxspinxtoolbutton.cpp b/src/kbfxspinxtoolbutton.cpp index 37fcf53..9f90102 100644 --- a/src/kbfxspinxtoolbutton.cpp +++ b/src/kbfxspinxtoolbutton.cpp @@ -92,7 +92,7 @@ KbfxSpinxToolButton::setPixmaps ( TQPixmap normal, TQPixmap hover ) m_current = m_normal; resize ( m_current.size () ); - this->repaint(); + this->tqrepaint(); this->update(); } diff --git a/src/kbfxspinxtop.cpp b/src/kbfxspinxtop.cpp index 03e0234..d2a651a 100644 --- a/src/kbfxspinxtop.cpp +++ b/src/kbfxspinxtop.cpp @@ -94,7 +94,7 @@ KbfxSpinxTop::paintEvent ( TQPaintEvent * pe ) m_pixmapbuff->fill ( this, r->topLeft() ); TQPainter p; - p.begin ( m_pixmapbuff,this ); + p.tqbegin ( m_pixmapbuff,this ); // Draw commands are here p.drawPixmap ( *r,m_background ); p.setPen ( TQColor ( ConfigInit().m_userNameColor ) ); diff --git a/src/kbfxtooltip.cpp b/src/kbfxtooltip.cpp index 20c1d9d..d09c927 100644 --- a/src/kbfxtooltip.cpp +++ b/src/kbfxtooltip.cpp @@ -118,7 +118,7 @@ KbfxToolTip::setAnimationImage ( TQString path ) _agent->setBackgroundPixmap ( agent_mask ); if ( agent_mask.mask () ) _agent->setMask ( *agent_mask.mask () ); - _agent->repaint (); + _agent->tqrepaint (); /*FIXME:Need to remove Hard Coded Values */ _agent->move ( 200, 0 ); @@ -181,7 +181,7 @@ KbfxToolTip::logoMove () if ( _logo_move_x < _bg.width () - 68 ) { _logo_move_x += 1; - _window->repaint (); + _window->tqrepaint (); p.begin ( _window ); p.drawPixmap ( TQRect ( _logo_move_x, 0, logo.width (), logo.height () ), @@ -200,7 +200,7 @@ KbfxToolTip::logoMove () _agent->setBackgroundPixmap ( agent_mask ); if ( agent_mask.mask () ) _agent->setMask ( *agent_mask.mask () ); - _agent->repaint (); + _agent->tqrepaint (); } void