From fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf Mon Sep 17 00:00:00 2001 From: tpearson Date: Fri, 7 Jan 2011 04:10:07 +0000 Subject: Revert automated changes Sorry guys, they are just not ready for prime time Work will continue as always git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1212480 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kcontrol/info/info.cpp | 22 +++++++++++----------- kcontrol/info/info_aix.cpp | 2 +- kcontrol/info/info_linux.cpp | 4 ++-- kcontrol/info/info_netbsd.cpp | 16 ++++++++-------- kcontrol/info/info_openbsd.cpp | 8 ++++---- kcontrol/info/info_osx.cpp | 2 +- kcontrol/info/info_solaris.cpp | 4 ++-- kcontrol/info/memory.cpp | 10 +++++----- kcontrol/info/opengl.cpp | 8 ++++---- kcontrol/info/opengl.desktop | 4 ++-- 10 files changed, 40 insertions(+), 40 deletions(-) (limited to 'kcontrol/info') diff --git a/kcontrol/info/info.cpp b/kcontrol/info/info.cpp index d5cc677d3..770b2cdf3 100644 --- a/kcontrol/info/info.cpp +++ b/kcontrol/info/info.cpp @@ -80,7 +80,7 @@ static const TQString HexStr(unsigned long val, int digits ) { TQString hexstr; int i; - hexstr = TQString::tqfromLatin1("0x%1").arg(val, digits, 16/*=HEX*/); + hexstr = TQString::fromLatin1("0x%1").arg(val, digits, 16/*=HEX*/); for (i=hexstr.length()-1; i>0; --i) if (hexstr[i]==' ') hexstr[i] = '0'; @@ -167,7 +167,7 @@ static TQListViewItem* XServer_fill_screen_info( TQListViewItem *lBox, TQListVie for (i = 0; i < ndepths; i++) { txt = txt + Value(depths[i]); if (i < ndepths - 1) - txt = txt + TQString::tqfromLatin1(", "); + txt = txt + TQString::fromLatin1(", "); } last = new TQListViewItem(item, last, i18n("Depths (%1)").arg(ndepths,-1), txt); @@ -200,11 +200,11 @@ static TQListViewItem* XServer_fill_screen_info( TQListViewItem *lBox, TQListVie ((DoesBackingStore(s) == Always) ? YES : i18n("When mapped")) ) .arg( DoesSaveUnders(s) ? YES : NO )); - XQueryBestSize (dpy, tqCursorShape, RootWindow(dpy,scr), 65535, 65535, + XQueryBestSize (dpy, CursorShape, RootWindow(dpy,scr), 65535, 65535, &width, &height); last = new TQListViewItem(item, last, i18n("Largest Cursor"), (width == 65535 && height == 65535) - ? i18n("unlimited") : TQString::tqfromLatin1("%1 x %2").arg(width).arg(height)); + ? i18n("unlimited") : TQString::fromLatin1("%1 x %2").arg(width).arg(height)); last = new TQListViewItem(item, last, i18n("Current Input Event Mask"), HexStr((unsigned long)EventMaskOfScreen(s),HEXDIGITS)); @@ -272,12 +272,12 @@ static bool GetInfo_XServer_Generic( TQListView *lBox ) last = new TQListViewItem(next, i18n("Name of the Display"), DisplayString(dpy)); - last = new TQListViewItem(next, last, i18n("Vendor String"), TQString::tqfromLatin1(ServerVendor(dpy))); + last = new TQListViewItem(next, last, i18n("Vendor String"), TQString::fromLatin1(ServerVendor(dpy))); last = new TQListViewItem(next, last, i18n("Vendor Release Number"), Value((int)VendorRelease(dpy))); last = new TQListViewItem(next, last, i18n("Version Number"), - TQString::tqfromLatin1("%1.%2").arg((int)ProtocolVersion(dpy)) + TQString::fromLatin1("%1.%2").arg((int)ProtocolVersion(dpy)) .arg((int)ProtocolRevision(dpy))); last = item = new TQListViewItem(next, last, i18n("Available Screens")); @@ -294,7 +294,7 @@ static bool GetInfo_XServer_Generic( TQListView *lBox ) int extCount; char **extensions = XListExtensions( dpy, &extCount ); for ( i = 0; i < extCount; i++ ) { - item = new TQListViewItem( last, item, TQString::tqfromLatin1( extensions[i] ) ); + item = new TQListViewItem( last, item, TQString::fromLatin1( extensions[i] ) ); } XFreeExtensionList( extensions ); @@ -356,7 +356,7 @@ void KInfoListWidget::load() retrieve-function. If the function wants the widget to show another string, then it change *GetInfo_ErrorString ! */ ErrorString = i18n("No information available about %1.").arg(title) - + TQString::tqfromLatin1("\n\n") + DEFAULT_ERRORSTRING; + + TQString::fromLatin1("\n\n") + DEFAULT_ERRORSTRING; GetInfo_ErrorString = &ErrorString; /* save the address of ErrorString */ sorting_allowed = true; /* the functions may set that */ @@ -414,9 +414,9 @@ KInfoListWidget::KInfoListWidget(const TQString &_title, TQWidget *parent, const setButtons(KCModule::Help); getlistbox = _getlistbox; GetInfo_ErrorString = 0; - TQHBoxLayout *tqlayout = new TQHBoxLayout(this, 0, KDialog::spacingHint()); + TQHBoxLayout *layout = new TQHBoxLayout(this, 0, KDialog::spacingHint()); widgetStack = new TQWidgetStack(this); - tqlayout->addWidget(widgetStack); + layout->addWidget(widgetStack); lBox = new TQListView(widgetStack); widgetStack->addWidget(lBox, 0); lBox->setMinimumSize(200,120); @@ -425,7 +425,7 @@ KInfoListWidget::KInfoListWidget(const TQString &_title, TQWidget *parent, const TQWhatsThis::add( lBox, i18n( "This list displays system information on the selected category." ) ); NoInfoText = new TQLabel(widgetStack); widgetStack->addWidget(NoInfoText, 1); - NoInfoText->tqsetAlignment(AlignCenter | WordBreak); + NoInfoText->setAlignment(AlignCenter | WordBreak); widgetStack->raiseWidget(NoInfoText); load(); } diff --git a/kcontrol/info/info_aix.cpp b/kcontrol/info/info_aix.cpp index de7c3a095..9aa0d3767 100644 --- a/kcontrol/info/info_aix.cpp +++ b/kcontrol/info/info_aix.cpp @@ -70,7 +70,7 @@ list_devices(TQListView *lBox, char *criteria) TQListViewItem *lastitem = NULL; lBox->addColumn(i18n("Name")); - lBox->addColumn(i18n("tqStatus")); + lBox->addColumn(i18n("Status")); lBox->addColumn(i18n("Location")); lBox->addColumn(i18n("Description")); diff --git a/kcontrol/info/info_linux.cpp b/kcontrol/info/info_linux.cpp index 74bb08258..18287c45f 100644 --- a/kcontrol/info/info_linux.cpp +++ b/kcontrol/info/info_linux.cpp @@ -503,7 +503,7 @@ bool GetInfo_Partitions(TQListView * lbox) #endif { total = avail = 0; /* initialize size.. */ - found_in_List = (Mounted_Partitions.tqcontains(FS_NAME) > 0); + found_in_List = (Mounted_Partitions.contains(FS_NAME) > 0); if (found_in_List && statfs(FS_FILE, &sfs) == 0) { total = ((LONG_TYPE) sfs.f_blocks) * sfs.f_bsize; avail = (getuid()? sfs.f_bavail : sfs.f_bfree) @@ -573,7 +573,7 @@ bool GetInfo_CD_ROM(TQListView * lBox) if (-1 != rx.search(line)) { TQString text = rx.cap(1); TQString value = rx.cap(2); - if (!text.tqcontains('#')) { + if (!text.contains('#')) { if (value == "0") value = KStdGuiItem::no().plainText(); if (value == "1") diff --git a/kcontrol/info/info_netbsd.cpp b/kcontrol/info/info_netbsd.cpp index d9857af28..02fd98b1d 100644 --- a/kcontrol/info/info_netbsd.cpp +++ b/kcontrol/info/info_netbsd.cpp @@ -125,18 +125,18 @@ static bool GetDmesgInfo(TQListView *lBox, const char *filter, TQListViewItem *olditem = NULL; while(!(s = t->readLine().local8Bit()).isEmpty()) { if (!seencpu) { - if (s.tqcontains("cpu")) + if (s.contains("cpu")) seencpu = true; else continue; } - if (s.tqcontains("boot device") || - s.tqcontains("WARNING: old BSD partition ID!")) + if (s.contains("boot device") || + s.contains("WARNING: old BSD partition ID!")) break; if (!filter || (filter[0] == '^' && s.find(&filter[1]) == 0) - || (filter[0] != '^' && s.tqcontains(filter))) { + || (filter[0] != '^' && s.contains(filter))) { if (func) func(lBox, s); else @@ -253,7 +253,7 @@ bool GetInfo_SCSI (TQListView *lbox) for(; lvitem; lvitem = lvitem->nextSibling()) { TQString s = lvitem->text(0); - if (s.tqcontains("seconds for devices to settle")) { + if (s.contains("seconds for devices to settle")) { lbox->removeItem(lvitem); break; } @@ -296,18 +296,18 @@ bool GetInfo_Partitions (TQListView *lbox) // convert to strings vv[0] = KIO::convertSize(big[0]); - vv[1] = TQString::tqfromLatin1("%1 (%2%%)") + vv[1] = TQString::fromLatin1("%1 (%2%%)") .arg(KIO::convertSize(big[1])) .arg(mnt->f_blocks ? mnt->f_bavail*100/mnt->f_blocks : 0); // FIXME: these two are large enough to punctuate vv[2] = TQString::number(mnt->f_files); - vv[3] = TQString::tqfromLatin1("%1 (%2%%) ") + vv[3] = TQString::fromLatin1("%1 (%2%%) ") .arg(mnt->f_ffree) .arg(mnt->f_files ? mnt->f_ffree*100/mnt->f_files : 0); vv[4] = TQString::null; -#define MNTF(x) if (mnt->f_flags & MNT_##x) vv[4] += TQString::tqfromLatin1(#x " "); +#define MNTF(x) if (mnt->f_flags & MNT_##x) vv[4] += TQString::fromLatin1(#x " "); MNTF(ASYNC) MNTF(DEFEXPORTED) MNTF(EXKERB) diff --git a/kcontrol/info/info_openbsd.cpp b/kcontrol/info/info_openbsd.cpp index 22b6c8426..12ec8ee2d 100644 --- a/kcontrol/info/info_openbsd.cpp +++ b/kcontrol/info/info_openbsd.cpp @@ -122,16 +122,16 @@ static bool GetDmesgInfo(TQListView *lBox, const char *filter, TQListViewItem *olditem = NULL; while(!(s = t->readLine()).isNull()) { if (!seencpu) { - if (s.tqcontains("cpu")) + if (s.contains("cpu")) seencpu = true; else continue; } - if (s.tqcontains("boot device") || - s.tqcontains("WARNING: old BSD partition ID!")) + if (s.contains("boot device") || + s.contains("WARNING: old BSD partition ID!")) break; - if (!filter || s.tqcontains(filter)) { + if (!filter || s.contains(filter)) { if (func) { func(lBox, s, &opaque, false); } diff --git a/kcontrol/info/info_osx.cpp b/kcontrol/info/info_osx.cpp index 1b457f18a..5f18aebea 100644 --- a/kcontrol/info/info_osx.cpp +++ b/kcontrol/info/info_osx.cpp @@ -115,7 +115,7 @@ bool GetInfo_Sound (TQListView *lBox) { #ifdef HAVE_COREAUDIO #define kMaxStringSize 1024 - OStqStatus status; + OSStatus status; AudioDeviceID gOutputDeviceID; unsigned long propertySize; char deviceName[kMaxStringSize]; diff --git a/kcontrol/info/info_solaris.cpp b/kcontrol/info/info_solaris.cpp index 6dd215f55..9f2b17e1b 100644 --- a/kcontrol/info/info_solaris.cpp +++ b/kcontrol/info/info_solaris.cpp @@ -184,10 +184,10 @@ bool GetInfo_Partitions( TQListView *lBox ) { lBox->addColumn( i18n( "Mount Point" )); lBox->addColumn( i18n( "FS Type" )); lBox->addColumn( i18n( "Total Size" )); - // XXX: FIXME: how do I set column tqalignment correctly? + // XXX: FIXME: how do I set column alignment correctly? lBox->setColumnAlignment( 3, 2 ); lBox->addColumn( i18n( "Free Size" )); - // XXX: FIXME: how do I set column tqalignment correctly? + // XXX: FIXME: how do I set column alignment correctly? lBox->setColumnAlignment( 4, 2 ); lBox->addColumn( i18n( "Mount Time" )); lBox->addColumn( i18n( "Mount Options" )); diff --git a/kcontrol/info/memory.cpp b/kcontrol/info/memory.cpp index 0720f32a6..7bfe52948 100644 --- a/kcontrol/info/memory.cpp +++ b/kcontrol/info/memory.cpp @@ -163,7 +163,7 @@ KMemoryWidget::KMemoryWidget(TQWidget * parent, const char *name) break; }; Widget = new TQLabel(title, this); - Widget->tqsetAlignment(AlignLeft); + Widget->setAlignment(AlignLeft); vbox->addWidget(Widget, 1); } @@ -174,7 +174,7 @@ KMemoryWidget::KMemoryWidget(TQWidget * parent, const char *name) if (i == SWAP_MEM) vbox->addSpacing(SPACING); Widget = new TQLabel(this); - Widget->tqsetAlignment(AlignRight); + Widget->setAlignment(AlignRight); MemSizeLabel[i][j] = Widget; vbox->addWidget(Widget, 1); } @@ -228,7 +228,7 @@ KMemoryWidget::KMemoryWidget(TQWidget * parent, const char *name) hint = "" + hint + ""; Widget = new TQLabel("" + title + "", this); - Widget->tqsetAlignment(AlignCenter); + Widget->setAlignment(AlignCenter); TQToolTip::add(Widget, hint); vbox->addWidget(Widget); vbox->addSpacing(SPACING / 2); @@ -243,7 +243,7 @@ KMemoryWidget::KMemoryWidget(TQWidget * parent, const char *name) vbox->addSpacing(SPACING / 2); Widget = new TQLabel(this); /* xx MB used. */ - Widget->tqsetAlignment(AlignCenter); + Widget->setAlignment(AlignCenter); TQToolTip::add(Widget, hint); GraphLabel[i] = Widget; vbox->addWidget(Widget); @@ -424,7 +424,7 @@ void KMemoryWidget::update_Values() used, swap_colors, swap_text); /* RAM + SWAP usage: */ - /* used[0] already tqcontains the amount of used swap */ + /* used[0] already contains the amount of used swap */ used[2] = Memory_Info[FREE_MEM] + ZERO_IF_NO_INFO(Memory_Info[FREESWAP_MEM]); used[1] = Memory_Info[TOTAL_MEM] - Memory_Info[FREE_MEM]; if (!all_colors_initialized) { diff --git a/kcontrol/info/opengl.cpp b/kcontrol/info/opengl.cpp index 49b29f953..061e368e6 100644 --- a/kcontrol/info/opengl.cpp +++ b/kcontrol/info/opengl.cpp @@ -194,7 +194,7 @@ print_extension_list(const char *ext, TQListViewItem *l1) if (!ext || !ext[0]) return; - TQString qext = TQString::tqfromLatin1(ext); + TQString qext = TQString::fromLatin1(ext); TQListViewItem *l2 = NULL; i = j = 0; @@ -551,7 +551,7 @@ static TQListViewItem *get_gl_info(Display *dpy, int scrnum, Bool allowDirect,TQ None }; XSetWindowAttributes attr; - unsigned long tqmask; + unsigned long mask; Window root; GLXContext ctx; XVisualInfo *visinfo; @@ -573,10 +573,10 @@ static TQListViewItem *get_gl_info(Display *dpy, int scrnum, Bool allowDirect,TQ attr.border_pixel = 0; attr.colormap = XCreateColormap(dpy, root, visinfo->visual, AllocNone); attr.event_mask = StructureNotifyMask | ExposureMask; - tqmask = CWBackPixel | CWBorderPixel | CWColormap | CWEventMask; + mask = CWBackPixel | CWBorderPixel | CWColormap | CWEventMask; win = XCreateWindow(dpy, root, 0, 0, width, height, 0, visinfo->depth, InputOutput, - visinfo->visual, tqmask, &attr); + visinfo->visual, mask, &attr); ctx = glXCreateContext( dpy, visinfo, NULL, allowDirect ); if (!ctx) { diff --git a/kcontrol/info/opengl.desktop b/kcontrol/info/opengl.desktop index fa38a0db3..4451c5167 100644 --- a/kcontrol/info/opengl.desktop +++ b/kcontrol/info/opengl.desktop @@ -121,11 +121,11 @@ Keywords[km]=OpenGL,DRI,GLX,3D,ប័ណ្ណ​វីដេអូ,បន្ទ Keywords[lt]=OpenGL,DRI,GLX,3D,VideoCard,Hardware Acceleration,Graphics,X,X11,Xserver,X-Server,XFree86,Display,Video plokštė,aparatūros greitinimas,grafika Keywords[lv]=OpenGL,DRI,GLX,3D,VideoKarte,Dzelžu paātrināšana,Grafika,X,X11,Xserveris,X-Serveris,XFree86,Ekrāns Keywords[mk]=OpenGL,DRI,GLX,3D,VideoCard,Hardware Acceleration,Graphics,X,X11,Xserver,X-Server,XFree86,Display,Видео-картичка,Хардверско забрзување,Графика,екран,приказ -Keywords[nb]=OpenGL,DRI,GLX,3D,skjermkort,tqmaskinvareakselerasjon,bilde,X,X11,X-tenar,XFree86,skjerm +Keywords[nb]=OpenGL,DRI,GLX,3D,skjermkort,maskinvareakselerasjon,bilde,X,X11,X-tenar,XFree86,skjerm Keywords[nds]=OpenGL,DRI,GLX,3D,Videokort,Hardware Acceleration,Grafik,X,X11,Xserver,X-Server,XFree86,Display,Dorstellen,Beslünigen Keywords[ne]=खुला GL, DRI, GLX, 3D,भिडियो कार्ड, हार्डवेयर गतिवर्धन, ग्राफिक्स, X, X11, Xसर्भर, X-सर्भर, X स्वतन्त्र 86, प्रदर्शन गर्नुहोस् Keywords[nl]=OpenGL,DRI,GLX,3D,videokaart,hardware-acceleratie,grafisch,graphics,X,X11,Xserver,X-Server,XFree86,display,beeldscherm -Keywords[nn]=OpenGL,DRI,GLX,3D,skjermkort,tqmaskinvareakselerasjon,grafikk,X,X11,X-tenar,XFree86,skjerm +Keywords[nn]=OpenGL,DRI,GLX,3D,skjermkort,maskinvareakselerasjon,grafikk,X,X11,X-tenar,XFree86,skjerm Keywords[pa]=OpenGL,DRI,GLX,3D,ਵੀਡਿਓਕਾਰਡ, ਹਾਰਡਵੇਅਰ ਪਰਵੇਸ਼ਕ,ਗਰਾਫਿਕਸ,X,X11,Xserver,X-Server,XFree86,ਦਰਿਸ਼ Keywords[pl]=OpenGL,DRI,GLX,3D,karta graficzna,grafika,X,X11,Xserver,X-Server,XFree86,ekran Keywords[pt]=OpenGL,DRI,GLX,3D,Placa Vídeo,Aceleração por Hardware,Gráficos,X,X11,Servidor X,XFree86,Ecrã -- cgit v1.2.1