summaryrefslogtreecommitdiffstats
path: root/quanta/components
diff options
context:
space:
mode:
Diffstat (limited to 'quanta/components')
-rw-r--r--quanta/components/csseditor/tlpeditors.cpp2
-rw-r--r--quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp2
-rw-r--r--quanta/components/debugger/debuggermanager.cpp4
-rw-r--r--quanta/components/debugger/gubed/quantadebuggergubed.cpp8
-rw-r--r--quanta/components/debugger/gubed/quantadebuggergubed.h2
-rw-r--r--quanta/components/framewizard/visualframeeditor.cpp4
-rw-r--r--quanta/components/tableeditor/tableeditor.h2
7 files changed, 12 insertions, 12 deletions
diff --git a/quanta/components/csseditor/tlpeditors.cpp b/quanta/components/csseditor/tlpeditors.cpp
index 81e72538..057083e1 100644
--- a/quanta/components/csseditor/tlpeditors.cpp
+++ b/quanta/components/csseditor/tlpeditors.cpp
@@ -48,7 +48,7 @@ TLPEditor::~TLPEditor(){
}
void TLPEditor::setButtonIcon(TQString s){
- TQIconSet iconSet = SmallIconSet(TQString::fromLatin1(s));
+ TQIconSet iconSet = SmallIconSet(TQString::fromLatin1(s.ascii()));
TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal );
m_pb->setIconSet(iconSet);
m_pb->setFixedSize( pixMap.width()+8, pixMap.height()+8 );
diff --git a/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp b/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp
index d16319a9..481c8d61 100644
--- a/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp
+++ b/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp
@@ -956,7 +956,7 @@ DebuggerVariable* QuantaDebuggerDBGp::buildVariable( const TQDomNode & variablen
}
else if (type == "string")
{
- TQCString value = TQCString(variablenode.firstChild().nodeValue());
+ TQCString value = TQCString(variablenode.firstChild().nodeValue().ascii());
value = KCodecs::base64Decode(value);
return debuggerInterface()->newDebuggerVariable( name, value, DebuggerVariableTypes::String);
}
diff --git a/quanta/components/debugger/debuggermanager.cpp b/quanta/components/debugger/debuggermanager.cpp
index 4c5aaa58..b62b3e3b 100644
--- a/quanta/components/debugger/debuggermanager.cpp
+++ b/quanta/components/debugger/debuggermanager.cpp
@@ -341,8 +341,8 @@ void DebuggerManager::enableAction(const TQString& action, bool enable)
{
// The action may or may not exist, depending on capabilities of the debugger plugin
KActionCollection *ac = quantaApp->actionCollection();
- if(ac && ac->action(action))
- ac->action(action)->setEnabled(enable);
+ if(ac && ac->action(action.ascii()))
+ ac->action(action.ascii())->setEnabled(enable);
}
}
diff --git a/quanta/components/debugger/gubed/quantadebuggergubed.cpp b/quanta/components/debugger/gubed/quantadebuggergubed.cpp
index f909832a..8c2ab1b5 100644
--- a/quanta/components/debugger/gubed/quantadebuggergubed.cpp
+++ b/quanta/components/debugger/gubed/quantadebuggergubed.cpp
@@ -443,7 +443,7 @@ void QuantaDebuggerGubed::processCommand(const TQString& datas)
else if(m_command == "status")
{
long argcnt = args["args"].toLong();
- TQString msg = i18n(args["message"]); // How will we get these messages throught to the translators?
+ TQString msg = i18n(args["message"].ascii()); // How will we get these messages throught to the translators?
for(int cnt = 1; cnt <= argcnt; cnt++)
msg.replace("%" + TQString("%1").arg(cnt) + "%", args[TQString("arg%1").arg(cnt)]);
@@ -604,15 +604,15 @@ bool QuantaDebuggerGubed::sendCommand(const TQString& command, StringMap args)
TQString buffer = phpSerialize(args);
buffer = TQString(command + ":%1;" + buffer).arg(buffer.length());
- m_socket->writeBlock(buffer, buffer.length());
+ m_socket->writeBlock(buffer.ascii(), buffer.length());
return true;
}
// Send a command to gubed
-bool QuantaDebuggerGubed::sendCommand(const TQString& command, char * firstarg, ...)
+bool QuantaDebuggerGubed::sendCommand(const TQString& command, const char * firstarg, ...)
{
StringMap ca;
- char *next;
+ const char *next;
va_list l_Arg;
va_start(l_Arg, firstarg);
diff --git a/quanta/components/debugger/gubed/quantadebuggergubed.h b/quanta/components/debugger/gubed/quantadebuggergubed.h
index 0f41b804..624a8ae8 100644
--- a/quanta/components/debugger/gubed/quantadebuggergubed.h
+++ b/quanta/components/debugger/gubed/quantadebuggergubed.h
@@ -116,7 +116,7 @@ class QuantaDebuggerGubed : public DebuggerClient
// bool sendCommand(const TQString&, const TQString&);
bool sendCommand(const TQString& command, StringMap args);
- bool sendCommand(const TQString& command, char * firstarg, ...);
+ bool sendCommand(const TQString& command, const char * firstarg, ...);
void processCommand(const TQString&);
void sendWatches();
diff --git a/quanta/components/framewizard/visualframeeditor.cpp b/quanta/components/framewizard/visualframeeditor.cpp
index db52da97..ec0d9686 100644
--- a/quanta/components/framewizard/visualframeeditor.cpp
+++ b/quanta/components/framewizard/visualframeeditor.cpp
@@ -286,7 +286,7 @@ void VisualFrameEditor::removeNode(const TQString &l){
void VisualFrameEditor::drawGUI(treeNode *n, TQWidget* parent){
if(n->hasChildren()) {
TQString splitterName("splitter"+TQString::number(++splitterIdNumber,10));
- TQSplitter *splitter = new TQSplitter(parent,splitterName);
+ TQSplitter *splitter = new TQSplitter(parent,splitterName.ascii());
if(SIZES.contains(splitterName)) splitter->setSizes( SIZES[splitterName] );
switch( n->splitType() ){
case VERTICAL : splitter->setOrientation(TQSplitter::Horizontal);break;
@@ -300,7 +300,7 @@ void VisualFrameEditor::drawGUI(treeNode *n, TQWidget* parent){
}
}
else {
- SelectableArea *sa=new SelectableArea(parent,n->label());
+ SelectableArea *sa=new SelectableArea(parent,n->label().ascii());
if(parent->isA("TQSplitter")) dynamic_cast<TQSplitter *>(parent)->setResizeMode(sa->view(),TQSplitter::KeepSize );
else
if(!m_firstInsertedSA) m_firstInsertedSA = sa;
diff --git a/quanta/components/tableeditor/tableeditor.h b/quanta/components/tableeditor/tableeditor.h
index 4748414e..3b913811 100644
--- a/quanta/components/tableeditor/tableeditor.h
+++ b/quanta/components/tableeditor/tableeditor.h
@@ -40,7 +40,7 @@ public:
-typedef struct NestedTable{ Node *node; int row; int col; int bLine; int bCol; int eLine; int eCol; TQString nestedData;};
+struct NestedTable { Node *node; int row; int col; int bLine; int bCol; int eLine; int eCol; TQString nestedData;};
class Parser;